WIN32 compile fixes...

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

9 files changed, 51 insertions, 40 deletions

diff --git a/src/Fl_win32.cxx b/src/Fl_win32.cxx
index 4e73eaf6d..5573a8848 100644
--- a/src/Fl_win32.cxx
+++ b/src/Fl_win32.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_win32.cxx,v 1.33.2.37.2.50 2004/10/18 20:22:24 easysw Exp $"
+// "$Id: Fl_win32.cxx,v 1.33.2.37.2.51 2004/10/19 18:21:52 easysw Exp $"
 //
 // WIN32-specific code for the Fast Light Tool Kit (FLTK).
 //
@@ -30,6 +30,7 @@
 #include <FL/Fl.H>
 #include <FL/x.H>
 #include <FL/Fl_Window.H>
+#include <FL/Enumerations.H>
 #include "flstring.h"
 #include <stdio.h>
 #include <stdlib.h>
@@ -737,34 +738,34 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPar
 	Fl::e_length = 0;
 	switch (Fl::e_keysym) {
 	  case FL_KP + '0' :
-	    Fl::e_keysym = Fl_Insert;
+	    Fl::e_keysym = FL_Insert;
 	    break;
 	  case FL_KP + '1' :
-	    Fl::e_keysym = Fl_End;
+	    Fl::e_keysym = FL_End;
 	    break;
 	  case FL_KP + '2' :
-	    Fl::e_keysym = Fl_Down;
+	    Fl::e_keysym = FL_Down;
 	    break;
 	  case FL_KP + '3' :
-	    Fl::e_keysym = Fl_Page_Down;
+	    Fl::e_keysym = FL_Page_Down;
 	    break;
 	  case FL_KP + '4' :
-	    Fl::e_keysym = Fl_Left;
+	    Fl::e_keysym = FL_Left;
 	    break;
 	  case FL_KP + '6' :
-	    Fl::e_keysym = Fl_Right;
+	    Fl::e_keysym = FL_Right;
 	    break;
 	  case FL_KP + '7' :
-	    Fl::e_keysym = Fl_Home;
+	    Fl::e_keysym = FL_Home;
 	    break;
 	  case FL_KP + '8' :
-	    Fl::e_keysym = Fl_Up;
+	    Fl::e_keysym = FL_Up;
 	    break;
 	  case FL_KP + '9' :
-	    Fl::e_keysym = Fl_Page_Up;
+	    Fl::e_keysym = FL_Page_Up;
 	    break;
 	  case FL_KP + '.' :
-	    Fl::e_keysym = Fl_Delete;
+	    Fl::e_keysym = FL_Delete;
 	    break;
 	  case FL_KP + '/' :
 	  case FL_KP + '*' :
@@ -1241,5 +1242,5 @@ void Fl_Window::make_current() {
 }
 
 //
-// End of "$Id: Fl_win32.cxx,v 1.33.2.37.2.50 2004/10/18 20:22:24 easysw Exp $".
+// End of "$Id: Fl_win32.cxx,v 1.33.2.37.2.51 2004/10/19 18:21:52 easysw Exp $".
 //
diff --git a/vcnet/jpeg.vcproj b/vcnet/jpeg.vcproj
index 153f2f2ac..1b349b71c 100644
--- a/vcnet/jpeg.vcproj
+++ b/vcnet/jpeg.vcproj
@@ -36,7 +36,7 @@
 				Name="VCCustomBuildTool"/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="jpegd.lib"

+				OutputFile="..\lib\fltkjpegd.lib"

 				SuppressStartupBanner="TRUE"/>

 			<Tool

 				Name="VCMIDLTool"/>

@@ -86,7 +86,7 @@
 				Name="VCCustomBuildTool"/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="jpeg.lib"

+				OutputFile="..\lib\fltkjpeg.lib"

 				SuppressStartupBanner="TRUE"/>

 			<Tool

 				Name="VCMIDLTool"/>

diff --git a/vcnet/libpng.vcproj b/vcnet/libpng.vcproj
index 35d2a4b53..fc54e9419 100644
--- a/vcnet/libpng.vcproj
+++ b/vcnet/libpng.vcproj
@@ -39,7 +39,7 @@
 				Name="VCCustomBuildTool"/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="png.lib"

+				OutputFile="..\lib\fltkpng.lib"

 				SuppressStartupBanner="TRUE"/>

 			<Tool

 				Name="VCMIDLTool"/>

@@ -86,7 +86,7 @@
 				Name="VCCustomBuildTool"/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="pngd.lib"

+				OutputFile="..\lib\fltkpngd.lib"

 				SuppressStartupBanner="TRUE"/>

 			<Tool

 				Name="VCMIDLTool"/>

diff --git a/vcnet/zlib.vcproj b/vcnet/zlib.vcproj
index 8cb555973..13bfe290b 100644
--- a/vcnet/zlib.vcproj
+++ b/vcnet/zlib.vcproj
@@ -36,7 +36,7 @@
 				Name="VCCustomBuildTool"/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="zd.lib"

+				OutputFile="..\lib\fltkzd.lib"

 				SuppressStartupBanner="TRUE"/>

 			<Tool

 				Name="VCMIDLTool"/>

@@ -85,7 +85,7 @@
 				Name="VCCustomBuildTool"/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="z.lib"

+				OutputFile="..\lib\fltkz.lib"

 				SuppressStartupBanner="TRUE"/>

 			<Tool

 				Name="VCMIDLTool"/>

diff --git a/visualc/fltkdll.dsp b/visualc/fltkdll.dsp
index f978dd425..61cd55aec 100644
--- a/visualc/fltkdll.dsp
+++ b/visualc/fltkdll.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /Os /Ob2 /I "." /I ".." /D "FL_DLL" /D "FL_LIBRARY" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /c

+# ADD CPP /nologo /MD /W3 /GX /Os /Ob2 /I "." /I ".." /I "..\zlib" /I "..\png" /I "..\jpeg" /D "FL_DLL" /D "FL_LIBRARY" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /c

 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"

 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

@@ -53,7 +53,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /machine:I386

-# ADD LINK32 jpeg.lib png.lib z.lib opengl32.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /version:1.0 /subsystem:windows /dll /pdb:"fltkdll.pdb" /machine:I386 /nodefaultlib:"libcd" /nodefaultlib:"libcmt" /out:"fltkdll.dll"

+# ADD LINK32 jpeg.lib png.lib z.lib opengl32.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /version:1.0 /subsystem:windows /dll /pdb:"fltkdll.pdb" /machine:I386 /nodefaultlib:"libcmt" /nodefaultlib:"msvcrt" /out:"fltkdll.dll"

 # SUBTRACT LINK32 /pdb:none

 

 !ELSEIF  "$(CFG)" == "fltkdll - Win32 Debug"

@@ -70,7 +70,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c

-# ADD CPP /nologo /MDd /GX /ZI /Od /I "." /I ".." /D "FL_DLL" /D "FL_LIBRARY" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /c

+# ADD CPP /nologo /MDd /GX /ZI /Od /I "." /I ".." /I "..\zlib" /I "..\png" /I "..\jpeg" /D "FL_DLL" /D "FL_LIBRARY" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /c

 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

@@ -80,7 +80,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 jpeg.lib png.lib z.lib opengl32.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /version:1.0 /subsystem:windows /dll /pdb:"fltkdlld.pdb" /debug /machine:I386 /nodefaultlib:"libc" /nodefaultlib:"libcd" /nodefaultlib:"libcmt" /nodefaultlib:"libcmtd" /out:"fltkdlld.dll" /pdbtype:sept

+# ADD LINK32 jpeg.lib png.lib z.lib opengl32.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /version:1.0 /subsystem:windows /dll /pdb:"fltkdlld.pdb" /debug /machine:I386 /nodefaultlib:"libcmtd" /nodefaultlib:"msvcrt" /out:"fltkdlld.dll" /pdbtype:sept

 # SUBTRACT LINK32 /pdb:none /incremental:no

 

 !ENDIF 

@@ -252,6 +252,7 @@ SOURCE=..\src\fl_arci.cxx
 DEP_CPP_FL_ARC=\

 	"..\FL\math.h"\

 	"..\fl\x.h"\

+	".\config.h"\

 	{$(INCLUDE)}"fl\enumerations.h"\

 	{$(INCLUDE)}"fl\fl_draw.h"\

 	{$(INCLUDE)}"fl\fl_export.h"\

@@ -988,6 +989,7 @@ DEP_CPP_FL_GE=\
 	"..\fl\x.h"\

 	"..\src\Fl_get_key_mac.cxx"\

 	"..\src\fl_get_key_win32.cxx"\

+	".\config.h"\

 	{$(INCLUDE)}"fl\enumerations.h"\

 	{$(INCLUDE)}"fl\fl.h"\

 	{$(INCLUDE)}"fl\fl_export.h"\

@@ -1043,6 +1045,7 @@ DEP_CPP_FL_GI=\
 SOURCE=..\src\Fl_Gl_Choice.cxx

 DEP_CPP_FL_GL=\

 	"..\FL\gl.h"\

+	"..\fl\gl_draw.h"\

 	"..\fl\x.h"\

 	"..\src\Fl_Gl_Choice.H"\

 	"..\src\flstring.h"\

@@ -1249,15 +1252,15 @@ DEP_CPP_FL_INP=\
 SOURCE=..\src\Fl_JPEG_Image.cxx

 DEP_CPP_FL_JP=\

 	"..\fl\fl_jpeg_image.h"\

+	"..\jpeg\jpeglib.h"\

 	".\config.h"\

 	{$(INCLUDE)}"fl\enumerations.h"\

 	{$(INCLUDE)}"fl\fl_export.h"\

 	{$(INCLUDE)}"fl\fl_image.h"\

-	{$(INCLUDE)}"jconfig.h"\

-	{$(INCLUDE)}"jerror.h"\

-	{$(INCLUDE)}"jmorecfg.h"\

-	{$(INCLUDE)}"jpegint.h"\

-	{$(INCLUDE)}"jpeglib.h"\

+	{$(INCLUDE)}"jpeg\jconfig.h"\

+	{$(INCLUDE)}"jpeg\jerror.h"\

+	{$(INCLUDE)}"jpeg\jmorecfg.h"\

+	{$(INCLUDE)}"jpeg\jpegint.h"\

 	

 # End Source File

 # Begin Source File

@@ -1458,6 +1461,7 @@ DEP_CPP_FL_OV=\
 SOURCE=..\src\fl_overlay.cxx

 DEP_CPP_FL_OVE=\

 	"..\fl\x.h"\

+	".\config.h"\

 	{$(INCLUDE)}"fl\enumerations.h"\

 	{$(INCLUDE)}"fl\fl_draw.h"\

 	{$(INCLUDE)}"fl\fl_export.h"\

@@ -1570,18 +1574,18 @@ DEP_CPP_FL_PL=\
 SOURCE=..\src\Fl_PNG_Image.cxx

 DEP_CPP_FL_PN=\

 	"..\fl\fl_png_image.h"\

+	"..\png\png.h"\

+	"..\zlib\zlib.h"\

 	".\config.h"\

 	{$(INCLUDE)}"fl\enumerations.h"\

 	{$(INCLUDE)}"fl\fl.h"\

 	{$(INCLUDE)}"fl\fl_export.h"\

 	{$(INCLUDE)}"fl\fl_image.h"\

-	{$(INCLUDE)}"png.h"\

-	{$(INCLUDE)}"pngconf.h"\

-	{$(INCLUDE)}"zconf.h"\

-	{$(INCLUDE)}"zlib.h"\

+	{$(INCLUDE)}"png\pngconf.h"\

+	{$(INCLUDE)}"zlib\zconf.h"\

 	

 NODEP_CPP_FL_PN=\

-	"..\..\htmldoc-1.8\png\alloc.h"\

+	"..\png\pngusr.h"\

 	

 # End Source File

 # Begin Source File

@@ -1642,6 +1646,7 @@ DEP_CPP_FL_PRO=\
 SOURCE=..\src\fl_rect.cxx

 DEP_CPP_FL_RE=\

 	"..\fl\x.h"\

+	".\config.h"\

 	{$(INCLUDE)}"fl\enumerations.h"\

 	{$(INCLUDE)}"fl\fl_draw.h"\

 	{$(INCLUDE)}"fl\fl_export.h"\

@@ -1728,6 +1733,7 @@ DEP_CPP_FL_ROUND=\
 SOURCE=..\src\Fl_Scroll.cxx

 DEP_CPP_FL_SC=\

 	"..\fl\fl_scroll.h"\

+	"..\fl\fl_tiled_image.h"\

 	{$(INCLUDE)}"fl\enumerations.h"\

 	{$(INCLUDE)}"fl\fl.h"\

 	{$(INCLUDE)}"fl\fl_draw.h"\

@@ -1745,7 +1751,9 @@ DEP_CPP_FL_SC=\
 SOURCE=..\src\fl_scroll_area.cxx

 DEP_CPP_FL_SCR=\

 	"..\fl\x.h"\

+	".\config.h"\

 	{$(INCLUDE)}"fl\enumerations.h"\

+	{$(INCLUDE)}"fl\fl.h"\

 	{$(INCLUDE)}"fl\fl_export.h"\

 	{$(INCLUDE)}"fl\fl_group.h"\

 	{$(INCLUDE)}"fl\fl_widget.h"\

@@ -2083,6 +2091,7 @@ SOURCE=..\src\fl_vertex.cxx
 DEP_CPP_FL_VE=\

 	"..\FL\math.h"\

 	"..\fl\x.h"\

+	".\config.h"\

 	{$(INCLUDE)}"fl\enumerations.h"\

 	{$(INCLUDE)}"fl\fl_draw.h"\

 	{$(INCLUDE)}"fl\fl_export.h"\

@@ -2142,6 +2151,7 @@ DEP_CPP_FL_WIN=\
 SOURCE=..\src\Fl_Window_fullscreen.cxx

 DEP_CPP_FL_WIND=\

 	"..\fl\x.h"\

+	".\config.h"\

 	{$(INCLUDE)}"fl\enumerations.h"\

 	{$(INCLUDE)}"fl\fl.h"\

 	{$(INCLUDE)}"fl\fl_export.h"\

diff --git a/visualc/fltkimages.dsp b/visualc/fltkimages.dsp
index 5cc8c135f..a75af672c 100644
--- a/visualc/fltkimages.dsp
+++ b/visualc/fltkimages.dsp
@@ -41,7 +41,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c

-# ADD CPP /nologo /MD /GX /Ot /Op /Ob2 /I "." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c

+# ADD CPP /nologo /MD /GX /Ot /Op /Ob2 /I "." /I ".." /I "..\zlib" /I "..\png" /I "..\jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c

 # SUBTRACT CPP /Os

 # ADD BASE RSC /l 0x409

 # ADD RSC /l 0x409

@@ -65,7 +65,7 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "Debug"

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c

-# ADD CPP /nologo /MDd /GX /Z7 /Od /I "." /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /FR /YX /FD /c

+# ADD CPP /nologo /MDd /GX /Z7 /Od /I "." /I ".." /I "..\zlib" /I "..\png" /I "..\jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /FR /YX /FD /c

 # ADD BASE RSC /l 0x409

 # ADD RSC /l 0x409

 BSC32=bscmake.exe

diff --git a/visualc/jpeg.dsp b/visualc/jpeg.dsp
index 89ba1267e..f8cf58b60 100644
--- a/visualc/jpeg.dsp
+++ b/visualc/jpeg.dsp
@@ -50,7 +50,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LIB32=link.exe -lib

 # ADD BASE LIB32 /nologo

-# ADD LIB32 /nologo /out:"jpeg.lib"

+# ADD LIB32 /nologo /out:"..\lib\fltkjpeg.lib"

 

 !ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"

 

@@ -73,7 +73,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LIB32=link.exe -lib

 # ADD BASE LIB32 /nologo

-# ADD LIB32 /nologo /out:"jpegd.lib"

+# ADD LIB32 /nologo /out:"..\lib\fltkjpegd.lib"

 

 !ENDIF 

 

diff --git a/visualc/libpng.dsp b/visualc/libpng.dsp
index e8350aa90..44ef669e3 100644
--- a/visualc/libpng.dsp
+++ b/visualc/libpng.dsp
@@ -50,7 +50,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LIB32=link.exe -lib

 # ADD BASE LIB32 /nologo

-# ADD LIB32 /nologo /out:"png.lib"

+# ADD LIB32 /nologo /out:"..\fltkpng.lib"

 

 !ELSEIF  "$(CFG)" == "libpng - Win32 Debug"

 

@@ -73,7 +73,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LIB32=link.exe -lib

 # ADD BASE LIB32 /nologo

-# ADD LIB32 /nologo /out:"pngd.lib"

+# ADD LIB32 /nologo /out:"..\lib\fltkpngd.lib"

 

 !ENDIF 

 

diff --git a/visualc/zlib.dsp b/visualc/zlib.dsp
index 1f8a80d29..33b3447de 100644
--- a/visualc/zlib.dsp
+++ b/visualc/zlib.dsp
@@ -50,7 +50,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LIB32=link.exe -lib

 # ADD BASE LIB32 /nologo

-# ADD LIB32 /nologo /out:"z.lib"

+# ADD LIB32 /nologo /out:"..\lib\fltkz.lib"

 

 !ELSEIF  "$(CFG)" == "zlib - Win32 Debug"

 

@@ -73,7 +73,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LIB32=link.exe -lib

 # ADD BASE LIB32 /nologo

-# ADD LIB32 /nologo /out:"zd.lib"

+# ADD LIB32 /nologo /out:"..\lib\fltkzd.lib"

 

 !ENDIF