wsock32 static lib dependency removal from win build files.

error msg if wsock load fails changed by Fl::fatal() API use.



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6174 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

CMakeLists.txt

@@ -42,7 +42,7 @@ IF(WIN32)
     IF(BORLAND)
       SET( FLTK_PLATFORM_DEPENDENT_LIBS import32 )
     ELSE(BORLAND)
-      SET( FLTK_PLATFORM_DEPENDENT_LIBS wsock32 comctl32 )
+      SET( FLTK_PLATFORM_DEPENDENT_LIBS comctl32 )
     ENDIF(BORLAND)
   ENDIF(NOT CYGWIN)
 ENDIF(WIN32)
@@ -71,7 +71,7 @@ ENDIF(APPLE AND NOT FLTK_APPLE_X11)
 
 IF(CYGWIN)
   ADD_DEFINITIONS(-DWIN32)  
-  SET( FLTK_PLATFORM_DEPENDENT_LIBS ole32 uuid comctl32 wsock32 supc++ -lm -lgdi32)
+  SET( FLTK_PLATFORM_DEPENDENT_LIBS ole32 uuid comctl32 supc++ -lm -lgdi32)
 ENDIF(CYGWIN)
 
 IF(MINGW)

configure.in

@@ -618,7 +618,7 @@ case $uname in
 	CXXFLAGS="-mwindows -DWIN32 $CXXFLAGS"
 	LDFLAGS="-mwindows $LDFLAGS"
 	DSOFLAGS="-mwindows $DSOFLAGS"
-	LIBS="$LIBS -lole32 -luuid -lcomctl32 -lwsock32"
+	LIBS="$LIBS -lole32 -luuid -lcomctl32"
 	if test "x$with_optim" = x; then
 	    dnl Avoid -Os optimization on Cygwin/Mingw
 	    with_optim="-O3"

src/Fl_win32.cxx

@@ -83,10 +83,8 @@ static fl_wsk_async_select_f fl_wsk_async_select=0;
 static HMODULE get_wsock_mod() {
 	if (!s_wsock_mod) {
 		s_wsock_mod = LoadLibrary(WSCK_DLL_NAME);
-		if (s_wsock_mod==NULL){
+		if (s_wsock_mod==NULL)
-			fprintf(stderr,"FLTK Lib Error: %s file not found! Please check your winsock dll accessibility.\n",WSCK_DLL_NAME);
+		  Fl::fatal("FLTK Lib Error: %s file not found! Please check your winsock dll accessibility.\n",WSCK_DLL_NAME);
-			exit(1);
-		}
         s_wsock_select = (fl_wsk_select_f) GetProcAddress(s_wsock_mod, "select");
         fl_wsk_fd_is_set = (fl_wsk_fd_is_set_f) GetProcAddress(s_wsock_mod, "__WSAFDIsSet");
         fl_wsk_async_select = (fl_wsk_async_select_f) GetProcAddress(s_wsock_mod, "WSAAsyncSelect");

vc2005/fltk.lib.vcproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8.00"
+	Version="8,00"
 	Name="fltk"
 	ProjectGUID="{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}"
 	RootNamespace="fltk"
@@ -160,6 +160,459 @@
 	<References>
 	</References>
 	<Files>
+		<Filter
+			Name="Headers"
+			Filter="*.h*"
+			>
+			<File
+				RelativePath="..\FL\Fl.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Adjuster.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\fl_ask.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Bitmap.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_BMP_Image.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Box.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Browser.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Browser_.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Button.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Chart.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Check_Browser.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Check_Button.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Choice.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Clock.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Color_Chooser.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Counter.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Dial.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Double_Window.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\fl_draw.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Export.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_File_Browser.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_File_Chooser.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_File_Icon.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_File_Input.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Fill_Dial.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Fill_Slider.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Float_Input.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_FormsBitmap.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_FormsPixmap.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Free.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_GIF_Image.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Gl_Window.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Group.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Help_Dialog.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Help_View.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Hold_Browser.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Hor_Fill_Slider.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Hor_Nice_Slider.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Hor_Slider.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Hor_Value_Slider.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Image.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Input.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Input_.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Input_Choice.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Int_Input.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_JPEG_Image.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Light_Button.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Line_Dial.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Menu.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Menu_.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Menu_Bar.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Menu_Button.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Menu_Item.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Menu_Window.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\fl_message.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Multi_Browser.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Multi_Label.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Multiline_Input.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Multiline_Output.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Nice_Slider.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Object.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Output.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Overlay_Window.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Pack.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Pixmap.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_PNG_Image.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_PNM_Image.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Positioner.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Preferences.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Progress.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Radio_Button.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Radio_Light_Button.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Radio_Round_Button.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Repeat_Button.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Return_Button.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_RGB_Image.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Roller.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Round_Button.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Round_Clock.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Scroll.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Scrollbar.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Secret_Input.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Select_Browser.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Shared_Image.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\fl_show_colormap.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\fl_show_input.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Simple_Counter.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Single_Window.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Slider.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Spinner.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Sys_Menu_Bar.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Tabs.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Text_Buffer.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Text_Display.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Text_Editor.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Tile.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Tiled_Image.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Timer.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Toggle_Button.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Toggle_Light_Button.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Toggle_Round_Button.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Tooltip.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\fl_utf8.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Valuator.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Value_Input.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Value_Output.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Value_Slider.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Widget.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Window.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_Wizard.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_XBM_Image.H"
+				>
+			</File>
+			<File
+				RelativePath="..\FL\Fl_XPM_Image.H"
+				>
+			</File>
+		</Filter>
 		<File
 			RelativePath="..\src\filename_absolute.cxx"
 			>

vcnet/CubeView.vcproj

@@ -35,7 +35,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="opengl32.lib comctl32.lib wsock32.lib"
+				AdditionalDependencies="opengl32.lib comctl32.lib"
 				OutputFile="../test/CubeViewd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -100,7 +100,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="opengl32.lib wsock32.lib comctl32.lib"
+				AdditionalDependencies="opengl32.lib comctl32.lib"
 				OutputFile="../test/CubeView.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"

vcnet/adjuster.vcproj

@@ -35,7 +35,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="fltkd.lib comctl32.lib wsock32.lib"
+				AdditionalDependencies="fltkd.lib comctl32.lib"
 				OutputFile="../test/adjusterd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -100,7 +100,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="fltk.lib comctl32.lib wsock32.lib"
+				AdditionalDependencies="fltk.lib comctl32.lib"
 				OutputFile="../test/adjuster.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"

vcnet/arc.vcproj

@@ -35,7 +35,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="fltkd.lib wsock32.lib comctl32.lib"
+				AdditionalDependencies="fltkd.lib comctl32.lib"
 				OutputFile="../test/arcd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -100,7 +100,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="fltk.lib wsock32.lib comctl32.lib"
+				AdditionalDependencies="fltk.lib comctl32.lib"
 				OutputFile="../test/arc.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"

vcnet/ask.vcproj

@@ -35,7 +35,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="fltkd.lib wsock32.lib comctl32.lib"
+				AdditionalDependencies="fltkd.lib comctl32.lib"
 				OutputFile="../test/askd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -100,7 +100,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="fltk.lib wsock32.lib comctl32.lib"
+				AdditionalDependencies="fltk.lib comctl32.lib"
 				OutputFile="../test/ask.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"

vcnet/bitmap.vcproj

@@ -36,7 +36,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="fltk.lib wsock32.lib comctl32.lib"
+				AdditionalDependencies="fltk.lib comctl32.lib"
 				OutputFile="../test/bitmap.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -99,7 +99,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="fltkd.lib wsock32.lib comctl32.lib"
+				AdditionalDependencies="fltkd.lib comctl32.lib"
 				OutputFile="../test/bitmapd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"

vcnet/blocks.vcproj

@@ -36,7 +36,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="wsock32.lib comctl32.lib winmm.lib"
+				AdditionalDependencies="comctl32.lib winmm.lib"
 				OutputFile="../test/blocksd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -101,7 +101,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="wsock32.lib comctl32.lib winmm.lib"
+				AdditionalDependencies="comctl32.lib winmm.lib"
 				OutputFile="../test/blocks.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"

vcnet/boxtype.vcproj

@@ -35,7 +35,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="fltkd.lib wsock32.lib comctl32.lib"
+				AdditionalDependencies="fltkd.lib comctl32.lib"
 				OutputFile="../test/boxtyped.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -100,7 +100,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="fltk.lib wsock32.lib comctl32.lib"
+				AdditionalDependencies="fltk.lib comctl32.lib"
 				OutputFile="../test/boxtype.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"

vcnet/browser.vcproj

@@ -36,7 +36,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="fltk.lib wsock32.lib comctl32.lib"
+				AdditionalDependencies="fltk.lib comctl32.lib"
 				OutputFile="../test/browser.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -99,7 +99,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="fltkd.lib wsock32.lib comctl32.lib"
+				AdditionalDependencies="fltkd.lib comctl32.lib"
 				OutputFile="../test/browserd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"

vcnet/button.vcproj

@@ -35,7 +35,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="fltkd.lib wsock32.lib comctl32.lib"
+				AdditionalDependencies="fltkd.lib comctl32.lib"
 				OutputFile="../test/buttond.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -100,7 +100,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="fltk.lib wsock32.lib comctl32.lib"
+				AdditionalDependencies="fltk.lib comctl32.lib"
 				OutputFile="../test/button.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"

vcnet/buttons.vcproj

@@ -36,7 +36,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="fltk.lib wsock32.lib comctl32.lib"
+				AdditionalDependencies="fltk.lib comctl32.lib"
 				OutputFile="../test/buttons.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -99,7 +99,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="fltkd.lib wsock32.lib comctl32.lib"
+				AdditionalDependencies="fltkd.lib comctl32.lib"
 				OutputFile="../test/buttonsd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"

vcnet/checkers.vcproj

@@ -35,7 +35,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="fltkd.lib wsock32.lib comctl32.lib"
+				AdditionalDependencies="fltkd.lib comctl32.lib"
 				OutputFile="../test/checkersd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -100,7 +100,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="fltk.lib wsock32.lib comctl32.lib"
+				AdditionalDependencies="fltk.lib comctl32.lib"
 				OutputFile="../test/checkers.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"

vcnet/clock.vcproj

@@ -35,7 +35,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="fltkd.lib wsock32.lib comctl32.lib"
+				AdditionalDependencies="fltkd.lib comctl32.lib"
 				OutputFile="../test/clockd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -100,7 +100,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="fltk.lib wsock32.lib comctl32.lib"
+				AdditionalDependencies="fltk.lib comctl32.lib"
 				OutputFile="../test/clock.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"

vcnet/colbrowser.vcproj

@@ -36,7 +36,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="fltk.lib wsock32.lib comctl32.lib"
+				AdditionalDependencies="fltk.lib comctl32.lib"
 				OutputFile="../test/colbrowser.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -99,7 +99,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="fltkd.lib wsock32.lib comctl32.lib"
+				AdditionalDependencies="fltkd.lib comctl32.lib"
 				OutputFile="../test/colbrowserd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"

vcnet/color_chooser.vcproj

@@ -35,7 +35,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="fltkd.lib wsock32.lib comctl32.lib"
+				AdditionalDependencies="fltkd.lib comctl32.lib"
 				OutputFile="../test/color_chooserd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -99,7 +99,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="fltk.lib wsock32.lib comctl32.lib"
+				AdditionalDependencies="fltk.lib comctl32.lib"
 				OutputFile="../test/color_chooser.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"

vcnet/cube.vcproj

@@ -36,7 +36,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="glu32.lib opengl32.lib comctl32.lib wsock32.lib"
+				AdditionalDependencies="glu32.lib opengl32.lib comctl32.lib"
 				OutputFile="../test/cube.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -99,7 +99,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="glu32.lib opengl32.lib comctl32.lib wsock32.lib"
+				AdditionalDependencies="glu32.lib opengl32.lib comctl32.lib"
 				OutputFile="../test/cubed.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"

vcnet/cursor.vcproj

@@ -35,7 +35,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="fltkd.lib wsock32.lib comctl32.lib"
+				AdditionalDependencies="fltkd.lib comctl32.lib"
 				OutputFile="../test/cursord.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -100,7 +100,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="fltk.lib wsock32.lib comctl32.lib"
+				AdditionalDependencies="fltk.lib comctl32.lib"
 				OutputFile="../test/cursor.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"

vcnet/curve.vcproj

@@ -35,7 +35,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="fltkd.lib wsock32.lib comctl32.lib"
+				AdditionalDependencies="fltkd.lib comctl32.lib"
 				OutputFile="../test/curved.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -100,7 +100,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="fltk.lib wsock32.lib comctl32.lib"
+				AdditionalDependencies="fltk.lib comctl32.lib"
 				OutputFile="../test/curve.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"

vcnet/demo.vcproj

@@ -36,7 +36,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="fltk.lib wsock32.lib comctl32.lib"
+				AdditionalDependencies="fltk.lib comctl32.lib"
 				OutputFile="../test/demo.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -99,7 +99,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="fltkd.lib wsock32.lib comctl32.lib"
+				AdditionalDependencies="fltkd.lib comctl32.lib"
 				OutputFile="../test/demod.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"

vcnet/doublebuffer.vcproj

@@ -35,7 +35,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="fltkd.lib wsock32.lib comctl32.lib"
+				AdditionalDependencies="fltkd.lib comctl32.lib"
 				OutputFile="../test/doublebufferd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -100,7 +100,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="fltk.lib wsock32.lib comctl32.lib"
+				AdditionalDependencies="fltk.lib comctl32.lib"
 				OutputFile="../test/doublebuffer.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"

vcnet/editor.vcproj

@@ -36,7 +36,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="wsock32.lib comctl32.lib"
+				AdditionalDependencies="comctl32.lib"
 				OutputFile="../test/editor.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -100,7 +100,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="wsock32.lib comctl32.lib"
+				AdditionalDependencies="comctl32.lib"
 				OutputFile="../test/editord.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"

vcnet/fast_slow.vcproj

@@ -35,7 +35,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="fltkd.lib wsock32.lib comctl32.lib"
+				AdditionalDependencies="fltkd.lib comctl32.lib"
 				OutputFile="../test/fast_slowd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -100,7 +100,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="fltk.lib wsock32.lib comctl32.lib"
+				AdditionalDependencies="fltk.lib comctl32.lib"
 				OutputFile="../test/fast_slow.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"

vcnet/file_chooser.vcproj

@@ -35,7 +35,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="wsock32.lib comctl32.lib"
+				AdditionalDependencies="comctl32.lib"
 				OutputFile="../test/file_chooserd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -100,7 +100,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="wsock32.lib comctl32.lib"
+				AdditionalDependencies="comctl32.lib"
 				OutputFile="../test/file_chooser.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"

vcnet/fltkdll.vcproj

@@ -37,7 +37,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="opengl32.lib wsock32.lib comctl32.lib"
+				AdditionalDependencies="opengl32.lib comctl32.lib"
 				OutputFile="fltkdll.dll"
 				Version="1.0"
 				LinkIncremental="1"
@@ -100,7 +100,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="opengl32.lib wsock32.lib comctl32.lib"
+				AdditionalDependencies="opengl32.lib comctl32.lib"
 				OutputFile="fltkdlld.dll"
 				Version="1.0"
 				LinkIncremental="1"

vcnet/fluid.vcproj

@@ -36,7 +36,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="wsock32.lib comctl32.lib"
+				AdditionalDependencies="comctl32.lib"
 				OutputFile="../fluid/fluidd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -102,7 +102,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="wsock32.lib comctl32.lib"
+				AdditionalDependencies="comctl32.lib"
 				OutputFile="../fluid/fluid.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"

vcnet/fonts.vcproj

@@ -35,7 +35,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="fltkd.lib wsock32.lib comctl32.lib"
+				AdditionalDependencies="fltkd.lib comctl32.lib"
 				OutputFile="../test/fontsd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -100,7 +100,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="fltk.lib wsock32.lib comctl32.lib"
+				AdditionalDependencies="fltk.lib comctl32.lib"
 				OutputFile="../test/fonts.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"

vcnet/forms.vcproj

@@ -35,7 +35,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="fltkd.lib wsock32.lib comctl32.lib"
+				AdditionalDependencies="fltkd.lib comctl32.lib"
 				OutputFile="../test/formsd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -100,7 +100,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="fltk.lib wsock32.lib comctl32.lib"
+				AdditionalDependencies="fltk.lib comctl32.lib"
 				OutputFile="../test/forms.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"

vcnet/fractals.vcproj

@@ -35,7 +35,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="glu32.lib opengl32.lib comctl32.lib wsock32.lib"
+				AdditionalDependencies="glu32.lib opengl32.lib comctl32.lib"
 				OutputFile="../test/fractalsd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -100,7 +100,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="glu32.lib opengl32.lib comctl32.lib wsock32.lib"
+				AdditionalDependencies="glu32.lib opengl32.lib comctl32.lib"
 				OutputFile="../test/fractals.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"

vcnet/fullscreen.vcproj

@@ -35,7 +35,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="opengl32.lib glu32.lib fltkd.lib wsock32.lib comctl32.lib"
+				AdditionalDependencies="opengl32.lib glu32.lib fltkd.lib comctl32.lib"
 				OutputFile="../test/fullscreend.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -100,7 +100,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="opengl32.lib glu32.lib fltk.lib wsock32.lib comctl32.lib"
+				AdditionalDependencies="opengl32.lib glu32.lib fltk.lib comctl32.lib"
 				OutputFile="../test/fullscreen.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"

vcnet/gl_overlay.vcproj

@@ -36,7 +36,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="glu32.lib opengl32.lib comctl32.lib wsock32.lib"
+				AdditionalDependencies="glu32.lib opengl32.lib comctl32.lib"
 				OutputFile="../test/gl_overlay.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -99,7 +99,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="glu32.lib opengl32.lib comctl32.lib wsock32.lib"
+				AdditionalDependencies="glu32.lib opengl32.lib comctl32.lib"
 				OutputFile="../test/gl_overlayd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"

vcnet/glpuzzle.vcproj

@@ -35,7 +35,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="glu32.lib opengl32.lib comctl32.lib wsock32.lib"
+				AdditionalDependencies="glu32.lib opengl32.lib comctl32.lib"
 				OutputFile="../test/glpuzzled.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -100,7 +100,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="glu32.lib opengl32.lib comctl32.lib wsock32.lib"
+				AdditionalDependencies="glu32.lib opengl32.lib comctl32.lib"
 				OutputFile="../test/glpuzzle.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"

vcnet/hello.vcproj

@@ -35,7 +35,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="fltkd.lib wsock32.lib comctl32.lib"
+				AdditionalDependencies="fltkd.lib comctl32.lib"
 				OutputFile="../test/hellod.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -100,7 +100,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="fltk.lib wsock32.lib comctl32.lib"
+				AdditionalDependencies="fltk.lib comctl32.lib"
 				OutputFile="../test/hello.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"

vcnet/help.vcproj

@@ -36,7 +36,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="wsock32.lib comctl32.lib"
+				AdditionalDependencies="comctl32.lib"
 				OutputFile="../test/help.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -99,7 +99,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="wsock32.lib comctl32.lib"
+				AdditionalDependencies="comctl32.lib"
 				OutputFile="../test/helpd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"

vcnet/iconize.vcproj

@@ -35,7 +35,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="fltkd.lib wsock32.lib comctl32.lib"
+				AdditionalDependencies="fltkd.lib comctl32.lib"
 				OutputFile="../test/iconized.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -100,7 +100,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="fltk.lib wsock32.lib comctl32.lib"
+				AdditionalDependencies="fltk.lib comctl32.lib"
 				OutputFile="../test/iconize.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"

vcnet/image.vcproj

@@ -36,7 +36,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="fltk.lib wsock32.lib comctl32.lib"
+				AdditionalDependencies="fltk.lib comctl32.lib"
 				OutputFile="../test/image.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -99,7 +99,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="fltkd.lib wsock32.lib comctl32.lib"
+				AdditionalDependencies="fltkd.lib comctl32.lib"
 				OutputFile="../test/imaged.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"

vcnet/inactive.vcproj

@@ -35,7 +35,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="fltkd.lib wsock32.lib comctl32.lib"
+				AdditionalDependencies="fltkd.lib comctl32.lib"
 				OutputFile="../test/inactived.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -100,7 +100,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="fltk.lib wsock32.lib comctl32.lib"
+				AdditionalDependencies="fltk.lib comctl32.lib"
 				OutputFile="../test/inactive.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"

vcnet/input.vcproj

@@ -36,7 +36,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="fltk.lib wsock32.lib comctl32.lib"
+				AdditionalDependencies="fltk.lib comctl32.lib"
 				OutputFile="../test/input.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -99,7 +99,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="fltkd.lib wsock32.lib comctl32.lib"
+				AdditionalDependencies="fltkd.lib comctl32.lib"
 				OutputFile="../test/inputd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"

vcnet/input_choice.vcproj

@@ -36,7 +36,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="fltkd.lib wsock32.lib comctl32.lib"
+				AdditionalDependencies="fltkd.lib comctl32.lib"
 				OutputFile="../test/input_choiced.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -101,7 +101,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="fltk.lib wsock32.lib comctl32.lib"
+				AdditionalDependencies="fltk.lib comctl32.lib"
 				OutputFile="../test/input_choice.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"

vcnet/keyboard.vcproj

@@ -36,7 +36,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="fltk.lib wsock32.lib comctl32.lib"
+				AdditionalDependencies="fltk.lib comctl32.lib"
 				OutputFile="../test/keyboard.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -99,7 +99,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="fltkd.lib wsock32.lib comctl32.lib"
+				AdditionalDependencies="fltkd.lib comctl32.lib"
 				OutputFile="../test/keyboardd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"

vcnet/label.vcproj

@@ -35,7 +35,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="fltkd.lib wsock32.lib comctl32.lib"
+				AdditionalDependencies="fltkd.lib comctl32.lib"
 				OutputFile="../test/labeld.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -100,7 +100,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="fltk.lib wsock32.lib comctl32.lib"
+				AdditionalDependencies="fltk.lib comctl32.lib"
 				OutputFile="../test/label.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"

vcnet/line_style.vcproj

@@ -36,7 +36,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="fltk.lib wsock32.lib comctl32.lib"
+				AdditionalDependencies="fltk.lib comctl32.lib"
 				OutputFile="../test/line_style.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -99,7 +99,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="fltkd.lib wsock32.lib comctl32.lib"
+				AdditionalDependencies="fltkd.lib comctl32.lib"
 				OutputFile="../test/line_styled.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"

vcnet/mandelbrot.vcproj

@@ -35,7 +35,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="glu32.lib opengl32.lib fltkd.lib wsock32.lib comctl32.lib"
+				AdditionalDependencies="glu32.lib opengl32.lib fltkd.lib comctl32.lib"
 				OutputFile="../test/mandelbrotd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -100,7 +100,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="glu32.lib opengl32.lib fltk.lib wsock32.lib comctl32.lib"
+				AdditionalDependencies="glu32.lib opengl32.lib fltk.lib comctl32.lib"
 				OutputFile="../test/mandelbrot.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"

vcnet/menubar.vcproj

@@ -35,7 +35,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="fltkd.lib wsock32.lib comctl32.lib"
+				AdditionalDependencies="fltkd.lib comctl32.lib"
 				OutputFile="../test/menubard.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -99,7 +99,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="fltk.lib wsock32.lib comctl32.lib"
+				AdditionalDependencies="fltk.lib comctl32.lib"
 				OutputFile="../test/menubar.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"

vcnet/message.vcproj

@@ -35,7 +35,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="fltkd.lib wsock32.lib comctl32.lib"
+				AdditionalDependencies="fltkd.lib comctl32.lib"
 				OutputFile="../test/messaged.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -100,7 +100,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="fltk.lib wsock32.lib comctl32.lib"
+				AdditionalDependencies="fltk.lib comctl32.lib"
 				OutputFile="../test/message.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"

vcnet/minimum.vcproj

@@ -36,7 +36,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="fltk.lib wsock32.lib comctl32.lib"
+				AdditionalDependencies="fltk.lib comctl32.lib"
 				OutputFile="../test/minimum.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -99,7 +99,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="fltkd.lib wsock32.lib comctl32.lib"
+				AdditionalDependencies="fltkd.lib comctl32.lib"
 				OutputFile="../test/minimumd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"

vcnet/navigation.vcproj

@@ -36,7 +36,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="fltk.lib wsock32.lib comctl32.lib"
+				AdditionalDependencies="fltk.lib comctl32.lib"
 				OutputFile="../test/navigation.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -99,7 +99,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="fltkd.lib wsock32.lib comctl32.lib"
+				AdditionalDependencies="fltkd.lib comctl32.lib"
 				OutputFile="../test/navigationd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"

vcnet/output.vcproj

@@ -36,7 +36,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="fltk.lib wsock32.lib comctl32.lib"
+				AdditionalDependencies="fltk.lib comctl32.lib"
 				OutputFile="../test/output.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -99,7 +99,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="fltkd.lib wsock32.lib comctl32.lib"
+				AdditionalDependencies="fltkd.lib comctl32.lib"
 				OutputFile="../test/outputd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"