Updated DSP files from Willis

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@5921 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/darkplaces-dedicated.dsp b/darkplaces-dedicated.dsp
index d0ef55b07ffd9ce2f77e9a79a26970ab8ddd67c4..698f5d1ed0d837532e9ca3189d6ca32529505b14 100644 (file)
--- a/darkplaces-dedicated.dsp
+++ b/darkplaces-dedicated.dsp
@@ -7,19 +7,19 @@
 CFG=dedicated - Win32 Debug\r
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,\r
 !MESSAGE use the Export Makefile command and run\r
-!MESSAGE\r
+!MESSAGE \r
 !MESSAGE NMAKE /f "darkplaces-dedicated.mak".\r
-!MESSAGE\r
+!MESSAGE \r
 !MESSAGE You can specify a configuration when running NMAKE\r
 !MESSAGE by defining the macro CFG on the command line. For example:\r
-!MESSAGE\r
+!MESSAGE \r
 !MESSAGE NMAKE /f "darkplaces-dedicated.mak" CFG="dedicated - Win32 Debug"\r
-!MESSAGE\r
+!MESSAGE \r
 !MESSAGE Possible choices for configuration are:\r
-!MESSAGE\r
+!MESSAGE \r
 !MESSAGE "dedicated - Win32 Release" (based on "Win32 (x86) Application")\r
 !MESSAGE "dedicated - Win32 Debug" (based on "Win32 (x86) Application")\r
-!MESSAGE\r
+!MESSAGE \r
 \r
 # Begin Project\r
 # PROP AllowPerConfigDependencies 0\r
@@ -83,7 +83,7 @@ LINK32=link.exe
 # ADD LINK32 user32.lib gdi32.lib opengl32.lib wsock32.lib winmm.lib comctl32.lib dxguid.lib /nologo /subsystem:console /debug /machine:I386 /out:"Debug-Dedicated/darkplaces-dedicated-debug.exe" /pdbtype:sept\r
 # SUBTRACT LINK32 /pdb:none\r
 \r
-!ENDIF\r
+!ENDIF \r
 \r
 # Begin Target\r
 \r
@@ -146,6 +146,10 @@ SOURCE=.\cl_video.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\clvm_cmds.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\cmd.c\r
 # End Source File\r
 # Begin Source File\r
@@ -162,6 +166,10 @@ SOURCE=.\console.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\csprogs.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\curves.c\r
 # End Source File\r
 # Begin Source File\r
@@ -222,6 +230,10 @@ SOURCE=.\image.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\image_png.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\jpeg.c\r
 # End Source File\r
 # Begin Source File\r
@@ -398,6 +410,10 @@ SOURCE=.\world.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\world_cs.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\zone.c\r
 # End Source File\r
 # End Group\r
@@ -462,6 +478,10 @@ SOURCE=.\console.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\csprogs.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\curves.h\r
 # End Source File\r
 # Begin Source File\r
@@ -494,6 +514,10 @@ SOURCE=.\image.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\image_png.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\input.h\r
 # End Source File\r
 # Begin Source File\r

diff --git a/darkplaces-sdl.dsp b/darkplaces-sdl.dsp
index aa756dc2d37a034eb35d9de715ed2e8bba80da1c..615a555dfd6db35f76c7cd1dbb3784fb44e3781e 100644 (file)
--- a/darkplaces-sdl.dsp
+++ b/darkplaces-sdl.dsp
@@ -7,19 +7,19 @@
 CFG=sdl - Win32 Debug\r
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,\r
 !MESSAGE use the Export Makefile command and run\r
-!MESSAGE\r
+!MESSAGE \r
 !MESSAGE NMAKE /f "darkplaces-sdl.mak".\r
-!MESSAGE\r
+!MESSAGE \r
 !MESSAGE You can specify a configuration when running NMAKE\r
 !MESSAGE by defining the macro CFG on the command line. For example:\r
-!MESSAGE\r
+!MESSAGE \r
 !MESSAGE NMAKE /f "darkplaces-sdl.mak" CFG="sdl - Win32 Debug"\r
-!MESSAGE\r
+!MESSAGE \r
 !MESSAGE Possible choices for configuration are:\r
-!MESSAGE\r
+!MESSAGE \r
 !MESSAGE "sdl - Win32 Release" (based on "Win32 (x86) Application")\r
 !MESSAGE "sdl - Win32 Debug" (based on "Win32 (x86) Application")\r
-!MESSAGE\r
+!MESSAGE \r
 \r
 # Begin Project\r
 # PROP AllowPerConfigDependencies 0\r
@@ -83,7 +83,7 @@ LINK32=link.exe
 # ADD LINK32 user32.lib gdi32.lib opengl32.lib wsock32.lib winmm.lib comctl32.lib dxguid.lib sdl.lib sdlmain.lib /nologo /subsystem:console /debug /machine:I386 /out:"Debug-SDL/darkplaces-sdl-debug.exe" /pdbtype:sept\r
 # SUBTRACT LINK32 /pdb:none\r
 \r
-!ENDIF\r
+!ENDIF \r
 \r
 # Begin Target\r
 \r
@@ -146,6 +146,10 @@ SOURCE=.\cl_video.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\clvm_cmds.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\cmd.c\r
 # End Source File\r
 # Begin Source File\r
@@ -162,6 +166,10 @@ SOURCE=.\console.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\csprogs.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\curves.c\r
 # End Source File\r
 # Begin Source File\r
@@ -222,6 +230,10 @@ SOURCE=.\image.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\image_png.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\jpeg.c\r
 # End Source File\r
 # Begin Source File\r
@@ -418,6 +430,10 @@ SOURCE=.\world.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\world_cs.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\zone.c\r
 # End Source File\r
 # End Group\r
@@ -478,6 +494,10 @@ SOURCE=.\common.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\conproc.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\console.h\r
 # End Source File\r
 # Begin Source File\r
@@ -558,6 +578,14 @@ SOURCE=.\model_brush.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\model_dpmodel.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\model_psk.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\model_shared.h\r
 # End Source File\r
 # Begin Source File\r
@@ -658,6 +686,10 @@ SOURCE=.\render.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\resource.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\sbar.h\r
 # End Source File\r
 # Begin Source File\r

diff --git a/darkplaces.dsp b/darkplaces.dsp
index 86dab14e6f7b1541165c979af7987f610e43c5b3..0b8748eb11381a75c544d8a7d8e841924b1694a9 100644 (file)
--- a/darkplaces.dsp
+++ b/darkplaces.dsp
@@ -7,19 +7,19 @@
 CFG=darkplaces - Win32 Debug\r
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,\r
 !MESSAGE use the Export Makefile command and run\r
-!MESSAGE\r
+!MESSAGE \r
 !MESSAGE NMAKE /f "darkplaces.mak".\r
-!MESSAGE\r
+!MESSAGE \r
 !MESSAGE You can specify a configuration when running NMAKE\r
 !MESSAGE by defining the macro CFG on the command line. For example:\r
-!MESSAGE\r
+!MESSAGE \r
 !MESSAGE NMAKE /f "darkplaces.mak" CFG="darkplaces - Win32 Debug"\r
-!MESSAGE\r
+!MESSAGE \r
 !MESSAGE Possible choices for configuration are:\r
-!MESSAGE\r
+!MESSAGE \r
 !MESSAGE "darkplaces - Win32 Release" (based on "Win32 (x86) Application")\r
 !MESSAGE "darkplaces - Win32 Debug" (based on "Win32 (x86) Application")\r
-!MESSAGE\r
+!MESSAGE \r
 \r
 # Begin Project\r
 # PROP AllowPerConfigDependencies 0\r
@@ -83,7 +83,7 @@ LINK32=link.exe
 # ADD LINK32 user32.lib gdi32.lib opengl32.lib wsock32.lib winmm.lib comctl32.lib dxguid.lib /nologo /subsystem:windows /debug /machine:I386 /out:"Debug/darkplaces-debug.exe" /pdbtype:sept\r
 # SUBTRACT LINK32 /nodefaultlib\r
 \r
-!ENDIF\r
+!ENDIF \r
 \r
 # Begin Target\r
 \r
@@ -146,6 +146,10 @@ SOURCE=.\cl_video.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\clvm_cmds.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\cmd.c\r
 # End Source File\r
 # Begin Source File\r
@@ -166,6 +170,10 @@ SOURCE=.\console.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\csprogs.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\curves.c\r
 # End Source File\r
 # Begin Source File\r
@@ -226,6 +234,10 @@ SOURCE=.\image.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\image_png.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\jpeg.c\r
 # End Source File\r
 # Begin Source File\r
@@ -422,6 +434,10 @@ SOURCE=.\world.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\world_cs.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\zone.c\r
 # End Source File\r
 # End Group\r
@@ -490,6 +506,10 @@ SOURCE=.\console.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\csprogs.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\curves.h\r
 # End Source File\r
 # Begin Source File\r
@@ -522,6 +542,10 @@ SOURCE=.\image.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\image_png.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\input.h\r
 # End Source File\r
 # Begin Source File\r