From cca82c56601d57a898377f62af68af0e10ab30d7 Mon Sep 17 00:00:00 2001 From: havoc Date: Sun, 23 Sep 2007 09:50:07 +0000 Subject: [PATCH] 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 --- darkplaces-dedicated.dsp | 26 ++++++++++++++++--------- darkplaces-sdl.dsp | 42 ++++++++++++++++++++++++---------------- darkplaces.dsp | 12 ++++++++---- 3 files changed, 50 insertions(+), 30 deletions(-) diff --git a/darkplaces-dedicated.dsp b/darkplaces-dedicated.dsp index 9a828894..f1e929a0 100644 --- a/darkplaces-dedicated.dsp +++ b/darkplaces-dedicated.dsp @@ -1,10 +1,10 @@ -# Microsoft Developer Studio Project File - Name="dedicated" - Package Owner=<4> +# Microsoft Developer Studio Project File - Name="darkplaces-dedicated" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Application" 0x0101 -CFG=dedicated - Win32 Debug +CFG=darkplaces-dedicated - Win32 Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,12 +13,12 @@ CFG=dedicated - Win32 Debug !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 "darkplaces-dedicated.mak" CFG="dedicated - Win32 Debug" +!MESSAGE NMAKE /f "darkplaces-dedicated.mak" CFG="darkplaces-dedicated - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "dedicated - Win32 Release" (based on "Win32 (x86) Application") -!MESSAGE "dedicated - Win32 Debug" (based on "Win32 (x86) Application") +!MESSAGE "darkplaces-dedicated - Win32 Release" (based on "Win32 (x86) Application") +!MESSAGE "darkplaces-dedicated - Win32 Debug" (based on "Win32 (x86) Application") !MESSAGE # Begin Project @@ -29,7 +29,7 @@ CPP=cl.exe MTL=midl.exe RSC=rc.exe -!IF "$(CFG)" == "dedicated - Win32 Release" +!IF "$(CFG)" == "darkplaces-dedicated - Win32 Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 @@ -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 # SUBTRACT LINK32 /pdb:none -!ELSEIF "$(CFG)" == "dedicated - Win32 Debug" +!ELSEIF "$(CFG)" == "darkplaces-dedicated - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 @@ -87,8 +87,8 @@ LINK32=link.exe # Begin Target -# Name "dedicated - Win32 Release" -# Name "dedicated - Win32 Debug" +# Name "darkplaces-dedicated - Win32 Release" +# Name "darkplaces-dedicated - Win32 Debug" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" @@ -720,6 +720,14 @@ SOURCE=.\zone.h SOURCE=.\darkplaces.ico # End Source File +# Begin Source File + +SOURCE=.\darkplaces.rc +# End Source File +# Begin Source File + +SOURCE=.\resource.h +# End Source File # End Group # End Target # End Project diff --git a/darkplaces-sdl.dsp b/darkplaces-sdl.dsp index 1a6e52e4..c3e31081 100644 --- a/darkplaces-sdl.dsp +++ b/darkplaces-sdl.dsp @@ -1,10 +1,10 @@ -# Microsoft Developer Studio Project File - Name="sdl" - Package Owner=<4> +# Microsoft Developer Studio Project File - Name="darkplaces-sdl" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Application" 0x0101 -CFG=sdl - Win32 Debug +CFG=darkplaces-sdl - Win32 Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,12 +13,12 @@ CFG=sdl - Win32 Debug !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 "darkplaces-sdl.mak" CFG="sdl - Win32 Debug" +!MESSAGE NMAKE /f "darkplaces-sdl.mak" CFG="darkplaces-sdl - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "sdl - Win32 Release" (based on "Win32 (x86) Application") -!MESSAGE "sdl - Win32 Debug" (based on "Win32 (x86) Application") +!MESSAGE "darkplaces-sdl - Win32 Release" (based on "Win32 (x86) Application") +!MESSAGE "darkplaces-sdl - Win32 Debug" (based on "Win32 (x86) Application") !MESSAGE # Begin Project @@ -29,7 +29,7 @@ CPP=cl.exe MTL=midl.exe RSC=rc.exe -!IF "$(CFG)" == "sdl - Win32 Release" +!IF "$(CFG)" == "darkplaces-sdl - Win32 Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 @@ -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" # SUBTRACT LINK32 /pdb:none -!ELSEIF "$(CFG)" == "sdl - Win32 Debug" +!ELSEIF "$(CFG)" == "darkplaces-sdl - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 @@ -87,8 +87,8 @@ LINK32=link.exe # Begin Target -# Name "sdl - Win32 Release" -# Name "sdl - Win32 Debug" +# Name "darkplaces-sdl - Win32 Release" +# Name "darkplaces-sdl - Win32 Debug" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" @@ -170,10 +170,6 @@ SOURCE=.\cvar.c # End Source File # Begin Source File -SOURCE=.\darkplaces.rc -# End Source File -# Begin Source File - SOURCE=.\dpvsimpledecode.c # End Source File # Begin Source File @@ -486,6 +482,10 @@ SOURCE=.\console.h # End Source File # Begin Source File +SOURCE=.\csprogs.h +# End Source File +# Begin Source File + SOURCE=.\curves.h # End Source File # Begin Source File @@ -518,6 +518,10 @@ SOURCE=.\image.h # End Source File # Begin Source File +SOURCE=.\image_png.h +# End Source File +# Begin Source File + SOURCE=.\input.h # End Source File # Begin Source File @@ -678,10 +682,6 @@ SOURCE=.\render.h # End Source File # Begin Source File -SOURCE=.\resource.h -# End Source File -# Begin Source File - SOURCE=.\sbar.h # End Source File # Begin Source File @@ -748,6 +748,14 @@ SOURCE=.\zone.h SOURCE=.\darkplaces.ico # End Source File +# Begin Source File + +SOURCE=.\darkplaces.rc +# End Source File +# Begin Source File + +SOURCE=.\resource.h +# End Source File # End Group # End Target # End Project diff --git a/darkplaces.dsp b/darkplaces.dsp index ee983ed0..9f9b91ed 100644 --- a/darkplaces.dsp +++ b/darkplaces.dsp @@ -174,10 +174,6 @@ SOURCE=.\cvar.c # End Source File # Begin Source File -SOURCE=.\darkplaces.rc -# End Source File -# Begin Source File - SOURCE=.\dpvsimpledecode.c # End Source File # Begin Source File @@ -756,6 +752,14 @@ SOURCE=.\zone.h SOURCE=.\darkplaces.ico # End Source File +# Begin Source File + +SOURCE=.\darkplaces.rc +# End Source File +# Begin Source File + +SOURCE=.\resource.h +# End Source File # End Group # End Target # End Project -- 2.39.2