Module twilight: Change committed

warp at icculus.org warp at icculus.org
Fri Jul 26 00:33:58 EDT 2002 

Commiter   : warp
CVSROOT    : /cvs/cvsroot/twilight
Module     : twilight
Commit time: 2002-07-26 04:33:58 UTC

Log message:

According to damm this should fix the windows compile.

Modified files:
     nq/nq.dsp qw/qw.dsp src/renderer/twilight_renderer.dsp

------=MIME.fbd7c61f3ce732acad8a8ebb5ce4b2f6
Content-Type: text/plain; name="twilight.20020726.043358.warp.diff"
Content-Disposition: attachment; filename="twilight.20020726.043358.warp.diff"
Content-Transfer-Encoding: 8bit

Index: twilight/nq/nq.dsp
diff -u twilight/nq/nq.dsp:1.49 twilight/nq/nq.dsp:1.50
--- twilight/nq/nq.dsp:1.49	Sun Jul 21 06:14:38 2002
+++ twilight/nq/nq.dsp	Fri Jul 26 00:33:47 2002
@@ -25,7 +25,7 @@
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=cl.exe
+CPP=xicl6.exe
 MTL=midl.exe
 RSC=rc.exe
 
@@ -51,7 +51,7 @@
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.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 /subsystem:windows /machine:I386
 # ADD LINK32 comctl32.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib sdl.lib sdlmain.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /out:"tw-nq.exe" /libpath:"../SDL/lib"
 
@@ -77,7 +77,7 @@
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.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 /subsystem:windows /debug /machine:I386 /pdbtype:sept
 # ADD LINK32 comctl32.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib sdl.lib sdlmain.lib /nologo /subsystem:windows /profile /debug /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcd.lib" /nodefaultlib:"msvcrt.lib" /out:"tw-nq-debug.exe" /libpath:"../SDL/lib"
 
@@ -153,10 +153,6 @@
 # Begin Source File
 
 SOURCE=.\gl_screen.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\gl_warp.c
 # End Source File
 # Begin Source File
 
Index: twilight/qw/qw.dsp
diff -u twilight/qw/qw.dsp:1.52 twilight/qw/qw.dsp:1.53
--- twilight/qw/qw.dsp:1.52	Sun Jul 21 06:14:38 2002
+++ twilight/qw/qw.dsp	Fri Jul 26 00:33:48 2002
@@ -25,7 +25,7 @@
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=cl.exe
+CPP=xicl6.exe
 MTL=midl.exe
 RSC=rc.exe
 
@@ -51,7 +51,7 @@
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.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 /subsystem:windows /machine:I386
 # ADD LINK32 comctl32.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib sdl.lib sdlmain.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /out:"tw-qw.exe" /libpath:"../SDL/lib"
 # SUBTRACT LINK32 /nodefaultlib
@@ -78,7 +78,7 @@
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.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 /subsystem:windows /debug /machine:I386 /pdbtype:sept
 # ADD LINK32 comctl32.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib sdl.lib sdlmain.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcd.lib" /nodefaultlib:"msvcrt.lib" /out:"tw-qw-debug.exe" /pdbtype:sept /libpath:"../SDL/lib"
 
@@ -162,10 +162,6 @@
 # Begin Source File
 
 SOURCE=.\gl_screen.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\gl_warp.c
 # End Source File
 # Begin Source File
 
Index: twilight/src/renderer/twilight_renderer.dsp
diff -u twilight/src/renderer/twilight_renderer.dsp:1.13 twilight/src/renderer/twilight_renderer.dsp:1.14
--- twilight/src/renderer/twilight_renderer.dsp:1.13	Mon Jul 15 03:18:58 2002
+++ twilight/src/renderer/twilight_renderer.dsp	Fri Jul 26 00:33:48 2002
@@ -25,7 +25,7 @@
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=cl.exe
+CPP=xicl6.exe
 RSC=rc.exe
 
 !IF  "$(CFG)" == "twilight_renderer - Win32 Release"
@@ -40,14 +40,14 @@
 # PROP Output_Dir "Release"
 # PROP Intermediate_Dir "Release"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG"  /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../include" /I "../image" /I "../../SDL/include" /D "WIN32" /D "NDEBUG"  /D "_LIB" /YX /FD /c
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../include" /I "../image" /I "../../SDL/include" /D "WIN32" /D "NDEBUG" /D "_LIB" /YX /FD /c
 # ADD BASE RSC /l 0x40c /d "NDEBUG"
 # ADD RSC /l 0x40c /d "NDEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LIB32=link.exe -lib
+LIB32=xilink6.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo
 
@@ -63,14 +63,14 @@
 # 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 "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../include" /I "../image" /I "../../SDL/include" /D "WIN32" /D "_DEBUG"  /D "_LIB" /YX /FD /GZ /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../include" /I "../image" /I "../../SDL/include" /D "WIN32" /D "_DEBUG" /D "_LIB" /YX /FD /GZ /c
 # ADD BASE RSC /l 0x40c /d "_DEBUG"
 # ADD RSC /l 0x40c /d "_DEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LIB32=link.exe -lib
+LIB32=xilink6.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo
 
@@ -101,6 +101,10 @@
 # End Source File
 # Begin Source File
 
+SOURCE=.\liquid.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\noise.c
 # End Source File
 # Begin Source File
@@ -113,6 +117,14 @@
 # End Source File
 # Begin Source File
 
+SOURCE=.\sky.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\surface.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\transform.c
 # End Source File
 # End Group
@@ -149,7 +161,19 @@
 # End Source File
 # Begin Source File
 
+SOURCE=.\liquid.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\pointers.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\sky.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\surface.h
 # End Source File
 # Begin Source File

More information about the twilight-commits mailing list