Module twilight: Change committed

Sat Jul 27 20:15:46 EDT 2002

Commiter   : warp
CVSROOT    : /cvs/cvsroot/twilight
Module     : twilight
Commit time: 2002-07-28 00:15:46 UTC

Log message:

And another windows compile fix.

Modified files:
     qw/qwsv.dsp

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

Index: twilight/qw/qwsv.dsp
diff -u twilight/qw/qwsv.dsp:1.3 twilight/qw/qwsv.dsp:1.4

--- twilight/qw/qwsv.dsp:1.3	Mon Jul 15 03:18:56 2002
+++ twilight/qw/qwsv.dsp	Sat Jul 27 20:15:35 2002
@@ -1,238 +1,238 @@
-# Microsoft Developer Studio Project File - Name="qwsv" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=qwsv - 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 "qwsv.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 "qwsv.mak" CFG="qwsv - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "qwsv - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "qwsv - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "qwsv - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../include" /I "../SDL/include" /I "../src/renderer" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /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
-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 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:console /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 wsock32.lib sdl.lib /nologo /subsystem:console /machine:I386 /nodefaultlib:"libc" /out:"tw-qwsv.exe" /libpath:"../SDL/lib"
-
-!ELSEIF  "$(CFG)" == "qwsv - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../include" /I "../SDL/include" /I "../src/renderer" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /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
-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 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:console /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 wsock32.lib sdl.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcd" /out:"tw-qwsv-debug.exe" /pdbtype:sept /libpath:"../SDL/lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "qwsv - Win32 Release"
-# Name "qwsv - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\cl_null.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\common.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\info.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\mdfour.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\net_chan.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\net_udp.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\pmove.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\pmovetst.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\pr_cmds.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\pr_edict.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\pr_exec.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\sv_ccmds.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\sv_ents.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\sv_init.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\sv_main.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\sv_model.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\sv_move.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\sv_nchan.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\sv_phys.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\sv_send.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\sv_sys.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\sv_user.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\world.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=.\client.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\console.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\keys.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\net.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\progdefs.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\progs.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\protocol.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\r_explosion.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\render.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\screen.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\server.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\world.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
+# Microsoft Developer Studio Project File - Name="qwsv" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=qwsv - 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 "qwsv.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 "qwsv.mak" CFG="qwsv - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "qwsv - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "qwsv - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "qwsv - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /G6 /MD /W3 /GX /O1 /I "../include" /I "../SDL/include" /I "../src/renderer" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /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
+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 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:console /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 wsock32.lib sdl.lib /nologo /subsystem:console /machine:I386 /nodefaultlib:"libc" /out:"tw-qwsv.exe" /libpath:"../SDL/lib"
+
+!ELSEIF  "$(CFG)" == "qwsv - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /G6 /MDd /W3 /Gm /GX /ZI /Od /I "../include" /I "../SDL/include" /I "../src/renderer" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /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
+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 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:console /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 wsock32.lib sdl.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcd" /out:"tw-qwsv-debug.exe" /pdbtype:sept /libpath:"../SDL/lib"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "qwsv - Win32 Release"
+# Name "qwsv - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\cl_null.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\common.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\info.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mdfour.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\net_chan.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\net_udp.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\pmove.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\pmovetst.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\pr_cmds.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\pr_edict.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\pr_exec.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\sv_ccmds.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\sv_ents.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\sv_init.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\sv_main.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\sv_model.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\sv_move.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\sv_nchan.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\sv_phys.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\sv_send.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\sv_sys.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\sv_user.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\world.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\client.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\console.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\keys.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\net.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\progdefs.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\progs.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\protocol.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\r_explosion.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\render.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\screen.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\server.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\world.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
