hush warnings about strcat and other redefinitions by undefining them first

[xonotic/darkplaces.git] / darkplaces.dsp

diff --git a/darkplaces.dsp b/darkplaces.dsp
index 8b3484d39d7d8260ac324363f12b39786d7b2b8a..2e1ddcb9d696c228bbcd45ed245a8d2d9426aeeb 100644 (file)
--- a/darkplaces.dsp
+++ b/darkplaces.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c\r
-# ADD CPP /nologo /MD /W3 /GX /Ox /Ot /Og /Oi /Op /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c\r
+# ADD CPP /nologo /MD /W3 /GX /Ox /Ot /Og /Oi /Op /D "WIN32" /D "WIN32_LEAN_AND_MEAN" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c\r
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x40c /d "NDEBUG"\r
@@ -70,7 +70,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c\r
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c\r
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "WIN32_LEAN_AND_MEAN" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c\r
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x40c /d "_DEBUG"\r
@@ -106,14 +106,6 @@ SOURCE=.\cd_win.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\cgame.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\cgamevm.c\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=.\cl_collision.c\r
 # End Source File\r
 # Begin Source File\r
@@ -146,6 +138,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 +162,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
@@ -202,10 +202,6 @@ SOURCE=.\gl_draw.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\gl_models.c\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=.\gl_rmain.c\r
 # End Source File\r
 # Begin Source File\r
@@ -230,6 +226,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
@@ -242,6 +242,10 @@ SOURCE=.\lhnet.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\libcurl.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\mathlib.c\r
 # End Source File\r
 # Begin Source File\r
@@ -250,6 +254,10 @@ SOURCE=.\matrixlib.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\mdfour.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\menu.c\r
 # End Source File\r
 # Begin Source File\r
@@ -294,18 +302,6 @@ SOURCE=.\portals.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\pr_cmds.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\pr_edict.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\pr_exec.c\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=.\protocol.c\r
 # End Source File\r
 # Begin Source File\r
@@ -322,10 +318,6 @@ SOURCE=.\prvm_exec.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\r_crosshairs.c\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=.\r_explosion.c\r
 # End Source File\r
 # Begin Source File\r
@@ -402,15 +394,15 @@ SOURCE=.\sv_user.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\sys_shared.c\r
+SOURCE=.\svvm_cmds.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\sys_win.c\r
+SOURCE=.\sys_shared.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\ui.c\r
+SOURCE=.\sys_win.c\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -430,11 +422,11 @@ SOURCE=.\wad.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\winding.c\r
+SOURCE=.\world.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\world.c\r
+SOURCE=.\world_cs.c\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -454,18 +446,6 @@ SOURCE=.\cdaudio.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\cg_math.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\cgame_api.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\cgamevm.h\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=.\cl_collision.h\r
 # End Source File\r
 # Begin Source File\r
@@ -482,6 +462,10 @@ SOURCE=.\client.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\clprogdefs.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\cmd.h\r
 # End Source File\r
 # Begin Source File\r
@@ -502,6 +486,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
@@ -534,6 +522,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
@@ -546,10 +538,18 @@ SOURCE=.\keys.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\lhfont.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\lhnet.h\r
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\libcurl.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\mathlib.h\r
 # End Source File\r
 # Begin Source File\r
@@ -558,6 +558,10 @@ SOURCE=.\matrixlib.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\mdfour.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\menu.h\r
 # End Source File\r
 # Begin Source File\r
@@ -574,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
@@ -590,6 +602,10 @@ SOURCE=.\modelgen.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\mprogdefs.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\netconn.h\r
 # End Source File\r
 # Begin Source File\r
@@ -622,10 +638,18 @@ SOURCE=.\progs.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\progsvm.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\protocol.h\r
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\prvm_cmds.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\prvm_execprogram.h\r
 # End Source File\r
 # Begin Source File\r
@@ -698,10 +722,6 @@ SOURCE=.\sys.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\ui.h\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=.\vid.h\r
 # End Source File\r
 # Begin Source File\r
@@ -710,14 +730,6 @@ SOURCE=.\wad.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\winding.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\winquake.h\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=.\world.h\r
 # End Source File\r
 # Begin Source File\r