Switching to John Fays version of the VC++ project files.

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@52 7f0cb862-5218-0410-a997-914c9d46530a

diff --git a/freeglut.dsp b/freeglut.dsp
index 43f7a77..a27eb3a 100644 (file)
--- a/freeglut.dsp
+++ b/freeglut.dsp
@@ -2,7 +2,7 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
 
 CFG=freeglut - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
@@ -17,8 +17,8 @@ CFG=freeglut - Win32 Debug
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "freeglut - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "freeglut - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "freeglut - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "freeglut - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE 
 
 # Begin Project
@@ -26,6 +26,7 @@ CFG=freeglut - Win32 Debug
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
 CPP=cl.exe
+MTL=midl.exe
 RSC=rc.exe
 
 !IF  "$(CFG)" == "freeglut - Win32 Release"
@@ -40,16 +41,18 @@ RSC=rc.exe
 # PROP Output_Dir "Release"
 # PROP Intermediate_Dir "Release"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "FREEGLUT_LIBRARY_BUILD" /YX /FD /c
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "FREEGLUT_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "FREEGLUT_EXPORTS" /YX /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /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 odbc32.lib odbccp32.lib /nologo /dll /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
 
 !ELSEIF  "$(CFG)" == "freeglut - Win32 Debug"
 
@@ -63,16 +66,18 @@ LIB32=link.exe -lib
 # PROP Output_Dir "Debug"
 # PROP Intermediate_Dir "Debug"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "include" /D "_DEBUG" /D "FREEGLUT_LIBRARY_BUILD" /D "WIN32" /D "_MBCS" /D "_LIB" /FR /YX /FD /GZ /c
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "FREEGLUT_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "FREEGLUT_EXPORTS" /FR /YX /FD /GZ /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /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 odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
 
 !ENDIF 
 
@@ -173,8 +178,20 @@ SOURCE=.\include\GL\freeglut.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\include\GL\freeglut_internal.h
+SOURCE=.\include\GL\freeglut_ext.h
 # End Source File
+# Begin Source File
+
+SOURCE=".\freeglut-1.3\freeglut_internal.h"
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\GL\glut.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
 # End Group
 # End Target
 # End Project

diff --git a/freeglut.dsw b/freeglut.dsw
index 883b368..a35a03c 100755 (executable)
--- a/freeglut.dsw
+++ b/freeglut.dsw
@@ -15,7 +15,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "freeglutdll"=.\freeglutdll.dsp - Package Owner=<4>
+Project: "freeglut_static"=.\freeglut_static.dsp - Package Owner=<4>
 
 Package=<5>
 {{{

diff --git a/freeglut_static.dsp b/freeglut_static.dsp
new file mode 100644 (file)
index 0000000..e20037b
--- /dev/null
+++ b/freeglut_static.dsp
@@ -0,0 +1,188 @@
+# Microsoft Developer Studio Project File - Name="freeglut_static" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=freeglut_static - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "freeglut_static.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "freeglut_static.mak" CFG="freeglut_static - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "freeglut_static - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "freeglut_static - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "freeglut_static - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "freeglut_static___Win32_Release"
+# PROP BASE Intermediate_Dir "freeglut_static___Win32_Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "freeglut_static___Win32_Release"
+# PROP Intermediate_Dir "freeglut_static___Win32_Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /D "NDEBUG" /D "FREEGLUT_STATIC" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "freeglut_static - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "freeglut_static___Win32_Debug"
+# PROP BASE Intermediate_Dir "freeglut_static___Win32_Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "freeglut_static___Win32_Debug"
+# PROP Intermediate_Dir "freeglut_static___Win32_Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ  /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "_DEBUG" /D "FREEGLUT_STATIC" /D "WIN32" /D "_MBCS" /D "_LIB" /FR /YX /FD /GZ  /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF 
+
+# Begin Target
+
+# Name "freeglut_static - Win32 Release"
+# Name "freeglut_static - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=".\freeglut-1.3\freeglut_callbacks.c"
+# End Source File
+# Begin Source File
+
+SOURCE=".\freeglut-1.3\freeglut_cursor.c"
+# End Source File
+# Begin Source File
+
+SOURCE=".\freeglut-1.3\freeglut_display.c"
+# End Source File
+# Begin Source File
+
+SOURCE=".\freeglut-1.3\freeglut_font.c"
+# End Source File
+# Begin Source File
+
+SOURCE=".\freeglut-1.3\freeglut_font_data.c"
+# End Source File
+# Begin Source File
+
+SOURCE=".\freeglut-1.3\freeglut_gamemode.c"
+# End Source File
+# Begin Source File
+
+SOURCE=".\freeglut-1.3\freeglut_geometry.c"
+# End Source File
+# Begin Source File
+
+SOURCE=".\freeglut-1.3\freeglut_init.c"
+# End Source File
+# Begin Source File
+
+SOURCE=".\freeglut-1.3\freeglut_joystick.c"
+# End Source File
+# Begin Source File
+
+SOURCE=".\freeglut-1.3\freeglut_main.c"
+# End Source File
+# Begin Source File
+
+SOURCE=".\freeglut-1.3\freeglut_menu.c"
+# End Source File
+# Begin Source File
+
+SOURCE=".\freeglut-1.3\freeglut_misc.c"
+# End Source File
+# Begin Source File
+
+SOURCE=".\freeglut-1.3\freeglut_overlay.c"
+# End Source File
+# Begin Source File
+
+SOURCE=".\freeglut-1.3\freeglut_state.c"
+# End Source File
+# Begin Source File
+
+SOURCE=".\freeglut-1.3\freeglut_stroke_mono_roman.c"
+# End Source File
+# Begin Source File
+
+SOURCE=".\freeglut-1.3\freeglut_stroke_roman.c"
+# End Source File
+# Begin Source File
+
+SOURCE=".\freeglut-1.3\freeglut_structure.c"
+# End Source File
+# Begin Source File
+
+SOURCE=".\freeglut-1.3\freeglut_teapot.c"
+# End Source File
+# Begin Source File
+
+SOURCE=".\freeglut-1.3\freeglut_videoresize.c"
+# End Source File
+# Begin Source File
+
+SOURCE=".\freeglut-1.3\freeglut_window.c"
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\include\GL\freeglut.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\GL\freeglut_ext.h
+# End Source File
+# Begin Source File
+
+SOURCE=".\freeglut-1.3\freeglut_internal.h"
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\GL\glut.h
+# End Source File
+# End Group
+# End Target
+# End Project