diff --git a/scumm.dsp b/scumm.dsp index 35ffc03b49d..3904828b23b 100644 --- a/scumm.dsp +++ b/scumm.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Static Library" 0x0104 -CFG=scumm - Win32 MP3 Enabled Debug +CFG=scumm - Win32 OpenGL Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,14 +13,14 @@ CFG=scumm - Win32 MP3 Enabled 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 "scumm.mak" CFG="scumm - Win32 MP3 Enabled Debug" +!MESSAGE NMAKE /f "scumm.mak" CFG="scumm - Win32 OpenGL Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "scumm - Win32 Release" (based on "Win32 (x86) Static Library") !MESSAGE "scumm - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE "scumm - Win32 MP3 Enabled Debug" (based on "Win32 (x86) Static Library") -!MESSAGE "scumm - Win32 MP3 Enabled Release" (based on "Win32 (x86) Static Library") +!MESSAGE "scumm - Win32 OpenGL Debug" (based on "Win32 (x86) Static Library") +!MESSAGE "scumm - Win32 OpenGL Release" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Intermediate_Dir "scumm___Release" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /G6 /MT /W3 /WX /O2 /I "." /I "common" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "USE_ADLIB" /D "BYPASS_COPY_PROT" /YX /FD /c +# ADD CPP /nologo /G6 /MT /W3 /WX /GR /GX /O2 /I "." /I "common" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "USE_ADLIB" /D "BYPASS_COPY_PROT" /D "USE_MAD" /YX /FD /c # ADD BASE RSC /l 0x415 /d "NDEBUG" # ADD RSC /l 0x415 /d "NDEBUG" BSC32=bscmake.exe @@ -66,7 +66,7 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "scumm___Debug" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /WX /Gm /GX /ZI /Od /I "." /I "common" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "BYPASS_COPY_PROT" /D "USE_ADLIB" /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /WX /Gm /GR /GX /ZI /Od /I "." /I "common" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "BYPASS_COPY_PROT" /D "USE_ADLIB" /D "USE_MAD" /YX /FD /GZ /c # ADD BASE RSC /l 0x415 /d "_DEBUG" # ADD RSC /l 0x415 /d "_DEBUG" BSC32=bscmake.exe @@ -76,20 +76,20 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo # ADD LIB32 /nologo -!ELSEIF "$(CFG)" == "scumm - Win32 MP3 Enabled Debug" +!ELSEIF "$(CFG)" == "scumm - Win32 OpenGL Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "scumm___Win32_MP3_Enabled_Debug" -# PROP BASE Intermediate_Dir "scumm___Win32_MP3_Enabled_Debug" +# PROP BASE Output_Dir "scumm___Win32_OpenGL_Debug" +# PROP BASE Intermediate_Dir "scumm___Win32_OpenGL_Debug" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "scumm___MP3_Enabled_Debug" -# PROP Intermediate_Dir "scumm___MP3_Enabled_Debug" +# PROP Output_Dir "scumm___OpenGL_Debug" +# PROP Intermediate_Dir "scumm___OpenGL_Debug" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "." /I "common" /I "scumm" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "BYPASS_COPY_PROT" /D "USE_ADLIB" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /WX /Gm /GX /ZI /Od /I "." /I "common" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "USE_ADLIB" /D "BYPASS_COPY_PROT" /D "USE_MAD" /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /WX /Gm /GR /GX /ZI /Od /I "." /I "common" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "USE_ADLIB" /D "BYPASS_COPY_PROT" /D "USE_MAD" /YX /FD /GZ /c # ADD BASE RSC /l 0x415 /d "_DEBUG" # ADD RSC /l 0x415 /d "_DEBUG" BSC32=bscmake.exe @@ -99,20 +99,20 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo # ADD LIB32 /nologo -!ELSEIF "$(CFG)" == "scumm - Win32 MP3 Enabled Release" +!ELSEIF "$(CFG)" == "scumm - Win32 OpenGL Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "scumm___Win32_MP3_Enabled_Release" -# PROP BASE Intermediate_Dir "scumm___Win32_MP3_Enabled_Release" +# PROP BASE Output_Dir "scumm___Win32_OpenGL_Release" +# PROP BASE Intermediate_Dir "scumm___Win32_OpenGL_Release" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "scumm___MP3_Enabled_Release" -# PROP Intermediate_Dir "scumm___MP3_Enabled_Release" +# PROP Output_Dir "scumm___OpenGL_Release" +# PROP Intermediate_Dir "scumm___OpenGL_Release" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /I "." /I "common" /I "scumm" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "USE_ADLIB" /YX /FD /c -# ADD CPP /nologo /G6 /MT /W3 /WX /GX /O2 /I "." /I "common" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "USE_ADLIB" /D "BYPASS_COPY_PROT" /D "USE_MAD" /YX /FD /c +# ADD CPP /nologo /G6 /MT /W3 /WX /GR /GX /O2 /I "." /I "common" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "USE_ADLIB" /D "BYPASS_COPY_PROT" /D "USE_MAD" /YX /FD /c # ADD BASE RSC /l 0x415 /d "NDEBUG" # ADD RSC /l 0x415 /d "NDEBUG" BSC32=bscmake.exe @@ -128,8 +128,8 @@ LIB32=link.exe -lib # Name "scumm - Win32 Release" # Name "scumm - Win32 Debug" -# Name "scumm - Win32 MP3 Enabled Debug" -# Name "scumm - Win32 MP3 Enabled Release" +# Name "scumm - Win32 OpenGL Debug" +# Name "scumm - Win32 OpenGL Release" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" diff --git a/scummvm.dsp b/scummvm.dsp index e17e1cf819c..e7fee3d1a07 100644 --- a/scummvm.dsp +++ b/scummvm.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103 -CFG=scummvm - Win32 MP3 Enabled Debug +CFG=scummvm - Win32 OpenGL Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,14 +13,14 @@ CFG=scummvm - Win32 MP3 Enabled 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 "scummvm.mak" CFG="scummvm - Win32 MP3 Enabled Debug" +!MESSAGE NMAKE /f "scummvm.mak" CFG="scummvm - Win32 OpenGL Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "scummvm - Win32 Release" (based on "Win32 (x86) Console Application") !MESSAGE "scummvm - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE "scummvm - Win32 MP3 Enabled Debug" (based on "Win32 (x86) Console Application") -!MESSAGE "scummvm - Win32 MP3 Enabled Release" (based on "Win32 (x86) Console Application") +!MESSAGE "scummvm - Win32 OpenGL Debug" (based on "Win32 (x86) Console Application") +!MESSAGE "scummvm - Win32 OpenGL Release" (based on "Win32 (x86) Console Application") !MESSAGE # Begin Project @@ -44,7 +44,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /c -# ADD CPP /nologo /G6 /MT /W3 /WX /O2 /Ob2 /I "." /I "sound" /I "common" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "USE_ADLIB" /D "BYPASS_COPY_PROT" /FD /c +# ADD CPP /nologo /G6 /MT /W3 /WX /GR /GX /O2 /Ob2 /I "." /I "sound" /I "common" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "USE_ADLIB" /D "BYPASS_COPY_PROT" /D "USE_MAD" /FD /c # SUBTRACT CPP /YX /Yc /Yu # ADD BASE RSC /l 0x41d /d "NDEBUG" # ADD RSC /l 0x41d /d "NDEBUG" @@ -53,7 +53,7 @@ BSC32=bscmake.exe # 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 /nologo /subsystem:console /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib sdl.lib winmm.lib wsock32.lib opengl32.lib simon___Release\simon.lib scumm___Release\scumm.lib sky___Release\sky.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc" +# ADD LINK32 kernel32.lib user32.lib gdi32.lib sdl.lib winmm.lib wsock32.lib libmad.lib simon___Release\simon.lib scumm___Release\scumm.lib sky___Release\sky.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc" # SUBTRACT LINK32 /pdb:none !ELSEIF "$(CFG)" == "scummvm - Win32 Debug" @@ -70,7 +70,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /WX /Gm /GX /ZI /Od /I "." /I "sound" /I "common" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "ALLOW_GDI" /D "BYPASS_COPY_PROT" /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /WX /Gm /GR /GX /ZI /Od /I "." /I "sound" /I "common" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "ALLOW_GDI" /D "BYPASS_COPY_PROT" /D "USE_MAD" /YX /FD /GZ /c # SUBTRACT CPP /Fr # ADD BASE RSC /l 0x41d /d "_DEBUG" # ADD RSC /l 0x41d /d "_DEBUG" @@ -79,21 +79,21 @@ BSC32=bscmake.exe # 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 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib sdl.lib winmm.lib wsock32.lib opengl32.lib simon___Debug\simon.lib scumm___Debug\scumm.lib sky___Debug\sky.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc" /pdbtype:sept /fixed:no +# ADD LINK32 kernel32.lib user32.lib gdi32.lib sdl.lib winmm.lib wsock32.lib libmad.lib simon___Debug\simon.lib scumm___Debug\scumm.lib sky___Debug\sky.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc" /pdbtype:sept /fixed:no # SUBTRACT LINK32 /pdb:none -!ELSEIF "$(CFG)" == "scummvm - Win32 MP3 Enabled Debug" +!ELSEIF "$(CFG)" == "scummvm - Win32 OpenGL Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "scummvm___Win32_MP3_Enabled_Debug" -# PROP BASE Intermediate_Dir "scummvm___Win32_MP3_Enabled_Debug" +# PROP BASE Output_Dir "scummvm___Win32_OpenGL_Debug" +# PROP BASE Intermediate_Dir "scummvm___Win32_OpenGL_Debug" # PROP BASE Ignore_Export_Lib 0 # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "scummvm___MP3_Enabled_Debug" -# PROP Intermediate_Dir "scummvm___MP3_Enabled_Debug" +# PROP Output_Dir "scummvm___OpenGL_Debug" +# PROP Intermediate_Dir "scummvm___OpenGL_Debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /I "./sound" /I "./" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "ALLOW_GDI" /D "BYPASS_COPY_PROT" /D "USE_ADLIB" /D "USE_MAD" /Yu"stdafx.h" /FD /GZ /c @@ -107,26 +107,26 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib sdl.lib winmm.lib libmad.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib sdl.lib winmm.lib libmad.lib wsock32.lib opengl32.lib scumm___MP3_Enabled_Debug\scumm.lib simon___MP3_Enabled_Debug\simon.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc" /nodefaultlib:"libcd" /pdbtype:sept /fixed:no +# ADD LINK32 kernel32.lib user32.lib gdi32.lib sdl.lib winmm.lib libmad.lib wsock32.lib opengl32.lib scumm___OpenGL_Debug\scumm.lib simon___OpenGL_Debug\simon.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc" /nodefaultlib:"libcd" /pdbtype:sept /fixed:no # SUBTRACT LINK32 /pdb:none /map -!ELSEIF "$(CFG)" == "scummvm - Win32 MP3 Enabled Release" +!ELSEIF "$(CFG)" == "scummvm - Win32 OpenGL Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "scummvm___Win32_MP3_Enabled_Release" -# PROP BASE Intermediate_Dir "scummvm___Win32_MP3_Enabled_Release" +# PROP BASE Output_Dir "scummvm___Win32_OpenGL_Release" +# PROP BASE Intermediate_Dir "scummvm___Win32_OpenGL_Release" # PROP BASE Ignore_Export_Lib 0 # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "scummvm___MP3_Enabled_Release" -# PROP Intermediate_Dir "scummvm___MP3_Enabled_Release" +# PROP Output_Dir "scummvm___OpenGL_Release" +# PROP Intermediate_Dir "scummvm___OpenGL_Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /G6 /MD /W3 /O2 /Ob2 /I "." /I "sound" /I "common" /I "scumm" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "USE_ADLIB" /D "USE_MAD" /FD /c # SUBTRACT BASE CPP /YX /Yc /Yu -# ADD CPP /nologo /G6 /MT /W3 /WX /O2 /Ob2 /I "." /I "sound" /I "common" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "USE_ADLIB" /D "BYPASS_COPY_PROT" /D "USE_MAD" /FD /c +# ADD CPP /nologo /G6 /MT /W3 /WX /GR /GX /O2 /Ob2 /I "." /I "sound" /I "common" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "USE_ADLIB" /D "BYPASS_COPY_PROT" /D "USE_MAD" /FD /c # SUBTRACT CPP /YX /Yc /Yu # ADD BASE RSC /l 0x41d /d "NDEBUG" # ADD RSC /l 0x41d /d "NDEBUG" @@ -135,7 +135,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib sdl.lib winmm.lib wsock32.lib libmad.lib simon___Release\simon.lib scumm___Release\scumm.lib sdl.lib /nologo /subsystem:console /machine:I386 /nodefaultlib -# ADD LINK32 kernel32.lib user32.lib gdi32.lib sdl.lib winmm.lib wsock32.lib libmad.lib opengl32.lib scumm___MP3_Enabled_Release\scumm.lib simon___MP3_Enabled_Release\simon.lib /nologo /subsystem:console /incremental:yes /debug /machine:I386 /nodefaultlib:"libc" /nodefaultlib:"libcd" +# ADD LINK32 kernel32.lib user32.lib gdi32.lib sdl.lib winmm.lib wsock32.lib libmad.lib opengl32.lib scumm___OpenGL_Release\scumm.lib simon___OpenGL_Release\simon.lib /nologo /subsystem:console /incremental:yes /debug /machine:I386 /nodefaultlib:"libc" /nodefaultlib:"libcd" # SUBTRACT LINK32 /pdb:none !ENDIF @@ -144,8 +144,8 @@ LINK32=link.exe # Name "scummvm - Win32 Release" # Name "scummvm - Win32 Debug" -# Name "scummvm - Win32 MP3 Enabled Debug" -# Name "scummvm - Win32 MP3 Enabled Release" +# Name "scummvm - Win32 OpenGL Debug" +# Name "scummvm - Win32 OpenGL Release" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" @@ -418,10 +418,40 @@ SOURCE=".\backends\sdl\sdl-common.h" # Begin Source File SOURCE=.\backends\sdl\sdl.cpp + +!IF "$(CFG)" == "scummvm - Win32 Release" + +!ELSEIF "$(CFG)" == "scummvm - Win32 Debug" + +!ELSEIF "$(CFG)" == "scummvm - Win32 OpenGL Debug" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "scummvm - Win32 OpenGL Release" + +# PROP Exclude_From_Build 1 + +!ENDIF + # End Source File # Begin Source File SOURCE=.\backends\sdl\sdl_gl.cpp + +!IF "$(CFG)" == "scummvm - Win32 Release" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "scummvm - Win32 Debug" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "scummvm - Win32 OpenGL Debug" + +!ELSEIF "$(CFG)" == "scummvm - Win32 OpenGL Release" + +!ENDIF + # End Source File # End Group # Begin Group "fs" diff --git a/simon.dsp b/simon.dsp index 800ac6cd43a..9973934c4e1 100644 --- a/simon.dsp +++ b/simon.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Static Library" 0x0104 -CFG=simon - Win32 MP3 Enabled Debug +CFG=simon - Win32 OpenGL Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,14 +13,14 @@ CFG=simon - Win32 MP3 Enabled 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 "simon.mak" CFG="simon - Win32 MP3 Enabled Debug" +!MESSAGE NMAKE /f "simon.mak" CFG="simon - Win32 OpenGL Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "simon - Win32 Release" (based on "Win32 (x86) Static Library") !MESSAGE "simon - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE "simon - Win32 MP3 Enabled Debug" (based on "Win32 (x86) Static Library") -!MESSAGE "simon - Win32 MP3 Enabled Release" (based on "Win32 (x86) Static Library") +!MESSAGE "simon - Win32 OpenGL Debug" (based on "Win32 (x86) Static Library") +!MESSAGE "simon - Win32 OpenGL Release" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Intermediate_Dir "simon___Release" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /G6 /MT /W3 /WX /O2 /I "." /I "common" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "USE_ADLIB" /D "BYPASS_COPY_PROT" /YX /FD /c +# ADD CPP /nologo /G6 /MT /W3 /WX /GR /GX /O2 /I "." /I "common" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "USE_ADLIB" /D "BYPASS_COPY_PROT" /D "USE_MAD" /YX /FD /c # ADD BASE RSC /l 0x415 /d "NDEBUG" # ADD RSC /l 0x415 /d "NDEBUG" BSC32=bscmake.exe @@ -66,7 +66,7 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "simon___Debug" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /WX /Gm /GX /ZI /Od /I "." /I "common" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "BYPASS_COPY_PROT" /D "USE_ADLIB" /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /WX /Gm /GR /GX /ZI /Od /I "." /I "common" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "BYPASS_COPY_PROT" /D "USE_ADLIB" /D "USE_MAD" /YX /FD /GZ /c # ADD BASE RSC /l 0x415 /d "_DEBUG" # ADD RSC /l 0x415 /d "_DEBUG" BSC32=bscmake.exe @@ -76,7 +76,7 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo # ADD LIB32 /nologo -!ELSEIF "$(CFG)" == "simon - Win32 MP3 Enabled Debug" +!ELSEIF "$(CFG)" == "simon - Win32 OpenGL Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 @@ -85,11 +85,11 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "simon___MP3_Enabled_Debug" -# PROP Intermediate_Dir "simon___MP3_Enabled_Debug" +# PROP Output_Dir "simon___OpenGL_Debug" +# PROP Intermediate_Dir "simon___OpenGL_Debug" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "BYPASS_COPY_PROT" /D "USE_ADLIB" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /WX /Gm /GX /ZI /Od /I "." /I "common" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "USE_ADLIB" /D "BYPASS_COPY_PROT" /D "USE_MAD" /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /WX /Gm /GR /GX /ZI /Od /I "." /I "common" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "USE_ADLIB" /D "BYPASS_COPY_PROT" /D "USE_MAD" /FD /GZ /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x415 /d "_DEBUG" # ADD RSC /l 0x415 /d "_DEBUG" @@ -100,7 +100,7 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo # ADD LIB32 /nologo -!ELSEIF "$(CFG)" == "simon - Win32 MP3 Enabled Release" +!ELSEIF "$(CFG)" == "simon - Win32 OpenGL Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 @@ -109,11 +109,11 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "simon___MP3_Enabled_Release" -# PROP Intermediate_Dir "simon___MP3_Enabled_Release" +# PROP Output_Dir "simon___OpenGL_Release" +# PROP Intermediate_Dir "simon___OpenGL_Release" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /I "." /I "common" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "USE_ADLIB" /YX /FD /c -# ADD CPP /nologo /G6 /MT /W3 /WX /GX /O2 /I "." /I "common" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "USE_ADLIB" /D "BYPASS_COPY_PROT" /D "USE_MAD" /YX /FD /c +# ADD CPP /nologo /G6 /MT /W3 /WX /GR /GX /O2 /I "." /I "common" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "USE_ADLIB" /D "BYPASS_COPY_PROT" /D "USE_MAD" /YX /FD /c # ADD BASE RSC /l 0x415 /d "NDEBUG" # ADD RSC /l 0x415 /d "NDEBUG" BSC32=bscmake.exe @@ -129,8 +129,8 @@ LIB32=link.exe -lib # Name "simon - Win32 Release" # Name "simon - Win32 Debug" -# Name "simon - Win32 MP3 Enabled Debug" -# Name "simon - Win32 MP3 Enabled Release" +# Name "simon - Win32 OpenGL Debug" +# Name "simon - Win32 OpenGL Release" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" diff --git a/sky.dsp b/sky.dsp index 2b301dc2ec2..6555160130d 100644 --- a/sky.dsp +++ b/sky.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Static Library" 0x0104 -CFG=sky - Win32 MP3 Enabled Debug +CFG=sky - Win32 OpenGL Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,14 +13,14 @@ CFG=sky - Win32 MP3 Enabled 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 "sky.mak" CFG="sky - Win32 MP3 Enabled Debug" +!MESSAGE NMAKE /f "sky.mak" CFG="sky - Win32 OpenGL Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "sky - Win32 Release" (based on "Win32 (x86) Static Library") !MESSAGE "sky - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE "sky - Win32 MP3 Enabled Debug" (based on "Win32 (x86) Static Library") -!MESSAGE "sky - Win32 MP3 Enabled Release" (based on "Win32 (x86) Static Library") +!MESSAGE "sky - Win32 OpenGL Debug" (based on "Win32 (x86) Static Library") +!MESSAGE "sky - Win32 OpenGL Release" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Intermediate_Dir "sky___Release" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /G6 /MT /W3 /WX /GX /O2 /I "." /I "common" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c +# ADD CPP /nologo /G6 /MT /W3 /WX /GR /GX /O2 /I "." /I "common" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c # ADD BASE RSC /l 0x415 /d "NDEBUG" # ADD RSC /l 0x415 /d "NDEBUG" BSC32=bscmake.exe @@ -66,7 +66,7 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "sky___Debug" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /WX /Gm /GX /ZI /Od /I "." /I "common" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /WX /Gm /GR /GX /ZI /Od /I "." /I "common" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c # ADD BASE RSC /l 0x415 /d "_DEBUG" # ADD RSC /l 0x415 /d "_DEBUG" BSC32=bscmake.exe @@ -76,7 +76,7 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo # ADD LIB32 /nologo -!ELSEIF "$(CFG)" == "sky - Win32 MP3 Enabled Debug" +!ELSEIF "$(CFG)" == "sky - Win32 OpenGL Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 @@ -85,11 +85,11 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "sky___MP3_Enabled_Debug" -# PROP Intermediate_Dir "sky___MP3_Enabled_Debug" +# PROP Output_Dir "sky___OpenGL_Debug" +# PROP Intermediate_Dir "sky___OpenGL_Debug" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /WX /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /WX /Gm /GX /ZI /Od /I "." /I "common" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /WX /Gm /GR /GX /ZI /Od /I "." /I "common" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c # ADD BASE RSC /l 0x415 /d "_DEBUG" # ADD RSC /l 0x415 /d "_DEBUG" BSC32=bscmake.exe @@ -99,7 +99,7 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo # ADD LIB32 /nologo -!ELSEIF "$(CFG)" == "sky - Win32 MP3 Enabled Release" +!ELSEIF "$(CFG)" == "sky - Win32 OpenGL Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 @@ -108,11 +108,11 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "sky___MP3_Enabled_Release" -# PROP Intermediate_Dir "sky___MP3_Enabled_Release" +# PROP Output_Dir "sky___OpenGL_Release" +# PROP Intermediate_Dir "sky___OpenGL_Release" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /WX /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /G6 /MT /W3 /WX /GX /O2 /I "." /I "common" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c +# ADD CPP /nologo /G6 /MT /W3 /WX /GR /GX /O2 /I "." /I "common" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c # ADD BASE RSC /l 0x415 /d "NDEBUG" # ADD RSC /l 0x415 /d "NDEBUG" BSC32=bscmake.exe @@ -128,8 +128,8 @@ LIB32=link.exe -lib # Name "sky - Win32 Release" # Name "sky - Win32 Debug" -# Name "sky - Win32 MP3 Enabled Debug" -# Name "sky - Win32 MP3 Enabled Release" +# Name "sky - Win32 OpenGL Debug" +# Name "sky - Win32 OpenGL Release" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"