moved resource.h and darkplaces.rc from Source Files group to Resource

Files group
added resource.h which was missing in some projects
renamed project configurations to be named darkplaces-sdl and
darkplaces-dedicated rather than merely sdl and dedicated

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

diff --git a/darkplaces-dedicated.dsp b/darkplaces-dedicated.dsp
index 9a828894fa60e490cb96bbc6c868cbdae657013a..f1e929a09c34a82cefe685d2aafe2fb1ff62d2ea 100644 (file)
--- a/darkplaces-dedicated.dsp
+++ b/darkplaces-dedicated.dsp
@@ -1,10 +1,10 @@
-# Microsoft Developer Studio Project File - Name="dedicated" - Package Owner=<4>\r
+# Microsoft Developer Studio Project File - Name="darkplaces-dedicated" - Package Owner=<4>\r
 # Microsoft Developer Studio Generated Build File, Format Version 6.00\r
 # ** DO NOT EDIT **\r
 \r
 # TARGTYPE "Win32 (x86) Application" 0x0101\r
 \r
-CFG=dedicated - Win32 Debug\r
+CFG=darkplaces-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
@@ -13,12 +13,12 @@ CFG=dedicated - Win32 Debug
 !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 NMAKE /f "darkplaces-dedicated.mak" CFG="dedicated - Win32 Debug"\r
+!MESSAGE NMAKE /f "darkplaces-dedicated.mak" CFG="darkplaces-dedicated - Win32 Debug"\r
 !MESSAGE \r
 !MESSAGE Possible choices for configuration are:\r
 !MESSAGE \r
-!MESSAGE "dedicated - Win32 Release" (based on "Win32 (x86) Application")\r
-!MESSAGE "dedicated - Win32 Debug" (based on "Win32 (x86) Application")\r
+!MESSAGE "darkplaces-dedicated - Win32 Release" (based on "Win32 (x86) Application")\r
+!MESSAGE "darkplaces-dedicated - Win32 Debug" (based on "Win32 (x86) Application")\r
 !MESSAGE \r
 \r
 # Begin Project\r
@@ -29,7 +29,7 @@ CPP=cl.exe
 MTL=midl.exe\r
 RSC=rc.exe\r
 \r
-!IF  "$(CFG)" == "dedicated - Win32 Release"\r
+!IF  "$(CFG)" == "darkplaces-dedicated - Win32 Release"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 0\r
@@ -56,7 +56,7 @@ LINK32=link.exe
 # ADD LINK32 user32.lib gdi32.lib opengl32.lib wsock32.lib winmm.lib comctl32.lib dxguid.lib /nologo /subsystem:console /LARGEADDRESSAWARE /machine:I386\r
 # SUBTRACT LINK32 /pdb:none\r
 \r
-!ELSEIF  "$(CFG)" == "dedicated - Win32 Debug"\r
+!ELSEIF  "$(CFG)" == "darkplaces-dedicated - Win32 Debug"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r
@@ -87,8 +87,8 @@ LINK32=link.exe
 \r
 # Begin Target\r
 \r
-# Name "dedicated - Win32 Release"\r
-# Name "dedicated - Win32 Debug"\r
+# Name "darkplaces-dedicated - Win32 Release"\r
+# Name "darkplaces-dedicated - Win32 Debug"\r
 # Begin Group "Source Files"\r
 \r
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
@@ -720,6 +720,14 @@ SOURCE=.\zone.h
 \r
 SOURCE=.\darkplaces.ico\r
 # End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\darkplaces.rc\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\resource.h\r
+# End Source File\r
 # End Group\r
 # End Target\r
 # End Project\r

diff --git a/darkplaces-sdl.dsp b/darkplaces-sdl.dsp
index 1a6e52e4f0d604ee8c99adf931246c579e98e948..c3e310815cd9d5106a4e231f3619a7437943041a 100644 (file)
--- a/darkplaces-sdl.dsp
+++ b/darkplaces-sdl.dsp
@@ -1,10 +1,10 @@
-# Microsoft Developer Studio Project File - Name="sdl" - Package Owner=<4>\r
+# Microsoft Developer Studio Project File - Name="darkplaces-sdl" - Package Owner=<4>\r
 # Microsoft Developer Studio Generated Build File, Format Version 6.00\r
 # ** DO NOT EDIT **\r
 \r
 # TARGTYPE "Win32 (x86) Application" 0x0101\r
 \r
-CFG=sdl - Win32 Debug\r
+CFG=darkplaces-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
@@ -13,12 +13,12 @@ CFG=sdl - Win32 Debug
 !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 NMAKE /f "darkplaces-sdl.mak" CFG="sdl - Win32 Debug"\r
+!MESSAGE NMAKE /f "darkplaces-sdl.mak" CFG="darkplaces-sdl - Win32 Debug"\r
 !MESSAGE \r
 !MESSAGE Possible choices for configuration are:\r
 !MESSAGE \r
-!MESSAGE "sdl - Win32 Release" (based on "Win32 (x86) Application")\r
-!MESSAGE "sdl - Win32 Debug" (based on "Win32 (x86) Application")\r
+!MESSAGE "darkplaces-sdl - Win32 Release" (based on "Win32 (x86) Application")\r
+!MESSAGE "darkplaces-sdl - Win32 Debug" (based on "Win32 (x86) Application")\r
 !MESSAGE \r
 \r
 # Begin Project\r
@@ -29,7 +29,7 @@ CPP=cl.exe
 MTL=midl.exe\r
 RSC=rc.exe\r
 \r
-!IF  "$(CFG)" == "sdl - Win32 Release"\r
+!IF  "$(CFG)" == "darkplaces-sdl - Win32 Release"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 0\r
@@ -56,7 +56,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 /LARGEADDRESSAWARE /machine:I386 /libpath:"SDL/lib"\r
 # SUBTRACT LINK32 /pdb:none\r
 \r
-!ELSEIF  "$(CFG)" == "sdl - Win32 Debug"\r
+!ELSEIF  "$(CFG)" == "darkplaces-sdl - Win32 Debug"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r
@@ -87,8 +87,8 @@ LINK32=link.exe
 \r
 # Begin Target\r
 \r
-# Name "sdl - Win32 Release"\r
-# Name "sdl - Win32 Debug"\r
+# Name "darkplaces-sdl - Win32 Release"\r
+# Name "darkplaces-sdl - Win32 Debug"\r
 # Begin Group "Source Files"\r
 \r
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
@@ -170,10 +170,6 @@ SOURCE=.\cvar.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\darkplaces.rc\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=.\dpvsimpledecode.c\r
 # End Source File\r
 # Begin Source File\r
@@ -486,6 +482,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
@@ -518,6 +518,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
@@ -678,10 +682,6 @@ 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
@@ -748,6 +748,14 @@ SOURCE=.\zone.h
 \r
 SOURCE=.\darkplaces.ico\r
 # End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\darkplaces.rc\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\resource.h\r
+# End Source File\r
 # End Group\r
 # End Target\r
 # End Project\r

diff --git a/darkplaces.dsp b/darkplaces.dsp
index ee983ed0fd29ec67d9bfd9a551dcddf513634a9a..9f9b91ed1cd04ad7c4e4a5a7d764492aa22dc4e4 100644 (file)
--- a/darkplaces.dsp
+++ b/darkplaces.dsp
@@ -174,10 +174,6 @@ SOURCE=.\cvar.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\darkplaces.rc\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=.\dpvsimpledecode.c\r
 # End Source File\r
 # Begin Source File\r
@@ -756,6 +752,14 @@ SOURCE=.\zone.h
 \r
 SOURCE=.\darkplaces.ico\r
 # End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\darkplaces.rc\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\resource.h\r
+# End Source File\r
 # End Group\r
 # End Target\r
 # End Project\r