From 4ab76091024645fa4ac6094195a68caa787e3e46 Mon Sep 17 00:00:00 2001 From: mcmartin Date: Wed, 21 Dec 2005 03:00:51 +0000 Subject: [PATCH] Added "NoAccel" targets for VC6 builds without Processor Pack 5. git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2094 8092fc87-c524-0410-9efc-e669fe64eaf9 --- sc2/src/msvc++/UrQuanMasters.dsp | 136 ++++++++++++++++++++++++++----- 1 file changed, 114 insertions(+), 22 deletions(-) diff --git a/sc2/src/msvc++/UrQuanMasters.dsp b/sc2/src/msvc++/UrQuanMasters.dsp index f7425977f..8402f6cd4 100644 --- a/sc2/src/msvc++/UrQuanMasters.dsp +++ b/sc2/src/msvc++/UrQuanMasters.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103 -CFG=UrQuanMasters - Win32 Debug +CFG=UrQuanMasters - Win32 Debug NoAccel !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,14 @@ CFG=UrQuanMasters - 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 "UrQuanMasters.mak" CFG="UrQuanMasters - Win32 Debug" +!MESSAGE NMAKE /f "UrQuanMasters.mak" CFG="UrQuanMasters - Win32 Debug NoAccel" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "UrQuanMasters - Win32 Release" (based on "Win32 (x86) Console Application") !MESSAGE "UrQuanMasters - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE "UrQuanMasters - Win32 Debug NoAccel" (based on "Win32 (x86) Console Application") +!MESSAGE "UrQuanMasters - Win32 Release NoAccel" (based on "Win32 (x86) Console Application") !MESSAGE # Begin Project @@ -84,12 +86,75 @@ LINK32=link.exe # 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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib SDL.lib SDLmain.lib SDL_image.lib zdll.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"msvcrt.lib" /out:"../../uqmdebug.exe" /pdbtype:sept # SUBTRACT LINK32 /nodefaultlib +!ELSEIF "$(CFG)" == "UrQuanMasters - Win32 Debug NoAccel" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "UrQuanMasters___Win32_Debug_NoAccel" +# PROP BASE Intermediate_Dir "UrQuanMasters___Win32_Debug_NoAccel" +# PROP BASE Ignore_Export_Lib 0 +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "UrQuanMasters___Win32_Debug_NoAccel" +# PROP Intermediate_Dir "UrQuanMasters___Win32_Debug_NoAccel" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /I "." /I ".." /I "..\sc2code" /I "..\sc2code\libs" /I "..\sc2code\ships" /I "..\regex" /D "DEBUG" /D "_DEBUG" /D "DEBUG_TRACK_SEM" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D _VW=320 /D _VH=240 /D "HAVE_OPENGL" /D "GFXMODULE_SDL" /D "HAVE_OPENAL" /D "HAVE_ZIP" /D "ZLIB_DLL" /D "USE_PLATFORM_ACCEL" /FR /FD /GZ /c +# SUBTRACT BASE CPP /YX +# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "." /I ".." /I "..\sc2code" /I "..\sc2code\libs" /I "..\sc2code\ships" /I "..\regex" /D "DEBUG" /D "_DEBUG" /D "DEBUG_TRACK_SEM" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D _VW=320 /D _VH=240 /D "HAVE_OPENGL" /D "GFXMODULE_SDL" /D "HAVE_OPENAL" /D "HAVE_ZIP" /D "ZLIB_DLL" /FR /FD /GZ /c +# SUBTRACT CPP /YX +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo /o"UrQuanMasters.bsc" +# ADD BSC32 /nologo /o"UrQuanMasters.bsc" +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 SDL.lib SDLmain.lib SDL_image.lib zdll.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"msvcrt.lib" /out:"../../uqmdebug.exe" /pdbtype:sept +# SUBTRACT BASE LINK32 /nodefaultlib +# 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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib SDL.lib SDLmain.lib SDL_image.lib zdll.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"msvcrt.lib" /out:"../../uqmdebug.exe" /pdbtype:sept +# SUBTRACT LINK32 /nodefaultlib + +!ELSEIF "$(CFG)" == "UrQuanMasters - Win32 Release NoAccel" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "UrQuanMasters___Win32_Release_NoAccel" +# PROP BASE Intermediate_Dir "UrQuanMasters___Win32_Release_NoAccel" +# PROP BASE Ignore_Export_Lib 0 +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "UrQuanMasters___Win32_Release_NoAccel" +# PROP Intermediate_Dir "UrQuanMasters___Win32_Release_NoAccel" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MD /W3 /GX /Zi /O2 /I "." /I ".." /I "..\sc2code" /I "..\sc2code\libs" /I "..\sc2code\ships" /I "..\regex" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D _VW=320 /D _VH=240 /D "HAVE_OPENGL" /D "GFXMODULE_SDL" /D "HAVE_OPENAL" /D "HAVE_ZIP" /D "ZLIB_DLL" /D "USE_PLATFORM_ACCEL" /FD /c +# SUBTRACT BASE CPP /YX +# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "." /I ".." /I "..\sc2code" /I "..\sc2code\libs" /I "..\sc2code\ships" /I "..\regex" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D _VW=320 /D _VH=240 /D "HAVE_OPENGL" /D "GFXMODULE_SDL" /D "HAVE_OPENAL" /D "HAVE_ZIP" /D "ZLIB_DLL" /FD /c +# SUBTRACT CPP /YX +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /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 SDL.lib SDLmain.lib SDL_image.lib zdll.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /nodefaultlib:"msvcrtd.lib" /out:"../../uqm.exe" +# 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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib SDL.lib SDLmain.lib SDL_image.lib zdll.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /nodefaultlib:"msvcrtd.lib" /out:"../../uqm.exe" +# Begin Special Build Tool +SOURCE="$(InputPath)" +PostBuild_Desc=Stripping debug info... +PostBuild_Cmds=rebase -b 0x400000 -x . "../../uqm.exe" +# End Special Build Tool + !ENDIF # Begin Target # Name "UrQuanMasters - Win32 Release" # Name "UrQuanMasters - Win32 Debug" +# Name "UrQuanMasters - Win32 Debug NoAccel" +# Name "UrQuanMasters - Win32 Release NoAccel" # Begin Group "Source Files" # PROP Default_Filter "" @@ -186,10 +251,6 @@ SOURCE=..\sc2code\libs\file\temp.c # Begin Group "graphics" # PROP Default_Filter "" -# Begin Source File - -SOURCE=..\sc2code\libs\graphics\prim.h -# End Source File # Begin Group "sdl" # PROP Default_Filter "" @@ -420,6 +481,10 @@ SOURCE=..\sc2code\libs\graphics\pixmap.c # End Source File # Begin Source File +SOURCE=..\sc2code\libs\graphics\prim.h +# End Source File +# Begin Source File + SOURCE=..\sc2code\libs\graphics\resgfx.c # End Source File # Begin Source File @@ -500,11 +565,11 @@ SOURCE=..\sc2code\libs\input\input_common.h # PROP Default_Filter "" # Begin Source File -SOURCE=..\sc2code\libs\list\list.h +SOURCE=..\sc2code\libs\list\list.c # End Source File # Begin Source File -SOURCE=..\sc2code\libs\list\list.c +SOURCE=..\sc2code\libs\list\list.h # End Source File # End Group # Begin Group "math" @@ -622,11 +687,11 @@ SOURCE=..\sc2code\libs\sound\decoders\mikmod\drv_nos.c # End Source File # Begin Source File -SOURCE=..\sc2code\libs\sound\decoders\mikmod\drv_openal.h +SOURCE=..\sc2code\libs\sound\decoders\mikmod\drv_openal.c # End Source File # Begin Source File -SOURCE=..\sc2code\libs\sound\decoders\mikmod\drv_openal.c +SOURCE=..\sc2code\libs\sound\decoders\mikmod\drv_openal.h # End Source File # Begin Source File @@ -1016,6 +1081,13 @@ SOURCE=..\sc2code\libs\uio\debug.c !ELSEIF "$(CFG)" == "UrQuanMasters - Win32 Debug" +!ELSEIF "$(CFG)" == "UrQuanMasters - Win32 Debug NoAccel" + +!ELSEIF "$(CFG)" == "UrQuanMasters - Win32 Release NoAccel" + +# PROP BASE Exclude_From_Build 1 +# PROP Exclude_From_Build 1 + !ENDIF # End Source File @@ -1067,6 +1139,16 @@ SOURCE=..\sc2code\libs\uio\hashtable.c # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "UrQuanMasters - Win32 Debug NoAccel" + +# PROP BASE Exclude_From_Build 1 +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "UrQuanMasters - Win32 Release NoAccel" + +# PROP BASE Exclude_From_Build 1 +# PROP Exclude_From_Build 1 + !ENDIF # End Source File @@ -1118,6 +1200,16 @@ SOURCE=..\sc2code\libs\uio\memdebug.c # PROP Exclude_From_Build 1 +!ELSEIF "$(CFG)" == "UrQuanMasters - Win32 Debug NoAccel" + +# PROP BASE Exclude_From_Build 1 +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "UrQuanMasters - Win32 Release NoAccel" + +# PROP BASE Exclude_From_Build 1 +# PROP Exclude_From_Build 1 + !ENDIF # End Source File @@ -1410,10 +1502,6 @@ SOURCE=..\sc2code\comm\comandr\restypes.h SOURCE=..\sc2code\comm\comandr\strings.h # End Source File # End Group -# Begin Source File - -SOURCE=..\sc2code\comm\commall.h -# End Source File # Begin Group "druuge.comm" # PROP Default_Filter "" @@ -2174,6 +2262,10 @@ SOURCE=..\sc2code\comm\zoqfot\strings.h SOURCE=..\sc2code\comm\zoqfot\zoqfotc.c # End Source File # End Group +# Begin Source File + +SOURCE=..\sc2code\comm\commall.h +# End Source File # End Group # Begin Group "planets" @@ -2378,10 +2470,6 @@ SOURCE=..\sc2code\planets\surface.c # Begin Group "ships" # PROP Default_Filter "" -# Begin Source File - -SOURCE=..\sc2code\ships\ship.h -# End Source File # Begin Group "androsyn" # PROP Default_Filter "" @@ -3386,6 +3474,10 @@ SOURCE=..\sc2code\ships\zoqfot\restypes.h SOURCE=..\sc2code\ships\zoqfot\zoqfot.c # End Source File # End Group +# Begin Source File + +SOURCE=..\sc2code\ships\ship.h +# End Source File # End Group # Begin Source File @@ -3793,10 +3885,6 @@ SOURCE=..\sc2code\starbase.c # End Source File # Begin Source File -SOURCE=..\sc2code\strtemp.h -# End Source File -# Begin Source File - SOURCE=..\sc2code\starbase.h # End Source File # Begin Source File @@ -3825,6 +3913,10 @@ SOURCE=..\sc2code\status.c # End Source File # Begin Source File +SOURCE=..\sc2code\strtemp.h +# End Source File +# Begin Source File + SOURCE=..\sc2code\tactrans.c # End Source File # Begin Source File