diff options
Diffstat (limited to 'projectfiles')
56 files changed, 544 insertions, 1926 deletions
diff --git a/projectfiles/blender/BLO_decrypt/BLO_decrypt.dsp b/projectfiles/blender/BLO_decrypt/BLO_decrypt.dsp index b8457b1f755..a83980e09b8 100644 --- a/projectfiles/blender/BLO_decrypt/BLO_decrypt.dsp +++ b/projectfiles/blender/BLO_decrypt/BLO_decrypt.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Static Library" 0x0104 -CFG=BLO_decrypt - Win32 Profile +CFG=BLO_decrypt - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,7 +13,7 @@ CFG=BLO_decrypt - Win32 Profile !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 "BLO_decrypt.mak" CFG="BLO_decrypt - Win32 Profile" +!MESSAGE NMAKE /f "BLO_decrypt.mak" CFG="BLO_decrypt - Win32 Release" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -21,7 +21,6 @@ CFG=BLO_decrypt - Win32 Profile !MESSAGE "BLO_decrypt - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE "BLO_decrypt - Win32 MT DLL Release" (based on "Win32 (x86) Static Library") !MESSAGE "BLO_decrypt - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library") -!MESSAGE "BLO_decrypt - Win32 Profile" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -40,8 +39,8 @@ RSC=rc.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\decrypt" +# PROP Output_Dir "..\..\..\obj\windows\blender\decrypt" +# PROP Intermediate_Dir "..\..\..\obj\windows\blender\decrypt" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c @@ -53,7 +52,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\decrypt\BLO_decrypt.lib" +# ADD LIB32 /nologo !ELSEIF "$(CFG)" == "BLO_decrypt - Win32 Debug" @@ -64,8 +63,8 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\decrypt\debug" +# PROP Output_Dir "..\..\..\obj\windows\blender\decrypt\debug" +# PROP Intermediate_Dir "..\..\..\obj\windows\blender\decrypt\debug" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c @@ -78,7 +77,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\decrypt\debug\BLO_decrypt.lib" +# ADD LIB32 /nologo !ELSEIF "$(CFG)" == "BLO_decrypt - Win32 MT DLL Release" @@ -89,8 +88,8 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\..\..\..\obj\windows\blender\decrypt\mtdll" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\decrypt\mtdll" +# PROP Output_Dir "..\..\..\obj\windows\blender\decrypt\mtdll" +# PROP Intermediate_Dir "..\..\..\obj\windows\blender\decrypt\mtdll" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /GX /O2 /I "..\..\..\source\kernel\gen_messaging" /I "..\..\..\lib\windows\blenkey\include" /I "..\..\..\lib\windows\openssl\include" /I "..\..\..\lib\windows\zlib\include" /I "..\..\..\source\blender\decrypt" /I "..\..\..\source\blender\readstreamglue" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c @@ -113,8 +112,8 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\..\..\..\obj\windows\blender\decrypt\mtdll_debug" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\decrypt\mtdll_debug" +# PROP Output_Dir "..\..\..\obj\windows\blender\decrypt\mtdll_debug" +# PROP Intermediate_Dir "..\..\..\obj\windows\blender\decrypt\mtdll_debug" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\source\kernel\gen_messaging" /I "..\..\..\lib\windows\blenkey\include" /I "..\..\..\lib\windows\openssl\include" /I "..\..\..\lib\windows\zlib\include" /I "..\..\..\source\blender\decrypt" /I "..\..\..\source\blender\readstreamglue" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c @@ -128,31 +127,6 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo # ADD LIB32 /nologo -!ELSEIF "$(CFG)" == "BLO_decrypt - Win32 Profile" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "BLO_decrypt___Win32_Profile" -# PROP BASE Intermediate_Dir "BLO_decrypt___Win32_Profile" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "BLO_decrypt___Win32_Profile" -# PROP Intermediate_Dir "BLO_decrypt___Win32_Profile" -# PROP Target_Dir "" -LINK32=link.exe -lib -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\source\blender\writestreamglue" /I "..\..\..\source\kernel\gen_messaging" /I "..\..\..\lib\windows\blenkey\include" /I "..\..\..\lib\windows\openssl\include" /I "..\..\..\lib\windows\zlib\include" /I "..\..\..\source\blender\decrypt" /I "..\..\..\source\blender\readstreamglue" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FR /YX /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /Zi /O2 /I "..\..\..\source\blender\writestreamglue" /I "..\..\..\source\kernel\gen_messaging" /I "..\..\..\lib\windows\blenkey\include" /I "..\..\..\lib\windows\openssl\include" /I "..\..\..\lib\windows\zlib\include" /I "..\..\..\source\blender\decrypt" /I "..\..\..\source\blender\readstreamglue" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# SUBTRACT CPP /Fr -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\decrypt\debug\BLO_decrypt.lib" -# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\decrypt\debug\BLO_decrypt.lib" - !ENDIF # Begin Target @@ -161,7 +135,6 @@ LIB32=link.exe -lib # Name "BLO_decrypt - Win32 Debug" # Name "BLO_decrypt - Win32 MT DLL Release" # Name "BLO_decrypt - Win32 MT DLL Debug" -# Name "BLO_decrypt - Win32 Profile" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" diff --git a/projectfiles/blender/BLO_decrypt_stub/BLO_decrypt_stub.dsp b/projectfiles/blender/BLO_decrypt_stub/BLO_decrypt_stub.dsp index f681e1d6446..6c85f0d9c41 100644 --- a/projectfiles/blender/BLO_decrypt_stub/BLO_decrypt_stub.dsp +++ b/projectfiles/blender/BLO_decrypt_stub/BLO_decrypt_stub.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Static Library" 0x0104 -CFG=BLO_decrypt_stub - Win32 Profile +CFG=BLO_decrypt_stub - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,13 +13,12 @@ CFG=BLO_decrypt_stub - Win32 Profile !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 "BLO_decrypt_stub.mak" CFG="BLO_decrypt_stub - Win32 Profile" +!MESSAGE NMAKE /f "BLO_decrypt_stub.mak" CFG="BLO_decrypt_stub - Win32 Release" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "BLO_decrypt_stub - Win32 Release" (based on "Win32 (x86) Static Library") !MESSAGE "BLO_decrypt_stub - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE "BLO_decrypt_stub - Win32 Profile" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -38,8 +37,8 @@ RSC=rc.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\decryptstub" +# PROP Output_Dir "..\..\..\obj\windows\blender\decryptstub" +# PROP Intermediate_Dir "..\..\..\obj\windows\blender\decryptstub" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c @@ -51,7 +50,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\decryptstub\BLO_decrypt_stub.lib" +# ADD LIB32 /nologo !ELSEIF "$(CFG)" == "BLO_decrypt_stub - Win32 Debug" @@ -62,8 +61,8 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\decryptstub\debug" +# PROP Output_Dir "..\..\..\obj\windows\blender\decryptstub\debug" +# PROP Intermediate_Dir "..\..\..\obj\windows\blender\decryptstub\debug" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c @@ -76,31 +75,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\decryptstub\debug\BLO_decrypt_stub.lib" - -!ELSEIF "$(CFG)" == "BLO_decrypt_stub - Win32 Profile" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "BLO_decrypt_stub___Win32_Profile" -# PROP BASE Intermediate_Dir "BLO_decrypt_stub___Win32_Profile" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "BLO_decrypt_stub___Win32_Profile" -# PROP Intermediate_Dir "BLO_decrypt_stub___Win32_Profile" -# PROP Target_Dir "" -LINK32=link.exe -lib -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\source\kernel\gen_messaging" /I "..\..\..\source\blender\decrypt" /I "..\..\..\source\blender\readstreamglue" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FR /YX /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /Zi /I "..\..\..\source\kernel\gen_messaging" /I "..\..\..\source\blender\decrypt" /I "..\..\..\source\blender\readstreamglue" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD BASE RSC /l 0x413 /d "_DEBUG" -# ADD RSC /l 0x413 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\decryptstub\debug\BLO_decrypt_stub.lib" -# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\decryptstub\debug\BLO_decrypt_stub.lib" +# ADD LIB32 /nologo !ENDIF @@ -108,7 +83,6 @@ LIB32=link.exe -lib # Name "BLO_decrypt_stub - Win32 Release" # Name "BLO_decrypt_stub - Win32 Debug" -# Name "BLO_decrypt_stub - Win32 Profile" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" diff --git a/projectfiles/blender/BLO_deflate/BLO_deflate.dsp b/projectfiles/blender/BLO_deflate/BLO_deflate.dsp index ed8a4a4f1d8..b2148c06c23 100644 --- a/projectfiles/blender/BLO_deflate/BLO_deflate.dsp +++ b/projectfiles/blender/BLO_deflate/BLO_deflate.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Static Library" 0x0104 -CFG=BLO_deflate - Win32 Profile +CFG=BLO_deflate - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,7 +13,7 @@ CFG=BLO_deflate - Win32 Profile !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 "BLO_deflate.mak" CFG="BLO_deflate - Win32 Profile" +!MESSAGE NMAKE /f "BLO_deflate.mak" CFG="BLO_deflate - Win32 Release" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -21,7 +21,6 @@ CFG=BLO_deflate - Win32 Profile !MESSAGE "BLO_deflate - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE "BLO_deflate - Win32 MT DLL Release" (based on "Win32 (x86) Static Library") !MESSAGE "BLO_deflate - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library") -!MESSAGE "BLO_deflate - Win32 Profile" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -40,8 +39,8 @@ RSC=rc.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\..\..\..\obj\windows\blender\deflate" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\deflate" +# PROP Output_Dir "..\..\..\obj\windows\blender\deflate" +# PROP Intermediate_Dir "..\..\..\obj\windows\blender\deflate" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c @@ -64,8 +63,8 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\..\..\..\obj\windows\blender\deflate\debug" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\deflate\debug" +# PROP Output_Dir "..\..\..\obj\windows\blender\deflate\debug" +# PROP Intermediate_Dir "..\..\..\obj\windows\blender\deflate\debug" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c @@ -78,7 +77,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo +# ADD LIB32 /nologo /out:"..\..\obj\windows\blender\deflate\debug\BLO_deflate.lib" !ELSEIF "$(CFG)" == "BLO_deflate - Win32 MT DLL Release" @@ -89,8 +88,8 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\..\..\..\obj\windows\blender\deflate\mtdll" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\deflate\mtdll" +# PROP Output_Dir "..\..\..\obj\windows\blender\deflate\mtdll" +# PROP Intermediate_Dir "..\..\..\obj\windows\blender\deflate\mtdll" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /GX /O2 /I "..\..\..\source\kernel\gen_messaging" /I "..\..\..\source\blender\deflate\\" /I "..\..\..\source\blender\inflate\\" /I "..\..\..\lib\windows\zlib\include" /I "..\..\..\source\blender\writestreamglue" /I "..\..\..\source\blender\readstreamglue" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c @@ -113,8 +112,8 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\..\..\..\obj\windows\blender\deflate\mtdll_debug" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\deflate\mtdll_debug" +# PROP Output_Dir "..\..\..\obj\windows\blender\deflate\mtdll_debug" +# PROP Intermediate_Dir "..\..\..\obj\windows\blender\deflate\mtdll_debug" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\source\kernel\gen_messaging" /I "..\..\..\source\blender\deflate\\" /I "..\..\..\source\blender\inflate\\" /I "..\..\..\lib\windows\zlib\include" /I "..\..\..\source\blender\writestreamglue" /I "..\..\..\source\blender\readstreamglue" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c @@ -128,31 +127,6 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo # ADD LIB32 /nologo -!ELSEIF "$(CFG)" == "BLO_deflate - Win32 Profile" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "BLO_deflate___Win32_Profile" -# PROP BASE Intermediate_Dir "BLO_deflate___Win32_Profile" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "BLO_deflate___Win32_Profile" -# PROP Intermediate_Dir "BLO_deflate___Win32_Profile" -# PROP Target_Dir "" -LINK32=link.exe -lib -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\source\kernel\gen_messaging" /I "..\..\..\source\blender\deflate\\" /I "..\..\..\source\blender\inflate\\" /I "..\..\..\lib\windows\zlib\include" /I "..\..\..\source\blender\writestreamglue" /I "..\..\..\source\blender\readstreamglue" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FR /YX /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /Zi /O2 /I "..\..\..\source\kernel\gen_messaging" /I "..\..\..\source\blender\deflate\\" /I "..\..\..\source\blender\inflate\\" /I "..\..\..\lib\windows\zlib\include" /I "..\..\..\source\blender\writestreamglue" /I "..\..\..\source\blender\readstreamglue" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# SUBTRACT CPP /Fr -# ADD BASE RSC /l 0x413 /d "_DEBUG" -# ADD RSC /l 0x413 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - !ENDIF # Begin Target @@ -161,7 +135,6 @@ LIB32=link.exe -lib # Name "BLO_deflate - Win32 Debug" # Name "BLO_deflate - Win32 MT DLL Release" # Name "BLO_deflate - Win32 MT DLL Debug" -# Name "BLO_deflate - Win32 Profile" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" diff --git a/projectfiles/blender/BLO_encrypt/BLO_encrypt.dsp b/projectfiles/blender/BLO_encrypt/BLO_encrypt.dsp index 9b02fa026a8..b15eebd8bd0 100644 --- a/projectfiles/blender/BLO_encrypt/BLO_encrypt.dsp +++ b/projectfiles/blender/BLO_encrypt/BLO_encrypt.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Static Library" 0x0104 -CFG=BLO_encrypt - Win32 Profile +CFG=BLO_encrypt - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,7 +13,7 @@ CFG=BLO_encrypt - Win32 Profile !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 "BLO_encrypt.mak" CFG="BLO_encrypt - Win32 Profile" +!MESSAGE NMAKE /f "BLO_encrypt.mak" CFG="BLO_encrypt - Win32 Release" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -21,7 +21,6 @@ CFG=BLO_encrypt - Win32 Profile !MESSAGE "BLO_encrypt - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE "BLO_encrypt - Win32 MT DLL Release" (based on "Win32 (x86) Static Library") !MESSAGE "BLO_encrypt - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library") -!MESSAGE "BLO_encrypt - Win32 Profile" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -64,8 +63,8 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\encrypt\debug" +# PROP Output_Dir "..\..\..\obj\windows\blender\encrypt\debug" +# PROP Intermediate_Dir "..\..\..\obj\windows\blender\encrypt\debug" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c @@ -78,7 +77,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\encrypt\debug\BLO_encrypt.lib" +# ADD LIB32 /nologo !ELSEIF "$(CFG)" == "BLO_encrypt - Win32 MT DLL Release" @@ -89,8 +88,8 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\..\..\..\obj\windows\blender\encrypt\mtdll" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\encrypt\mtdll" +# PROP Output_Dir "..\..\..\obj\windows\blender\encrypt\mtdll" +# PROP Intermediate_Dir "..\..\..\obj\windows\blender\encrypt\mtdll" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /GX /O2 /I "..\..\..\source\kernel\gen_messaging" /I "..\..\..\source\blender\writestreamglue" /I "..\..\..\source\blender\encrypt" /I "..\..\..\source\blender\readstreamglue" /I "..\..\..\lib\windows\openssl\include" /I "..\..\..\lib\windows\zlib\include" /I "..\..\..\lib\windows\blenkey\include" /I "..\..\..\source\blender\decrypt" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c @@ -113,8 +112,8 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\..\..\..\obj\windows\blender\encrypt\mtdll_debug" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\encrypt\mtdll_debug" +# PROP Output_Dir "..\..\..\obj\windows\blender\encrypt\mtdll_debug" +# PROP Intermediate_Dir "..\..\..\obj\windows\blender\encrypt\mtdll_debug" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\source\kernel\gen_messaging" /I "..\..\..\source\blender\writestreamglue" /I "..\..\..\source\blender\encrypt" /I "..\..\..\source\blender\readstreamglue" /I "..\..\..\lib\windows\openssl\include" /I "..\..\..\lib\windows\zlib\include" /I "..\..\..\lib\windows\blenkey\include" /I "..\..\..\source\blender\decrypt" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c @@ -128,31 +127,6 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo # ADD LIB32 /nologo -!ELSEIF "$(CFG)" == "BLO_encrypt - Win32 Profile" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "BLO_encrypt___Win32_Profile" -# PROP BASE Intermediate_Dir "BLO_encrypt___Win32_Profile" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "BLO_encrypt___Win32_Profile" -# PROP Intermediate_Dir "BLO_encrypt___Win32_Profile" -# PROP Target_Dir "" -LINK32=link.exe -lib -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\source\kernel\gen_messaging" /I "..\..\..\source\blender\writestreamglue" /I "..\..\..\source\blender\encrypt" /I "..\..\..\source\blender\readstreamglue" /I "..\..\..\lib\windows\openssl\include" /I "..\..\..\lib\windows\zlib\include" /I "..\..\..\lib\windows\blenkey\include" /I "..\..\..\source\blender\decrypt" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FR /YX /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /Zi /O2 /I "..\..\..\source\kernel\gen_messaging" /I "..\..\..\source\blender\writestreamglue" /I "..\..\..\source\blender\encrypt" /I "..\..\..\source\blender\readstreamglue" /I "..\..\..\lib\windows\openssl\include" /I "..\..\..\lib\windows\zlib\include" /I "..\..\..\lib\windows\blenkey\include" /I "..\..\..\source\blender\decrypt" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# SUBTRACT CPP /Fr -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\encrypt\debug\BLO_encrypt.lib" -# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\encrypt\debug\BLO_encrypt.lib" - !ENDIF # Begin Target @@ -161,7 +135,6 @@ LIB32=link.exe -lib # Name "BLO_encrypt - Win32 Debug" # Name "BLO_encrypt - Win32 MT DLL Release" # Name "BLO_encrypt - Win32 MT DLL Debug" -# Name "BLO_encrypt - Win32 Profile" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" diff --git a/projectfiles/blender/BLO_inflate/BLO_inflate.dsp b/projectfiles/blender/BLO_inflate/BLO_inflate.dsp index 1ec1ee58801..fe8be5a88b6 100644 --- a/projectfiles/blender/BLO_inflate/BLO_inflate.dsp +++ b/projectfiles/blender/BLO_inflate/BLO_inflate.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Static Library" 0x0104 -CFG=BLO_inflate - Win32 Profile +CFG=BLO_inflate - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,7 +13,7 @@ CFG=BLO_inflate - Win32 Profile !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 "BLO_inflate.mak" CFG="BLO_inflate - Win32 Profile" +!MESSAGE NMAKE /f "BLO_inflate.mak" CFG="BLO_inflate - Win32 Release" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -21,7 +21,6 @@ CFG=BLO_inflate - Win32 Profile !MESSAGE "BLO_inflate - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE "BLO_inflate - Win32 MT DLL Release" (based on "Win32 (x86) Static Library") !MESSAGE "BLO_inflate - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library") -!MESSAGE "BLO_inflate - Win32 Profile" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -64,8 +63,8 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\inflate\debug" +# PROP Output_Dir "..\..\..\obj\windows\blender\inflate\debug" +# PROP Intermediate_Dir "..\..\..\obj\windows\blender\inflate\debug" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c @@ -78,7 +77,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\inflate\debug\BLO_inflate.lib" +# ADD LIB32 /nologo !ELSEIF "$(CFG)" == "BLO_inflate - Win32 MT DLL Release" @@ -89,8 +88,8 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\..\..\..\obj\windows\blender\inflate\mtdll" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\inflate\mtdll" +# PROP Output_Dir "..\..\..\obj\windows\blender\inflate\mtdll" +# PROP Intermediate_Dir "..\..\..\obj\windows\blender\inflate\mtdll" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /GX /O2 /I "..\..\..\source\kernel\gen_messaging" /I "..\..\..\source\blender\inflate" /I "..\..\..\lib\windows\zlib\include" /I "..\..\..\source\blender\readstreamglue" /I "..\..\..\source\blender\writestreamglue" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c @@ -113,8 +112,8 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\..\..\..\obj\windows\blender\inflate\mtdll_debug" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\inflate\mtdll_debug" +# PROP Output_Dir "..\..\..\obj\windows\blender\inflate\mtdll_debug" +# PROP Intermediate_Dir "..\..\..\obj\windows\blender\inflate\mtdll_debug" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\source\kernel\gen_messaging" /I "..\..\..\source\blender\inflate" /I "..\..\..\lib\windows\zlib\include" /I "..\..\..\source\blender\readstreamglue" /I "..\..\..\source\blender\writestreamglue" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c @@ -128,30 +127,6 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo # ADD LIB32 /nologo -!ELSEIF "$(CFG)" == "BLO_inflate - Win32 Profile" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "BLO_inflate___Win32_Profile" -# PROP BASE Intermediate_Dir "BLO_inflate___Win32_Profile" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "BLO_inflate___Win32_Profile" -# PROP Intermediate_Dir "BLO_inflate___Win32_Profile" -# PROP Target_Dir "" -LINK32=link.exe -lib -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\source\kernel\gen_messaging" /I "..\..\..\source\blender\inflate" /I "..\..\..\lib\windows\zlib\include" /I "..\..\..\source\blender\readstreamglue" /I "..\..\..\source\blender\writestreamglue" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FR /YX /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /Zi /I "..\..\..\source\kernel\gen_messaging" /I "..\..\..\source\blender\inflate" /I "..\..\..\lib\windows\zlib\include" /I "..\..\..\source\blender\readstreamglue" /I "..\..\..\source\blender\writestreamglue" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD BASE RSC /l 0x413 /d "_DEBUG" -# ADD RSC /l 0x413 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\inflate\debug\BLO_inflate.lib" -# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\inflate\debug\BLO_inflate.lib" - !ENDIF # Begin Target @@ -160,7 +135,6 @@ LIB32=link.exe -lib # Name "BLO_inflate - Win32 Debug" # Name "BLO_inflate - Win32 MT DLL Release" # Name "BLO_inflate - Win32 MT DLL Debug" -# Name "BLO_inflate - Win32 Profile" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" diff --git a/projectfiles/blender/BLO_readblenfile/BLO_readblenfile.dsp b/projectfiles/blender/BLO_readblenfile/BLO_readblenfile.dsp index ffc9673530c..a43e47a8b3a 100644 --- a/projectfiles/blender/BLO_readblenfile/BLO_readblenfile.dsp +++ b/projectfiles/blender/BLO_readblenfile/BLO_readblenfile.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Static Library" 0x0104 -CFG=BLO_readblenfile - Win32 Profile +CFG=BLO_readblenfile - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,7 +13,7 @@ CFG=BLO_readblenfile - Win32 Profile !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 "BLO_readblenfile.mak" CFG="BLO_readblenfile - Win32 Profile" +!MESSAGE NMAKE /f "BLO_readblenfile.mak" CFG="BLO_readblenfile - Win32 Release" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -21,7 +21,6 @@ CFG=BLO_readblenfile - Win32 Profile !MESSAGE "BLO_readblenfile - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE "BLO_readblenfile - Win32 MT DLL Release" (based on "Win32 (x86) Static Library") !MESSAGE "BLO_readblenfile - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library") -!MESSAGE "BLO_readblenfile - Win32 Profile" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -64,8 +63,8 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\..\..\..\obj\windows\blender\readblenfile\debug" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\readblenfile\debug" +# PROP Output_Dir "..\..\..\obj\windows\blender\readblenfile\debug" +# PROP Intermediate_Dir "..\..\..\obj\windows\blender\readblenfile\debug" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c @@ -89,8 +88,8 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\..\..\..\obj\windows\blender\readblenfile\mtdll" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\readblenfile\mtdll" +# PROP Output_Dir "..\..\..\obj\windows\blender\readblenfile\mtdll" +# PROP Intermediate_Dir "..\..\..\obj\windows\blender\readblenfile\mtdll" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /GX /O2 /I "..\..\..\source\blender\streamglue\\" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\kernel\gen_messaging" /I "..\..\..\source\blender\readblenfile\\" /I "..\..\..\source\blender\deflate\\" /I "..\..\..\source\blender\inflate\\" /I "..\..\..\lib\windows\zlib\include" /I "..\..\..\source\blender\readstreamglue" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c @@ -113,8 +112,8 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\..\..\..\obj\windows\blender\readblenfile\mtdll_debug" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\readblenfile\mtdll_debug" +# PROP Output_Dir "..\..\..\obj\windows\blender\readblenfile\mtdll_debug" +# PROP Intermediate_Dir "..\..\..\obj\windows\blender\readblenfile\mtdll_debug" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\readstreamglue\\" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\kernel\gen_messaging" /I "..\..\..\source\blender\readblenfile\\" /I "..\..\..\source\blender\deflate\\" /I "..\..\..\source\blender\inflate\\" /I "..\..\..\lib\windows\zlib\include" /I "..\..\..\source\blender\readstreamglue" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c @@ -128,30 +127,6 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo # ADD LIB32 /nologo -!ELSEIF "$(CFG)" == "BLO_readblenfile - Win32 Profile" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "BLO_readblenfile___Win32_Profile" -# PROP BASE Intermediate_Dir "BLO_readblenfile___Win32_Profile" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "BLO_readblenfile___Win32_Profile" -# PROP Intermediate_Dir "BLO_readblenfile___Win32_Profile" -# PROP Target_Dir "" -LINK32=link.exe -lib -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\readstreamglue\\" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\kernel\gen_messaging" /I "..\..\..\source\blender\readblenfile\\" /I "..\..\..\source\blender\deflate\\" /I "..\..\..\source\blender\inflate\\" /I "..\..\..\lib\windows\zlib\include" /I "..\..\..\source\blender\readstreamglue" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FR /YX /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /Zi /I "..\..\..\source\blender\readstreamglue\\" /I "..\..\..\source\blender\blenloader\\" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\kernel\gen_messaging" /I "..\..\..\source\blender\readblenfile\\" /I "..\..\..\source\blender\deflate\\" /I "..\..\..\source\blender\inflate\\" /I "..\..\..\lib\windows\zlib\include" /I "..\..\..\source\blender\readstreamglue" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD BASE RSC /l 0x413 /d "_DEBUG" -# ADD RSC /l 0x413 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - !ENDIF # Begin Target @@ -160,7 +135,6 @@ LIB32=link.exe -lib # Name "BLO_readblenfile - Win32 Debug" # Name "BLO_readblenfile - Win32 MT DLL Release" # Name "BLO_readblenfile - Win32 MT DLL Debug" -# Name "BLO_readblenfile - Win32 Profile" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" diff --git a/projectfiles/blender/BLO_readstreamglue/BLO_readstreamglue.dsp b/projectfiles/blender/BLO_readstreamglue/BLO_readstreamglue.dsp index 00fcaa235b9..cd40bc89674 100644 --- a/projectfiles/blender/BLO_readstreamglue/BLO_readstreamglue.dsp +++ b/projectfiles/blender/BLO_readstreamglue/BLO_readstreamglue.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Static Library" 0x0104 -CFG=BLO_readstreamglue - Win32 Profile +CFG=BLO_readstreamglue - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,7 +13,7 @@ CFG=BLO_readstreamglue - Win32 Profile !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 "BLO_readstreamglue.mak" CFG="BLO_readstreamglue - Win32 Profile" +!MESSAGE NMAKE /f "BLO_readstreamglue.mak" CFG="BLO_readstreamglue - Win32 Release" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -21,7 +21,6 @@ CFG=BLO_readstreamglue - Win32 Profile !MESSAGE "BLO_readstreamglue - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE "BLO_readstreamglue - Win32 MT DLL Release" (based on "Win32 (x86) Static Library") !MESSAGE "BLO_readstreamglue - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library") -!MESSAGE "BLO_readstreamglue - Win32 Profile" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -64,8 +63,8 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\readstreamglue\debug" +# PROP Output_Dir "..\..\..\obj\windows\blender\readstreamglue\debug" +# PROP Intermediate_Dir "..\..\..\obj\windows\blender\readstreamglue\debug" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c @@ -78,7 +77,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\readstreamglue\debug\BLO_readstreamglue.lib" +# ADD LIB32 /nologo !ELSEIF "$(CFG)" == "BLO_readstreamglue - Win32 MT DLL Release" @@ -89,8 +88,8 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\..\..\..\obj\windows\blender\readstreamglue\mtdll" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\readstreamglue\mtdll" +# PROP Output_Dir "..\..\..\obj\windows\blender\readstreamglue\mtdll" +# PROP Intermediate_Dir "..\..\..\obj\windows\blender\readstreamglue\mtdll" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /GX /O2 /I "..\..\..\source\kernel\gen_messaging" /I "..\..\..\source\blender\readstreamglue" /I "..\..\..\source\blender\readstreamglue\stubs" /I "..\..\..\lib\windows\zlib\include" /I "..\..\..\source\blender\blenloader" /I "..\..\..\source\blender\inflate" /I "..\..\..\source\blender\decrypt" /I "..\..\..\source\blender\verify" /I "..\..\..\lib\windows\blenkey\include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c @@ -113,8 +112,8 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\..\..\..\obj\windows\blender\readstreamglue\mtdll_debug" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\readstreamglue\mtdll_debug" +# PROP Output_Dir "..\..\..\obj\windows\blender\readstreamglue\mtdll_debug" +# PROP Intermediate_Dir "..\..\..\obj\windows\blender\readstreamglue\mtdll_debug" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\lib\windows\zlib\include" /I "..\..\..\source\kernel\gen_messaging" /I "..\..\..\source\blender\readstreamglue" /I "..\..\..\source\blender\readstreamglue\stubs" /I "..\..\..\lib\windows\zlib\include" /I "..\..\..\source\blender\blenloader" /I "..\..\..\source\blender\inflate" /I "..\..\..\source\blender\decrypt" /I "..\..\..\source\blender\verify" /I "..\..\..\lib\windows\blenkey\include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c @@ -128,30 +127,6 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo # ADD LIB32 /nologo -!ELSEIF "$(CFG)" == "BLO_readstreamglue - Win32 Profile" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "BLO_readstreamglue___Win32_Profile" -# PROP BASE Intermediate_Dir "BLO_readstreamglue___Win32_Profile" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "BLO_readstreamglue___Win32_Profile" -# PROP Intermediate_Dir "BLO_readstreamglue___Win32_Profile" -# PROP Target_Dir "" -LINK32=link.exe -lib -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\lib\windows\zlib\include" /I "..\..\..\source\kernel\gen_messaging" /I "..\..\..\source\blender\readstreamglue" /I "..\..\..\source\blender\readstreamglue\stubs" /I "..\..\..\lib\windows\zlib\include" /I "..\..\..\source\blender\blenloader" /I "..\..\..\source\blender\inflate" /I "..\..\..\source\blender\decrypt" /I "..\..\..\source\blender\verify" /I "..\..\..\lib\windows\blenkey\include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FR /YX /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /Zi /I "..\..\lib\windows\zlib\include" /I "..\..\..\source\kernel\gen_messaging" /I "..\..\..\source\blender\readstreamglue" /I "..\..\..\source\blender\readstreamglue\stubs" /I "..\..\..\lib\windows\zlib\include" /I "..\..\..\source\blender\blenloader" /I "..\..\..\source\blender\inflate" /I "..\..\..\source\blender\decrypt" /I "..\..\..\source\blender\verify" /I "..\..\..\lib\windows\blenkey\include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\readstreamglue\debug\BLO_readstreamglue.lib" -# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\readstreamglue\debug\BLO_readstreamglue.lib" - !ENDIF # Begin Target @@ -160,7 +135,6 @@ LIB32=link.exe -lib # Name "BLO_readstreamglue - Win32 Debug" # Name "BLO_readstreamglue - Win32 MT DLL Release" # Name "BLO_readstreamglue - Win32 MT DLL Debug" -# Name "BLO_readstreamglue - Win32 Profile" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" diff --git a/projectfiles/blender/BLO_sign/BLO_sign.dsp b/projectfiles/blender/BLO_sign/BLO_sign.dsp index 08b2058a143..ecac53cc3d7 100644 --- a/projectfiles/blender/BLO_sign/BLO_sign.dsp +++ b/projectfiles/blender/BLO_sign/BLO_sign.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Static Library" 0x0104 -CFG=BLO_sign - Win32 Profile +CFG=BLO_sign - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,7 +13,7 @@ CFG=BLO_sign - Win32 Profile !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 "BLO_sign.mak" CFG="BLO_sign - Win32 Profile" +!MESSAGE NMAKE /f "BLO_sign.mak" CFG="BLO_sign - Win32 Release" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -21,7 +21,6 @@ CFG=BLO_sign - Win32 Profile !MESSAGE "BLO_sign - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE "BLO_sign - Win32 MT DLL Release" (based on "Win32 (x86) Static Library") !MESSAGE "BLO_sign - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library") -!MESSAGE "BLO_sign - Win32 Profile" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -64,8 +63,8 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\sign\debug" +# PROP Output_Dir "..\..\..\obj\windows\blender\sign\debug" +# PROP Intermediate_Dir "..\..\..\obj\windows\blender\sign\debug" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c @@ -78,7 +77,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\sign\debug\BLO_sign.lib" +# ADD LIB32 /nologo !ELSEIF "$(CFG)" == "BLO_sign - Win32 MT DLL Release" @@ -89,8 +88,8 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\..\..\..\obj\windows\blender\sign\mtdll" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\sign\mtdll" +# PROP Output_Dir "..\..\..\obj\windows\blender\sign\mtdll" +# PROP Intermediate_Dir "..\..\..\obj\windows\blender\sign\mtdll" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /GX /O2 /I "..\..\..\source\kernel\gen_messaging" /I "..\..\..\lib\windows\zlib\include" /I "..\..\..\lib\windows\openssl\include" /I "..\..\..\lib\windows\blenkey\include" /I "..\..\..\source\blender\readstreamglue" /I "..\..\..\source\blender\sign" /I "..\..\..\source\blender\verify" /I "..\..\..\source\blender\writestreamglue" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c @@ -113,8 +112,8 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\..\..\..\obj\windows\blender\sign\mtdll_debug" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\sign\mtdll_debug" +# PROP Output_Dir "..\..\..\obj\windows\blender\sign\mtdll_debug" +# PROP Intermediate_Dir "..\..\..\obj\windows\blender\sign\mtdll_debug" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\source\kernel\gen_messaging" /I "..\..\..\lib\windows\zlib\include" /I "..\..\..\lib\windows\openssl\include" /I "..\..\..\lib\windows\blenkey\include" /I "..\..\..\source\blender\readstreamglue" /I "..\..\..\source\blender\sign" /I "..\..\..\source\blender\verify" /I "..\..\..\source\blender\writestreamglue" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c @@ -128,31 +127,6 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo # ADD LIB32 /nologo -!ELSEIF "$(CFG)" == "BLO_sign - Win32 Profile" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "BLO_sign___Win32_Profile" -# PROP BASE Intermediate_Dir "BLO_sign___Win32_Profile" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "BLO_sign___Win32_Profile" -# PROP Intermediate_Dir "BLO_sign___Win32_Profile" -# PROP Target_Dir "" -LINK32=link.exe -lib -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\source\kernel\gen_messaging" /I "..\..\..\lib\windows\zlib\include" /I "..\..\..\lib\windows\openssl\include" /I "..\..\..\lib\windows\blenkey\include" /I "..\..\..\source\blender\readstreamglue" /I "..\..\..\source\blender\sign" /I "..\..\..\source\blender\verify" /I "..\..\..\source\blender\writestreamglue" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FR /YX /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /ZI /O2 /I "..\..\..\source\kernel\gen_messaging" /I "..\..\..\lib\windows\zlib\include" /I "..\..\..\lib\windows\openssl\include" /I "..\..\..\lib\windows\blenkey\include" /I "..\..\..\source\blender\readstreamglue" /I "..\..\..\source\blender\sign" /I "..\..\..\source\blender\verify" /I "..\..\..\source\blender\writestreamglue" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# SUBTRACT CPP /Fr -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\sign\debug\BLO_sign.lib" -# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\sign\debug\BLO_sign.lib" - !ENDIF # Begin Target @@ -161,7 +135,6 @@ LIB32=link.exe -lib # Name "BLO_sign - Win32 Debug" # Name "BLO_sign - Win32 MT DLL Release" # Name "BLO_sign - Win32 MT DLL Debug" -# Name "BLO_sign - Win32 Profile" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" diff --git a/projectfiles/blender/BLO_verify/BLO_verify.dsp b/projectfiles/blender/BLO_verify/BLO_verify.dsp index e98d785eb58..3d17800d9a2 100644 --- a/projectfiles/blender/BLO_verify/BLO_verify.dsp +++ b/projectfiles/blender/BLO_verify/BLO_verify.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Static Library" 0x0104 -CFG=BLO_verify - Win32 Profile +CFG=BLO_verify - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,7 +13,7 @@ CFG=BLO_verify - Win32 Profile !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 "BLO_verify.mak" CFG="BLO_verify - Win32 Profile" +!MESSAGE NMAKE /f "BLO_verify.mak" CFG="BLO_verify - Win32 Release" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -21,7 +21,6 @@ CFG=BLO_verify - Win32 Profile !MESSAGE "BLO_verify - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE "BLO_verify - Win32 MT DLL Release" (based on "Win32 (x86) Static Library") !MESSAGE "BLO_verify - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library") -!MESSAGE "BLO_verify - Win32 Profile" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -64,8 +63,8 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\verify\debug" +# PROP Output_Dir "..\..\..\obj\windows\blender\verify\debug" +# PROP Intermediate_Dir "..\..\..\obj\windows\blender\verify\debug" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c @@ -78,7 +77,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\verify\debug\BLO_verify.lib" +# ADD LIB32 /nologo !ELSEIF "$(CFG)" == "BLO_verify - Win32 MT DLL Release" @@ -89,8 +88,8 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\..\..\..\obj\windows\blender\verify\mtdll" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\verify\mtdll" +# PROP Output_Dir "..\..\..\obj\windows\blender\verify\mtdll" +# PROP Intermediate_Dir "..\..\..\obj\windows\blender\verify\mtdll" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /GX /O2 /I "..\..\..\source\kernel\gen_messaging" /I "..\..\..\lib\windows\openssl\include" /I "..\..\..\lib\windows\zlib\include" /I "..\..\..\source\blender\verify" /I "..\..\..\source\blender\readstreamglue" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c @@ -113,8 +112,8 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\..\..\..\obj\windows\blender\verify\mtdll_debug" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\verify\mtdll_debug" +# PROP Output_Dir "..\..\..\obj\windows\blender\verify\mtdll_debug" +# PROP Intermediate_Dir "..\..\..\obj\windows\blender\verify\mtdll_debug" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\source\kernel\gen_messaging" /I "..\..\..\lib\windows\openssl\include" /I "..\..\..\lib\windows\zlib\include" /I "..\..\..\source\blender\verify" /I "..\..\..\source\blender\readstreamglue" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c @@ -128,30 +127,6 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo # ADD LIB32 /nologo -!ELSEIF "$(CFG)" == "BLO_verify - Win32 Profile" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "BLO_verify___Win32_Profile" -# PROP BASE Intermediate_Dir "BLO_verify___Win32_Profile" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "BLO_verify___Win32_Profile" -# PROP Intermediate_Dir "BLO_verify___Win32_Profile" -# PROP Target_Dir "" -LINK32=link.exe -lib -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\source\kernel\gen_messaging" /I "..\..\..\lib\windows\openssl\include" /I "..\..\..\lib\windows\zlib\include" /I "..\..\..\source\blender\verify" /I "..\..\..\source\blender\readstreamglue" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FR /YX /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /Zi /I "..\..\..\source\kernel\gen_messaging" /I "..\..\..\lib\windows\openssl\include" /I "..\..\..\lib\windows\zlib\include" /I "..\..\..\source\blender\verify" /I "..\..\..\source\blender\readstreamglue" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\verify\debug\BLO_verify.lib" -# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\verify\debug\BLO_verify.lib" - !ENDIF # Begin Target @@ -160,7 +135,6 @@ LIB32=link.exe -lib # Name "BLO_verify - Win32 Debug" # Name "BLO_verify - Win32 MT DLL Release" # Name "BLO_verify - Win32 MT DLL Debug" -# Name "BLO_verify - Win32 Profile" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" diff --git a/projectfiles/blender/BLO_writeblenfile/BLO_writeblenfile.dsp b/projectfiles/blender/BLO_writeblenfile/BLO_writeblenfile.dsp index 63cf90d0b80..6d0dfab0bef 100644 --- a/projectfiles/blender/BLO_writeblenfile/BLO_writeblenfile.dsp +++ b/projectfiles/blender/BLO_writeblenfile/BLO_writeblenfile.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Static Library" 0x0104 -CFG=BLO_writeblenfile - Win32 Profile +CFG=BLO_writeblenfile - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,7 +13,7 @@ CFG=BLO_writeblenfile - Win32 Profile !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 "BLO_writeblenfile.mak" CFG="BLO_writeblenfile - Win32 Profile" +!MESSAGE NMAKE /f "BLO_writeblenfile.mak" CFG="BLO_writeblenfile - Win32 Release" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -21,7 +21,6 @@ CFG=BLO_writeblenfile - Win32 Profile !MESSAGE "BLO_writeblenfile - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE "BLO_writeblenfile - Win32 MT_DLL Release" (based on "Win32 (x86) Static Library") !MESSAGE "BLO_writeblenfile - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library") -!MESSAGE "BLO_writeblenfile - Win32 Profile" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -64,8 +63,8 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\..\..\..\obj\windows\blender\writeblenfile\debug" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\writeblenfile\debug" +# PROP Output_Dir "..\..\..\obj\windows\blender\writeblenfile\debug" +# PROP Intermediate_Dir "..\..\..\obj\windows\blender\writeblenfile\debug" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c @@ -113,8 +112,8 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\..\..\..\obj\windows\blender\writeblenfile\mtdll_debug" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\writeblenfile\mtdll_debug" +# PROP Output_Dir "..\..\..\obj\windows\blender\writeblenfile\mtdll_debug" +# PROP Intermediate_Dir "..\..\..\obj\windows\blender\writeblenfile\mtdll_debug" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\source\blender\readblenfile" /I "..\..\..\source\kernel\gen_messaging" /I "..\..\..\source\blender\readstreamglue" /I "..\..\..\source\blender\writestreamglue" /I "..\..\..\source\blender\writeblenfile\\" /I "..\..\..\source\blender\deflate\\" /I "..\..\..\source\blender\inflate\\" /I "..\..\..\lib\windows\zlib\include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c @@ -128,30 +127,6 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo # ADD LIB32 /nologo -!ELSEIF "$(CFG)" == "BLO_writeblenfile - Win32 Profile" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "BLO_writeblenfile___Win32_Profile" -# PROP BASE Intermediate_Dir "BLO_writeblenfile___Win32_Profile" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "BLO_writeblenfile___Win32_Profile" -# PROP Intermediate_Dir "BLO_writeblenfile___Win32_Profile" -# PROP Target_Dir "" -LINK32=link.exe -lib -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\source\blender\readblenfile" /I "..\..\..\source\kernel\gen_messaging" /I "..\..\..\source\blender\readstreamglue" /I "..\..\..\source\blender\writestreamglue" /I "..\..\..\source\blender\writeblenfile\\" /I "..\..\..\source\blender\deflate\\" /I "..\..\..\source\blender\inflate\\" /I "..\..\..\lib\windows\zlib\include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FR /YX /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /Zi /I "..\..\..\source\blender\blenloader\\" /I "..\..\..\source\blender\readblenfile" /I "..\..\..\source\kernel\gen_messaging" /I "..\..\..\source\blender\readstreamglue" /I "..\..\..\source\blender\writestreamglue" /I "..\..\..\source\blender\writeblenfile\\" /I "..\..\..\source\blender\deflate\\" /I "..\..\..\source\blender\inflate\\" /I "..\..\..\lib\windows\zlib\include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD BASE RSC /l 0x413 /d "_DEBUG" -# ADD RSC /l 0x413 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - !ENDIF # Begin Target @@ -160,7 +135,6 @@ LIB32=link.exe -lib # Name "BLO_writeblenfile - Win32 Debug" # Name "BLO_writeblenfile - Win32 MT_DLL Release" # Name "BLO_writeblenfile - Win32 MT DLL Debug" -# Name "BLO_writeblenfile - Win32 Profile" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" diff --git a/projectfiles/blender/BLO_writestreamglue/BLO_writestreamglue.dsp b/projectfiles/blender/BLO_writestreamglue/BLO_writestreamglue.dsp index 29c7a920c4d..fb54ff37bd6 100644 --- a/projectfiles/blender/BLO_writestreamglue/BLO_writestreamglue.dsp +++ b/projectfiles/blender/BLO_writestreamglue/BLO_writestreamglue.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Static Library" 0x0104 -CFG=BLO_writestreamglue - Win32 Profile +CFG=BLO_writestreamglue - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,7 +13,7 @@ CFG=BLO_writestreamglue - Win32 Profile !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 "BLO_writestreamglue.mak" CFG="BLO_writestreamglue - Win32 Profile" +!MESSAGE NMAKE /f "BLO_writestreamglue.mak" CFG="BLO_writestreamglue - Win32 Release" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -21,7 +21,6 @@ CFG=BLO_writestreamglue - Win32 Profile !MESSAGE "BLO_writestreamglue - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE "BLO_writestreamglue - Win32 MT DLL Release" (based on "Win32 (x86) Static Library") !MESSAGE "BLO_writestreamglue - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library") -!MESSAGE "BLO_writestreamglue - Win32 Profile" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -64,8 +63,8 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\writestreamglue\debug" +# PROP Output_Dir "..\..\..\obj\windows\blender\writestreamglue\debug" +# PROP Intermediate_Dir "..\..\..\obj\windows\blender\writestreamglue\debug" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c @@ -78,7 +77,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\writestreamglue\debug\BLO_writestreamglue.lib" +# ADD LIB32 /nologo !ELSEIF "$(CFG)" == "BLO_writestreamglue - Win32 MT DLL Release" @@ -89,8 +88,8 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\..\..\..\obj\windows\blender\writestreamglue\mtdll" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\writestreamglue\mtdll" +# PROP Output_Dir "..\..\..\obj\windows\blender\writestreamglue\mtdll" +# PROP Intermediate_Dir "..\..\..\obj\windows\blender\writestreamglue\mtdll" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /GX /O2 /I "..\..\..\source\kernel\gen_messaging" /I "..\..\..\lib\windows\zlib\include" /I "..\..\..\source\blender\writestreamglue" /I "..\..\..\source\blender\readstreamglue" /I "..\..\..\source\blender\deflate" /I "..\..\..\source\blender\encrypt" /I "..\..\..\source\blender\sign" /I "..\..\..\source\blender\writeblenfile" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c @@ -113,8 +112,8 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\..\..\..\obj\windows\blender\writestreamglue\mtdll_debug" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\writestreamglue\mtdll_debug" +# PROP Output_Dir "..\..\..\obj\windows\blender\writestreamglue\mtdll_debug" +# PROP Intermediate_Dir "..\..\..\obj\windows\blender\writestreamglue\mtdll_debug" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\source\kernel\gen_messaging" /I "..\..\..\lib\windows\zlib\include" /I "..\..\..\source\blender\writestreamglue" /I "..\..\..\source\blender\readstreamglue" /I "..\..\..\source\blender\deflate" /I "..\..\..\source\blender\encrypt" /I "..\..\..\source\blender\sign" /I "..\..\..\source\blender\writeblenfile" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c @@ -128,30 +127,6 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo # ADD LIB32 /nologo -!ELSEIF "$(CFG)" == "BLO_writestreamglue - Win32 Profile" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "BLO_writestreamglue___Win32_Profile" -# PROP BASE Intermediate_Dir "BLO_writestreamglue___Win32_Profile" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "BLO_writestreamglue___Win32_Profile" -# PROP Intermediate_Dir "BLO_writestreamglue___Win32_Profile" -# PROP Target_Dir "" -LINK32=link.exe -lib -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\source\kernel\gen_messaging" /I "..\..\..\lib\windows\zlib\include" /I "..\..\..\source\blender\writestreamglue" /I "..\..\..\source\blender\readstreamglue" /I "..\..\..\source\blender\deflate" /I "..\..\..\source\blender\encrypt" /I "..\..\..\source\blender\sign" /I "..\..\..\source\blender\writeblenfile" /I "..\..\..\lib\windows\blenkey\include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FR /YX /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /Zi /I "..\..\..\source\kernel\gen_messaging" /I "..\..\..\lib\windows\zlib\include" /I "..\..\..\source\blender\writestreamglue" /I "..\..\..\source\blender\readstreamglue" /I "..\..\..\source\blender\deflate" /I "..\..\..\source\blender\encrypt" /I "..\..\..\source\blender\sign" /I "..\..\..\source\blender\writeblenfile" /I "..\..\..\lib\windows\blenkey\include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\writestreamglue\debug\BLO_writestreamglue.lib" -# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\writestreamglue\debug\BLO_writestreamglue.lib" - !ENDIF # Begin Target @@ -160,7 +135,6 @@ LIB32=link.exe -lib # Name "BLO_writestreamglue - Win32 Debug" # Name "BLO_writestreamglue - Win32 MT DLL Release" # Name "BLO_writestreamglue - Win32 MT DLL Debug" -# Name "BLO_writestreamglue - Win32 Profile" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" diff --git a/projectfiles/blender/BLO_writestreamglue_stub/BLO_writestreamglue_stub.dsp b/projectfiles/blender/BLO_writestreamglue_stub/BLO_writestreamglue_stub.dsp index 02c6d8b99d9..4e4dff71526 100644 --- a/projectfiles/blender/BLO_writestreamglue_stub/BLO_writestreamglue_stub.dsp +++ b/projectfiles/blender/BLO_writestreamglue_stub/BLO_writestreamglue_stub.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Static Library" 0x0104 -CFG=BLO_writestreamglue_stub - Win32 Profile +CFG=BLO_writestreamglue_stub - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,7 +13,7 @@ CFG=BLO_writestreamglue_stub - Win32 Profile !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 "BLO_writestreamglue_stub.mak" CFG="BLO_writestreamglue_stub - Win32 Profile" +!MESSAGE NMAKE /f "BLO_writestreamglue_stub.mak" CFG="BLO_writestreamglue_stub - Win32 Release" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -21,7 +21,6 @@ CFG=BLO_writestreamglue_stub - Win32 Profile !MESSAGE "BLO_writestreamglue_stub - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE "BLO_writestreamglue_stub - Win32 MT DLL Release" (based on "Win32 (x86) Static Library") !MESSAGE "BLO_writestreamglue_stub - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library") -!MESSAGE "BLO_writestreamglue_stub - Win32 Profile" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -64,8 +63,8 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" +# PROP Output_Dir "..\..\..\obj\windows\blender\writestreamglue_stub\debug" +# PROP Intermediate_Dir "..\..\..\obj\windows\blender\writestreamglue_stub\debug" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c @@ -77,7 +76,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo +# ADD LIB32 /nologo /out:"..\..\..\obj\windows\blender\debug\BLO_writestreamglue_stub.lib" !ELSEIF "$(CFG)" == "BLO_writestreamglue_stub - Win32 MT DLL Release" @@ -88,8 +87,8 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\..\..\..\obj\windows\blender\writestreamglue_stub\mtdll" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\writestreamglue_stub\mtdll" +# PROP Output_Dir "..\..\..\obj\windows\blender\writestreamglue_stub\mtdll" +# PROP Intermediate_Dir "..\..\..\obj\windows\blender\writestreamglue_stub\mtdll" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /GX /O2 /I "..\..\..\source\kernel\gen_messaging" /I "..\..\..\lib\windows\zlib\include" /I "..\..\..\source\blender\writestreamglue" /I "..\..\..\source\blender\readstreamglue" /I "..\..\..\source\blender\deflate" /I "..\..\..\source\blender\encrypt" /I "..\..\..\source\blender\sign" /I "..\..\..\source\blender\writeblenfile" /I "..\..\..\lib\windows\blenkey\include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c @@ -112,8 +111,8 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\..\..\..\obj\windows\blender\writestreamglue_stub\mtdll_debug" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\writestreamglue_stub\mtdll_debug" +# PROP Output_Dir "..\..\..\obj\windows\blender\writestreamglue_stub\mtdll_debug" +# PROP Intermediate_Dir "..\..\..\obj\windows\blender\writestreamglue_stub\mtdll_debug" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\source\kernel\gen_messaging" /I "..\..\..\lib\windows\zlib\include" /I "..\..\..\source\blender\writestreamglue" /I "..\..\..\source\blender\readstreamglue" /I "..\..\..\source\blender\deflate" /I "..\..\..\source\blender\encrypt" /I "..\..\..\source\blender\sign" /I "..\..\..\source\blender\writeblenfile" /I "..\..\..\lib\windows\blenkey\include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c @@ -127,30 +126,6 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo # ADD LIB32 /nologo -!ELSEIF "$(CFG)" == "BLO_writestreamglue_stub - Win32 Profile" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "BLO_writestreamglue_stub___Win32_Profile" -# PROP BASE Intermediate_Dir "BLO_writestreamglue_stub___Win32_Profile" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "BLO_writestreamglue_stub___Win32_Profile" -# PROP Intermediate_Dir "BLO_writestreamglue_stub___Win32_Profile" -# PROP Target_Dir "" -LINK32=link.exe -lib -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\source\kernel\gen_messaging" /I "..\..\..\lib\windows\zlib\include" /I "..\..\..\source\blender\writestreamglue" /I "..\..\..\source\blender\readstreamglue" /I "..\..\..\source\blender\deflate" /I "..\..\..\source\blender\encrypt" /I "..\..\..\source\blender\sign" /I "..\..\..\source\blender\writeblenfile" /I "..\..\..\lib\windows\blenkey\include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /Zi /I "..\..\..\source\kernel\gen_messaging" /I "..\..\..\lib\windows\zlib\include" /I "..\..\..\source\blender\writestreamglue" /I "..\..\..\source\blender\readstreamglue" /I "..\..\..\source\blender\deflate" /I "..\..\..\source\blender\encrypt" /I "..\..\..\source\blender\sign" /I "..\..\..\source\blender\writeblenfile" /I "..\..\..\lib\windows\blenkey\include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - !ENDIF # Begin Target @@ -159,7 +134,6 @@ LIB32=link.exe -lib # Name "BLO_writestreamglue_stub - Win32 Debug" # Name "BLO_writestreamglue_stub - Win32 MT DLL Release" # Name "BLO_writestreamglue_stub - Win32 MT DLL Debug" -# Name "BLO_writestreamglue_stub - Win32 Profile" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" diff --git a/projectfiles/blender/avi/BL_avi.dsp b/projectfiles/blender/avi/BL_avi.dsp index add241fa010..cfb65721958 100644 --- a/projectfiles/blender/avi/BL_avi.dsp +++ b/projectfiles/blender/avi/BL_avi.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Static Library" 0x0104 -CFG=BL_avi - Win32 Profile +CFG=BL_avi - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,7 +13,7 @@ CFG=BL_avi - Win32 Profile !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 "BL_avi.mak" CFG="BL_avi - Win32 Profile" +!MESSAGE NMAKE /f "BL_avi.mak" CFG="BL_avi - Win32 Release" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -21,7 +21,6 @@ CFG=BL_avi - Win32 Profile !MESSAGE "BL_avi - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE "BL_avi - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library") !MESSAGE "BL_avi - Win32 MT DLL Release" (based on "Win32 (x86) Static Library") -!MESSAGE "BL_avi - Win32 Profile" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -40,8 +39,8 @@ RSC=rc.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\avi" +# PROP Output_Dir "..\..\..\obj\windows\blender\avi" +# PROP Intermediate_Dir "..\..\..\obj\windows\blender\avi" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c @@ -53,7 +52,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\avi\BL_avi.lib" +# ADD LIB32 /nologo !ELSEIF "$(CFG)" == "BL_avi - Win32 Debug" @@ -64,8 +63,8 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\avi\debug" +# PROP Output_Dir "..\..\..\obj\windows\blender\avi\debug" +# PROP Intermediate_Dir "..\..\..\obj\windows\blender\avi\debug" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c @@ -78,7 +77,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\avi\debug\BL_avi.lib" +# ADD LIB32 /nologo !ELSEIF "$(CFG)" == "BL_avi - Win32 MT DLL Debug" @@ -89,8 +88,8 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\..\..\..\obj\windows\blender\avi\mtdll_debug" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\avi\mtdll_debug" +# PROP Output_Dir "..\..\..\obj\windows\blender\avi\mtdll_debug" +# PROP Intermediate_Dir "..\..\..\obj\windows\blender\avi\mtdll_debug" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /Gm /GX /ZI /Od /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\avi" /I "..\..\..\source\blender\include" /I "..\..\..\lib\windows\jpeg\include" /I "..\..\..\source\blender\makesdna" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "DWORDS_LITTLEENDIAN" /YX /J /FD /GZ /c @@ -113,8 +112,8 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\..\..\..\obj\windows\blender\avi\mtdll" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\avi\mtdll" +# PROP Output_Dir "..\..\..\obj\windows\blender\avi\mtdll" +# PROP Intermediate_Dir "..\..\..\obj\windows\blender\avi\mtdll" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /GX /O2 /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\avi" /I "..\..\..\source\blender\include" /I "..\..\..\lib\windows\jpeg\include" /I "..\..\..\source\blender\makesdna" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "DWORDS_LITTLEENDIAN" /YX /J /FD /c @@ -128,30 +127,6 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\blender\avi\BL_avi.lib" # ADD LIB32 /nologo -!ELSEIF "$(CFG)" == "BL_avi - Win32 Profile" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "BL_avi___Win32_Profile" -# PROP BASE Intermediate_Dir "BL_avi___Win32_Profile" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "BL_avi___Win32_Profile" -# PROP Intermediate_Dir "BL_avi___Win32_Profile" -# PROP Target_Dir "" -LINK32=link.exe -lib -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\avi" /I "..\..\..\source\blender\include" /I "..\..\..\lib\windows\jpeg\include" /I "..\..\..\source\blender\makesdna" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "DWORDS_LITTLEENDIAN" /YX /J /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /Zi /O2 /I "..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\avi" /I "..\..\..\source\blender\include" /I "..\..\..\lib\windows\jpeg\include" /I "..\..\..\source\blender\makesdna" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "DWORDS_LITTLEENDIAN" /YX /J /FD /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\avi\debug\BL_avi.lib" -# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\avi\profile\BL_avi.lib" - !ENDIF # Begin Target @@ -160,7 +135,6 @@ LIB32=link.exe -lib # Name "BL_avi - Win32 Debug" # Name "BL_avi - Win32 MT DLL Debug" # Name "BL_avi - Win32 MT DLL Release" -# Name "BL_avi - Win32 Profile" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" diff --git a/projectfiles/blender/blenkernel/BKE_blenkernel.dsp b/projectfiles/blender/blenkernel/BKE_blenkernel.dsp index 71b73c32a33..d0613a0b2d1 100644 --- a/projectfiles/blender/blenkernel/BKE_blenkernel.dsp +++ b/projectfiles/blender/blenkernel/BKE_blenkernel.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Static Library" 0x0104 -CFG=BKE_blenkernel - Win32 Profile +CFG=BKE_blenkernel - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,7 +13,7 @@ CFG=BKE_blenkernel - Win32 Profile !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 "BKE_blenkernel.mak" CFG="BKE_blenkernel - Win32 Profile" +!MESSAGE NMAKE /f "BKE_blenkernel.mak" CFG="BKE_blenkernel - Win32 Release" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -21,7 +21,6 @@ CFG=BKE_blenkernel - Win32 Profile !MESSAGE "BKE_blenkernel - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE "BKE_blenkernel - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library") !MESSAGE "BKE_blenkernel - Win32 MT DLL Release" (based on "Win32 (x86) Static Library") -!MESSAGE "BKE_blenkernel - Win32 Profile" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -40,8 +39,8 @@ RSC=rc.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\blenkernel" +# PROP Output_Dir "..\..\..\obj\windows\blender\blenkernel" +# PROP Intermediate_Dir "..\..\..\obj\windows\blender\blenkernel" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c @@ -53,7 +52,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\blenkernel\BKE_blenkernel.lib" +# ADD LIB32 /nologo !ELSEIF "$(CFG)" == "BKE_blenkernel - Win32 Debug" @@ -64,8 +63,8 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "debug" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\blenkernel\debug" +# PROP Output_Dir "..\..\..\obj\windows\blender\blenkernel\debug" +# PROP Intermediate_Dir "..\..\..\obj\windows\blender\blenkernel\debug" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c @@ -78,7 +77,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\blenkernel\debug\BKE_blenkernel.lib" +# ADD LIB32 /nologo !ELSEIF "$(CFG)" == "BKE_blenkernel - Win32 MT DLL Debug" @@ -89,8 +88,8 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\..\..\..\obj\windows\blender\blenkernel\mtdll_debug" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\blenkernel\mtdll_debug" +# PROP Output_Dir "..\..\..\obj\windows\blender\blenkernel\mtdll_debug" +# PROP Intermediate_Dir "..\..\..\obj\windows\blender\blenkernel\mtdll_debug" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /Gm /GX /ZI /Od /I "..\..\..\source\blender\render\extern\include" /I "..\..\..\source\blender\avi" /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\gameengine\soundsystem" /I "..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\source\blender\blenloader" /I "..\..\..\source\blender" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\bpython\include" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\gameengine\soundsystem\snd_blenderwavecache" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c @@ -115,8 +114,8 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\..\..\..\obj\windows\blender\blenkernel\mtdll" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\blenkernel\mtdll" +# PROP Output_Dir "..\..\..\obj\windows\blender\blenkernel\mtdll" +# PROP Intermediate_Dir "..\..\..\obj\windows\blender\blenkernel\mtdll" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /GX /O2 /I "..\..\..\source\blender\render\extern\include" /I "..\..\..\source\blender\avi" /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\gameengine\soundsystem" /I "..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\source\blender\blenloader" /I "..\..\..\source\blender" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\bpython\include" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\gameengine\soundsystem\snd_blenderwavecache" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c @@ -130,31 +129,6 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\blender\blenkernel\BKE_blenkernel.lib" # ADD LIB32 /nologo -!ELSEIF "$(CFG)" == "BKE_blenkernel - Win32 Profile" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "BKE_blenkernel___Win32_Profile" -# PROP BASE Intermediate_Dir "BKE_blenkernel___Win32_Profile" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "BKE_blenkernel___Win32_Profile" -# PROP Intermediate_Dir "BKE_blenkernel___Win32_Profile" -# PROP Target_Dir "" -LINK32=link.exe -lib -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\source\blender\render\extern\include" /I "..\..\..\source\blender\avi" /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\blender\blenloader" /I "..\..\..\source\blender" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\bpython\include" /I "..\..\..\source\blender\blenlib" /I "../../../source/gameengine\SoundSystem\\" /I "../../../lib/windows/iksolver/include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c -# SUBTRACT BASE CPP /WX -# ADD CPP /nologo /W3 /Gm /GX /Zi /O2 /I "..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\renderconverter" /I "..\..\..\source\blender\render\extern\include" /I "..\..\..\source\blender\avi" /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\blender\blenloader" /I "..\..\..\source\blender" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\bpython\include" /I "..\..\..\source\blender\blenlib" /I "../../../source/gameengine\SoundSystem\\" /I "../../../lib/windows/iksolver/include" /I "../../../lib/windows/bsp/include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\blenkernel\debug\BKE_blenkernel.lib" -# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\blenkernel\profile\BKE_blenkernel.lib" - !ENDIF # Begin Target @@ -163,7 +137,6 @@ LIB32=link.exe -lib # Name "BKE_blenkernel - Win32 Debug" # Name "BKE_blenkernel - Win32 MT DLL Debug" # Name "BKE_blenkernel - Win32 MT DLL Release" -# Name "BKE_blenkernel - Win32 Profile" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" diff --git a/projectfiles/blender/blenlib/BLI_blenlib.dsp b/projectfiles/blender/blenlib/BLI_blenlib.dsp index d4b16e5700b..ab4a91e6f04 100644 --- a/projectfiles/blender/blenlib/BLI_blenlib.dsp +++ b/projectfiles/blender/blenlib/BLI_blenlib.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Static Library" 0x0104 -CFG=BLI_blenlib - Win32 Profile +CFG=BLI_blenlib - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,7 +13,7 @@ CFG=BLI_blenlib - Win32 Profile !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 "BLI_blenlib.mak" CFG="BLI_blenlib - Win32 Profile" +!MESSAGE NMAKE /f "BLI_blenlib.mak" CFG="BLI_blenlib - Win32 Release" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -21,7 +21,6 @@ CFG=BLI_blenlib - Win32 Profile !MESSAGE "BLI_blenlib - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE "BLI_blenlib - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library") !MESSAGE "BLI_blenlib - Win32 MT DLL Release" (based on "Win32 (x86) Static Library") -!MESSAGE "BLI_blenlib - Win32 Profile" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -40,8 +39,8 @@ RSC=rc.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\blenlib" +# PROP Output_Dir "..\..\..\obj\windows\blender\blenlib" +# PROP Intermediate_Dir "..\..\..\obj\windows\blender\blenlib" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c @@ -53,7 +52,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\blenlib\BLI_blenlib.lib" +# ADD LIB32 /nologo !ELSEIF "$(CFG)" == "BLI_blenlib - Win32 Debug" @@ -64,8 +63,8 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\blenlib\debug" +# PROP Output_Dir "..\..\..\obj\windows\blender\blenlib\debug" +# PROP Intermediate_Dir "..\..\..\obj\windows\blender\blenlib\debug" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c @@ -78,7 +77,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\blenlib\debug\BLI_blenlib.lib" +# ADD LIB32 /nologo !ELSEIF "$(CFG)" == "BLI_blenlib - Win32 MT DLL Debug" @@ -89,8 +88,8 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\..\..\..\obj\windows\blender\blenlib\mtdll_debug" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\blenlib\mtdll_debug" +# PROP Output_Dir "..\..\..\obj\windows\blender\blenlib\mtdll_debug" +# PROP Intermediate_Dir "..\..\..\obj\windows\blender\blenlib\mtdll_debug" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /Gm /GX /ZI /Od /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\bpython\include" /I "..\..\..\source\blender\makesdna" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c @@ -113,8 +112,8 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\..\..\..\obj\windows\blender\blenlib\mtdll" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\blenlib\mtdll" +# PROP Output_Dir "..\..\..\obj\windows\blender\blenlib\mtdll" +# PROP Intermediate_Dir "..\..\..\obj\windows\blender\blenlib\mtdll" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /GX /O2 /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\bpython\include" /I "..\..\..\source\blender\makesdna" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c @@ -128,30 +127,6 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\blender\blenlib\BLI_blenlib.lib" # ADD LIB32 /nologo -!ELSEIF "$(CFG)" == "BLI_blenlib - Win32 Profile" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "BLI_blenlib___Win32_Profile" -# PROP BASE Intermediate_Dir "BLI_blenlib___Win32_Profile" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "BLI_blenlib___Win32_Profile" -# PROP Intermediate_Dir "BLI_blenlib___Win32_Profile" -# PROP Target_Dir "" -LINK32=link.exe -lib -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\bpython\include" /I "..\..\..\source\blender\makesdna" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /Zi /O2 /I "..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\bpython\include" /I "..\..\..\source\blender\makesdna" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\blenlib\debug\BLI_blenlib.lib" -# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\blenlib\profile\BLI_blenlib.lib" - !ENDIF # Begin Target @@ -160,7 +135,6 @@ LIB32=link.exe -lib # Name "BLI_blenlib - Win32 Debug" # Name "BLI_blenlib - Win32 MT DLL Debug" # Name "BLI_blenlib - Win32 MT DLL Release" -# Name "BLI_blenlib - Win32 Profile" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" diff --git a/projectfiles/blender/blenpluginapi/blenpluginapi/blenpluginapi.dsp b/projectfiles/blender/blenpluginapi/blenpluginapi/blenpluginapi.dsp index 37145fec967..3215e134e39 100644 --- a/projectfiles/blender/blenpluginapi/blenpluginapi/blenpluginapi.dsp +++ b/projectfiles/blender/blenpluginapi/blenpluginapi/blenpluginapi.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Static Library" 0x0104 -CFG=blenpluginapi - Win32 Profile +CFG=blenpluginapi - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,13 +13,12 @@ CFG=blenpluginapi - Win32 Profile !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 "blenpluginapi.mak" CFG="blenpluginapi - Win32 Profile" +!MESSAGE NMAKE /f "blenpluginapi.mak" CFG="blenpluginapi - Win32 Release" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "blenpluginapi - Win32 Release" (based on "Win32 (x86) Static Library") !MESSAGE "blenpluginapi - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE "blenpluginapi - Win32 Profile" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -38,8 +37,8 @@ RSC=rc.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "..\..\..\..\..\obj\windows\blender\blenpluginapi" +# PROP Output_Dir "..\..\..\..\obj\windows\blender\blenpluginapi" +# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\blenpluginapi" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c @@ -51,7 +50,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\..\..\obj\windows\blender\blenpluginapi.lib" +# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\blenpluginapi.lib" !ELSEIF "$(CFG)" == "blenpluginapi - Win32 Debug" @@ -62,8 +61,8 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "..\..\..\..\..\obj\windows\blender\blenpluginapi\debug" +# PROP Output_Dir "..\..\..\..\obj\windows\blender\blenpluginapi\debug" +# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\blenpluginapi\debug" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c @@ -76,32 +75,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\..\..\obj\windows\blender\debug\blenpluginapi.lib" - -!ELSEIF "$(CFG)" == "blenpluginapi - Win32 Profile" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "blenpluginapi___Win32_Profile" -# PROP BASE Intermediate_Dir "blenpluginapi___Win32_Profile" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "blenpluginapi___Win32_Profile" -# PROP Intermediate_Dir "blenpluginapi___Win32_Profile" -# PROP Target_Dir "" -LINK32=link.exe -lib -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\..\source\blender" /I "..\..\..\..\source\blender\blenpluginapi" /I "..\..\..\..\source\blender\blenlib" /I "..\..\..\..\source\blender\imbuf" /I "..\..\..\..\source\blender\makesdna" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# SUBTRACT BASE CPP /X -# ADD CPP /nologo /W3 /Gm /GX /Zi /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\..\source\blender" /I "..\..\..\..\source\blender\blenpluginapi" /I "..\..\..\..\source\blender\blenlib" /I "..\..\..\..\source\blender\imbuf" /I "..\..\..\..\source\blender\makesdna" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\debug\blenpluginapi.lib" -# ADD LIB32 /nologo /out:"..\..\..\..\..\obj\windows\blender\debug\blenpluginapi.lib" +# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\debug\blenpluginapi.lib" !ENDIF @@ -109,7 +83,6 @@ LIB32=link.exe -lib # Name "blenpluginapi - Win32 Release" # Name "blenpluginapi - Win32 Debug" -# Name "blenpluginapi - Win32 Profile" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" diff --git a/projectfiles/blender/bpython/intern/BPY_python/BPY_python.dsp b/projectfiles/blender/bpython/intern/BPY_python/BPY_python.dsp index 8bed8d0f783..74a03854707 100644 --- a/projectfiles/blender/bpython/intern/BPY_python/BPY_python.dsp +++ b/projectfiles/blender/bpython/intern/BPY_python/BPY_python.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Static Library" 0x0104 -CFG=BPY_python - Win32 Profile +CFG=BPY_python - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,13 +13,12 @@ CFG=BPY_python - Win32 Profile !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 "BPY_python.mak" CFG="BPY_python - Win32 Profile" +!MESSAGE NMAKE /f "BPY_python.mak" CFG="BPY_python - Win32 Release" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "BPY_python - Win32 Release" (based on "Win32 (x86) Static Library") !MESSAGE "BPY_python - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE "BPY_python - Win32 Profile" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -43,8 +42,7 @@ RSC=rc.exe # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\..\..\lib\windows\bmfont\include" /I "..\..\..\..\..\lib\windows\python\include\python2.0" /I "..\..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\renderconverter" /I "..\..\..\..\..\source\blender\render\extern\include" /I "..\..\..\..\..\source\blender\avi" /I "..\..\..\..\..\source\blender\blenloader" /I "..\..\..\..\..\source\blender" /I "..\..\..\..\..\source\blender\include" /I "..\..\..\..\..\source\blender\blenkernel" /I "..\..\..\..\..\source\blender\makesdna" /I "..\..\..\..\..\source\blender\blenlib" /I "..\..\..\..\..\source\blender\bpython\include" /I "..\..\..\..\..\source\blender\blenlib\intern" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /J /FD /c -# SUBTRACT CPP /X +# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\..\..\lib\windows\bmfont\include" /I "..\..\..\..\..\lib\windows\python\include\python2.2" /I "..\..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\renderconverter" /I "..\..\..\..\..\source\blender\render\extern\include" /I "..\..\..\..\..\source\blender\avi" /I "..\..\..\..\..\source\blender\blenloader" /I "..\..\..\..\..\source\blender" /I "..\..\..\..\..\source\blender\include" /I "..\..\..\..\..\source\blender\blenkernel" /I "..\..\..\..\..\source\blender\makesdna" /I "..\..\..\..\..\source\blender\blenlib" /I "..\..\..\..\..\source\blender\bpython\include" /I "..\..\..\..\..\source\blender\blenlib\intern" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /J /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -63,13 +61,12 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "..\..\..\..\..\..\obj\windows\blender\bpython\debug" +# PROP Output_Dir "..\..\..\..\..\obj\windows\blender\bpython\debug" +# PROP Intermediate_Dir "..\..\..\..\..\obj\windows\blender\bpython\debug" # PROP Target_Dir "" LINK32=link.exe -lib # 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 /Gm /GX /Zi /Od /I "..\..\..\..\..\lib\windows\python\include\python2.0" /I "..\..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\..\..\lib\windows\bmfont\include" /I "..\..\..\source\blender\renderconverter" /I "..\..\..\..\..\source\blender\render\extern\include" /I "..\..\..\..\..\source\blender\avi" /I "..\..\..\..\..\source\blender\blenloader" /I "..\..\..\..\..\source\blender" /I "..\..\..\..\..\source\blender\include" /I "..\..\..\..\..\source\blender\blenkernel" /I "..\..\..\..\..\source\blender\makesdna" /I "..\..\..\..\..\source\blender\blenlib" /I "..\..\..\..\..\source\blender\bpython\include" /I "..\..\..\..\..\source\blender\blenlib\intern" /D "WIN32" /D "_MBCS" /D "_LIB" /U "_DEBUG" /YX /J /FD /GZ /c -# SUBTRACT CPP /u +# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\lib\windows\python\include\python2.2" /I "..\..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\..\..\lib\windows\bmfont\include" /I "..\..\..\source\blender\renderconverter" /I "..\..\..\..\..\source\blender\render\extern\include" /I "..\..\..\..\..\source\blender\avi" /I "..\..\..\..\..\source\blender\blenloader" /I "..\..\..\..\..\source\blender" /I "..\..\..\..\..\source\blender\include" /I "..\..\..\..\..\source\blender\blenkernel" /I "..\..\..\..\..\source\blender\makesdna" /I "..\..\..\..\..\source\blender\blenlib" /I "..\..\..\..\..\source\blender\bpython\include" /I "..\..\..\..\..\source\blender\blenlib\intern" /D "WIN32" /D "_MBCS" /D "_LIB" /U "_DEBUG" /YX /J /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 BSC32=bscmake.exe @@ -77,32 +74,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\..\..\..\obj\windows\blender\bpython\debug\BPY_python.lib" - -!ELSEIF "$(CFG)" == "BPY_python - Win32 Profile" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "BPY_python___Win32_Profile" -# PROP BASE Intermediate_Dir "BPY_python___Win32_Profile" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "BPY_python___Win32_Profile" -# PROP Intermediate_Dir "BPY_python___Win32_Profile" -# PROP Target_Dir "" -LINK32=link.exe -lib -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\lib\windows\python\include\python1.5" /I "..\..\..\..\..\source\blender\render\extern\include" /I "..\..\..\..\..\source\blender\avi" /I "..\..\..\..\..\source\blender\blenloader" /I "..\..\..\..\..\source\blender" /I "..\..\..\..\..\source\blender\include" /I "..\..\..\..\..\source\blender\blenkernel" /I "..\..\..\..\..\source\blender\makesdna" /I "..\..\..\..\..\source\blender\blenlib" /I "..\..\..\..\..\source\blender\bpython\include" /I "..\..\..\..\..\source\blender\blenlib\intern" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c -# SUBTRACT BASE CPP /X -# ADD CPP /nologo /W3 /Gm /GX /Zi /O2 /I "..\..\..\..\..\lib\windows\python\include\python2.0" /I "..\..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\..\..\lib\windows\bmfont\include" /I "..\..\..\source\blender\renderconverter" /I "..\..\..\..\..\source\blender\render\extern\include" /I "..\..\..\..\..\source\blender\avi" /I "..\..\..\..\..\source\blender\blenloader" /I "..\..\..\..\..\source\blender" /I "..\..\..\..\..\source\blender\include" /I "..\..\..\..\..\source\blender\blenkernel" /I "..\..\..\..\..\source\blender\makesdna" /I "..\..\..\..\..\source\blender\blenlib" /I "..\..\..\..\..\source\blender\bpython\include" /I "..\..\..\..\..\source\blender\blenlib\intern" /D "WIN32" /D "_MBCS" /D "_LIB" /U "_DEBUG" /YX /J /FD /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\..\obj\windows\blender\bpython\debug\BPY_python.lib" -# ADD LIB32 /nologo /out:"..\..\..\..\..\..\obj\windows\blender\bpython\profile\BPY_python.lib" +# ADD LIB32 /nologo !ENDIF @@ -110,7 +82,6 @@ LIB32=link.exe -lib # Name "BPY_python - Win32 Release" # Name "BPY_python - Win32 Debug" -# Name "BPY_python - Win32 Profile" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" diff --git a/projectfiles/blender/imbuf/BL_imbuf.dsp b/projectfiles/blender/imbuf/BL_imbuf.dsp index 9469488a38f..17b16c4e3d2 100644 --- a/projectfiles/blender/imbuf/BL_imbuf.dsp +++ b/projectfiles/blender/imbuf/BL_imbuf.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Static Library" 0x0104 -CFG=BL_imbuf - Win32 Profile +CFG=BL_imbuf - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,7 +13,7 @@ CFG=BL_imbuf - Win32 Profile !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 "BL_imbuf.mak" CFG="BL_imbuf - Win32 Profile" +!MESSAGE NMAKE /f "BL_imbuf.mak" CFG="BL_imbuf - Win32 Release" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -21,7 +21,6 @@ CFG=BL_imbuf - Win32 Profile !MESSAGE "BL_imbuf - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE "BL_imbuf - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library") !MESSAGE "BL_imbuf - Win32 MT DLL Release" (based on "Win32 (x86) Static Library") -!MESSAGE "BL_imbuf - Win32 Profile" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -40,7 +39,7 @@ RSC=rc.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" +# PROP Output_Dir "..\..\..\..\obj\windows\blender\imbuf" # PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\imbuf" # PROP Target_Dir "" LINK32=link.exe -lib @@ -53,7 +52,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\imbuf\BL_imbuf.lib" +# ADD LIB32 /nologo /out:"..\..\..\obj\windows\blender\imbuf\BL_imbuf.lib" !ELSEIF "$(CFG)" == "BL_imbuf - Win32 Debug" @@ -64,8 +63,8 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\imbuf\debug" +# PROP Output_Dir "..\..\..\obj\windows\blender\imbuf\debug" +# PROP Intermediate_Dir "..\..\..\obj\windows\blender\imbuf\debug" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c @@ -77,7 +76,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\imbuf\debug\BL_imbuf.lib" +# ADD LIB32 /nologo !ELSEIF "$(CFG)" == "BL_imbuf - Win32 MT DLL Debug" @@ -88,8 +87,8 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\..\..\..\obj\windows\blender\imbuf\mtdll_debug" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\imbuf\mtdll_debug" +# PROP Output_Dir "..\..\..\obj\windows\blender\imbuf\mtdll_debug" +# PROP Intermediate_Dir "..\..\..\obj\windows\blender\imbuf\mtdll_debug" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /Gm /GX /ZI /Od /I "..\..\..\source\blender\avi" /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\include" /I "..\..\..\lib\windows\jpeg\include" /I "..\..\..\source\blender\makesdna" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c @@ -112,8 +111,8 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\..\..\..\obj\windows\blender\imbuf\mtdll" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\imbuf\mtdll" +# PROP Output_Dir "..\..\..\obj\windows\blender\imbuf\mtdll" +# PROP Intermediate_Dir "..\..\..\obj\windows\blender\imbuf\mtdll" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /GX /O2 /I "..\..\..\source\blender\avi" /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\include" /I "..\..\..\lib\windows\jpeg\include" /I "..\..\..\source\blender\makesdna" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c @@ -127,30 +126,6 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\blender\imbuf\BL_imbuf.lib" # ADD LIB32 /nologo -!ELSEIF "$(CFG)" == "BL_imbuf - Win32 Profile" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "BL_imbuf___Win32_Profile" -# PROP BASE Intermediate_Dir "BL_imbuf___Win32_Profile" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "BL_imbuf___Win32_Profile" -# PROP Intermediate_Dir "BL_imbuf___Win32_Profile" -# PROP Target_Dir "" -LINK32=link.exe -lib -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\source\blender\avi" /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\include" /I "..\..\..\lib\windows\jpeg\include" /I "..\..\..\source\blender\makesdna" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /Zi /O2 /I "..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\avi" /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\include" /I "..\..\..\lib\windows\jpeg\include" /I "..\..\..\lib\windows\png\include" /I "..\..\..\lib\windows\zlib\include" /I "..\..\..\source\blender\makesdna" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\imbuf\debug\BL_imbuf.lib" -# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\imbuf\profile\BL_imbuf.lib" - !ENDIF # Begin Target @@ -159,7 +134,6 @@ LIB32=link.exe -lib # Name "BL_imbuf - Win32 Debug" # Name "BL_imbuf - Win32 MT DLL Debug" # Name "BL_imbuf - Win32 MT DLL Release" -# Name "BL_imbuf - Win32 Profile" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" diff --git a/projectfiles/blender/img/BL_img.dsp b/projectfiles/blender/img/BL_img.dsp index 5c28983acee..0569df37cd9 100644 --- a/projectfiles/blender/img/BL_img.dsp +++ b/projectfiles/blender/img/BL_img.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Static Library" 0x0104 -CFG=BL_img - Win32 Profile +CFG=BL_IMG - 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,13 +13,12 @@ CFG=BL_img - Win32 Profile !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 "BL_img.mak" CFG="BL_img - Win32 Profile" +!MESSAGE NMAKE /f "BL_img.mak" CFG="BL_IMG - WIN32 DEBUG" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "BL_img - Win32 Release" (based on "Win32 (x86) Static Library") !MESSAGE "BL_img - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE "BL_img - Win32 Profile" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -78,37 +77,12 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo # ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\img\debug\BL_img.lib" -!ELSEIF "$(CFG)" == "BL_img - Win32 Profile" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "BL_img___Win32_Profile" -# PROP BASE Intermediate_Dir "BL_img___Win32_Profile" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "BL_img___Win32_Profile" -# PROP Intermediate_Dir "BL_img___Win32_Profile" -# PROP Target_Dir "" -LINK32=link.exe -lib -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /Zi /O2 /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\img\debug\BL_img.lib" -# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\img\profile\BL_img.lib" - !ENDIF # Begin Target # Name "BL_img - Win32 Release" # Name "BL_img - Win32 Debug" -# Name "BL_img - Win32 Profile" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" diff --git a/projectfiles/blender/loader/BLO_loader.dsp b/projectfiles/blender/loader/BLO_loader.dsp index 312d56bf876..56550042696 100644 --- a/projectfiles/blender/loader/BLO_loader.dsp +++ b/projectfiles/blender/loader/BLO_loader.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Static Library" 0x0104 -CFG=BLO_loader - Win32 Profile +CFG=BLO_loader - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,7 +13,7 @@ CFG=BLO_loader - Win32 Profile !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 "BLO_loader.mak" CFG="BLO_loader - Win32 Profile" +!MESSAGE NMAKE /f "BLO_loader.mak" CFG="BLO_loader - Win32 Release" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -21,7 +21,6 @@ CFG=BLO_loader - Win32 Profile !MESSAGE "BLO_loader - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE "BLO_loader - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library") !MESSAGE "BLO_loader - Win32 MT DLL Release" (based on "Win32 (x86) Static Library") -!MESSAGE "BLO_loader - Win32 Profile" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -64,8 +63,8 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\loader\debug" +# PROP Output_Dir "..\..\..\obj\windows\blender\loader\debug" +# PROP Intermediate_Dir "..\..\..\obj\windows\blender\loader\debug" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c @@ -78,7 +77,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\loader\debug\BLO_loader.lib" +# ADD LIB32 /nologo !ELSEIF "$(CFG)" == "BLO_loader - Win32 MT DLL Debug" @@ -89,8 +88,8 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\..\..\..\obj\windows\blender\loader\mtdll_debug" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\loader\mtdll_debug" +# PROP Output_Dir "..\..\..\obj\windows\blender\loader\mtdll_debug" +# PROP Intermediate_Dir "..\..\..\obj\windows\blender\loader\mtdll_debug" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /Gm /GX /ZI /Od /I "..\..\..\source\blender\render\extern\include" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\bpython\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c @@ -113,8 +112,8 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\..\..\..\obj\windows\blender\loader\mtdll" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\loader\mtdll" +# PROP Output_Dir "..\..\..\obj\windows\blender\loader\mtdll" +# PROP Intermediate_Dir "..\..\..\obj\windows\blender\loader\mtdll" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /GX /O2 /I "..\..\..\source\blender\render\extern\include" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\bpython\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c @@ -128,30 +127,6 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\blender\loader\BLO_loader.lib" # ADD LIB32 /nologo -!ELSEIF "$(CFG)" == "BLO_loader - Win32 Profile" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "BLO_loader___Win32_Profile" -# PROP BASE Intermediate_Dir "BLO_loader___Win32_Profile" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "BLO_loader___Win32_Profile" -# PROP Intermediate_Dir "BLO_loader___Win32_Profile" -# PROP Target_Dir "" -LINK32=link.exe -lib -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\blenloader" /I "..\..\..\source\blender\render\extern\include" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\bpython\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /Zi /O2 /I "..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender\blenloader" /I "..\..\..\source\blender\streamglue\\" /I "..\..\..\source\blender\readblenfile\\" /I "..\..\..\source\blender\writeblenfile\\" /I "..\..\..\source\blender\deflate\\" /I "..\..\..\source\blender\inflate\\" /I "..\..\..\lib\windows\zlib\include" /I "..\..\..\source\blender\readblenfile" /I "..\..\..\source\kernel\gen_messaging" /I "..\..\..\source\blender\readstreamglue" /I "..\..\..\source\blender\writestreamglue" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\render\extern\include" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\bpython\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\loader\debug\BLO_loader.lib" -# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\loader\profile\BLO_loader.lib" - !ENDIF # Begin Target @@ -160,7 +135,6 @@ LIB32=link.exe -lib # Name "BLO_loader - Win32 Debug" # Name "BLO_loader - Win32 MT DLL Debug" # Name "BLO_loader - Win32 MT DLL Release" -# Name "BLO_loader - Win32 Profile" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" diff --git a/projectfiles/blender/makesdna/DNA_makesdna.dsp b/projectfiles/blender/makesdna/DNA_makesdna.dsp index cc95f44b567..864e8fac3ea 100644 --- a/projectfiles/blender/makesdna/DNA_makesdna.dsp +++ b/projectfiles/blender/makesdna/DNA_makesdna.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103 -CFG=DNA_makesdna - Win32 Profile +CFG=DNA_makesdna - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,7 +13,7 @@ CFG=DNA_makesdna - Win32 Profile !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 "DNA_makesdna.mak" CFG="DNA_makesdna - Win32 Profile" +!MESSAGE NMAKE /f "DNA_makesdna.mak" CFG="DNA_makesdna - Win32 Release" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -21,7 +21,6 @@ CFG=DNA_makesdna - Win32 Profile !MESSAGE "DNA_makesdna - Win32 Debug" (based on "Win32 (x86) Console Application") !MESSAGE "DNA_makesdna - Win32 MT DLL Release" (based on "Win32 (x86) Console Application") !MESSAGE "DNA_makesdna - Win32 MT DLL Debug" (based on "Win32 (x86) Console Application") -!MESSAGE "DNA_makesdna - Win32 Profile" (based on "Win32 (x86) Console Application") !MESSAGE # Begin Project @@ -41,7 +40,7 @@ RSC=rc.exe # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\source\blender\makesdna\intern" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\makesdna" +# PROP Intermediate_Dir "..\..\..\obj\windows\blender\makesdna" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c @@ -53,7 +52,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo /o"DNA_makesdna.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 /nologo /subsystem:console /machine:I386 -# ADD LINK32 libguardedalloc.a BLI_blenlib.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 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 /pdb:"DNA_makesdna.pdb" /machine:I386 /nodefaultlib:"libc.lib" /libpath:"..\..\..\lib\windows\guardedalloc\lib" /libpath:"..\..\..\..\obj\windows\blender\blenlib" +# ADD LINK32 libguardedalloc.a BLI_blenlib.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 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 /pdb:"DNA_makesdna.pdb" /machine:I386 /nodefaultlib:"libc.lib" /libpath:"..\..\..\lib\windows\guardedalloc\lib" /libpath:"..\..\..\obj\windows\blender\blenlib" # SUBTRACT LINK32 /pdb:none # Begin Special Build Tool SOURCE="$(InputPath)" @@ -71,7 +70,7 @@ PostBuild_Cmds=CD ..\..\..\source\blender\makesdna\intern\ DNA_makesdna.exe dna. # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\source\blender\makesdna\intern" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\makesdna\debug" +# PROP Intermediate_Dir "..\..\..\obj\windows\blender\makesdna\debug" # 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" /YX /FD /GZ /c @@ -84,7 +83,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo /o"DNA_makesdna.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 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 libguardedalloc.a BLI_blenlib.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 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 /pdb:"DNA_makesdna.pdb" /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept /libpath:"..\..\..\lib\windows\guardedalloc\lib" /libpath:"..\..\..\..\obj\windows\blender\blenlib\debug" +# ADD LINK32 libguardedalloc.a BLI_blenlib.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 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 /pdb:"DNA_makesdna.pdb" /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept /libpath:"..\..\..\lib\windows\guardedalloc\lib" /libpath:"..\..\..\obj\windows\blender\blenlib\debug" # SUBTRACT LINK32 /pdb:none # Begin Special Build Tool SOURCE="$(InputPath)" @@ -154,38 +153,6 @@ SOURCE="$(InputPath)" PostBuild_Cmds=CD ..\..\..\source\blender\makesdna\intern\ DNA_makesdna.exe dna.c # End Special Build Tool -!ELSEIF "$(CFG)" == "DNA_makesdna - Win32 Profile" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "DNA_makesdna___Win32_Profile0" -# PROP BASE Intermediate_Dir "DNA_makesdna___Win32_Profile0" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "DNA_makesdna___Win32_Profile0" -# PROP Intermediate_Dir "DNA_makesdna___Win32_Profile0" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /J /FD /GZ /c -# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /J /FD /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo /o"DNA_makesdna.bsc" -# ADD BSC32 /nologo /o"DNA_makesdna.bsc" -LINK32=link.exe -# ADD BASE LINK32 BLI_blenlib.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 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 /pdb:"DNA_makesdna.pdb" /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\obj\windows\blender\blenlib\debug" -# SUBTRACT BASE LINK32 /pdb:none -# ADD LINK32 libguardedalloc.a BLI_blenlib.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 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 /pdb:"DNA_makesdna.pdb" /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\lib\windows\guardedalloc\lib" /libpath:"..\..\..\..\obj\windows\blender\blenlib\debug" -# SUBTRACT LINK32 /pdb:none -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Desc=Building DNA -PostBuild_Cmds=CD ..\..\..\source\blender\makesdna\intern\ DNA_makesdna.exe dna.c -# End Special Build Tool - !ENDIF # Begin Target @@ -194,7 +161,6 @@ PostBuild_Cmds=CD ..\..\..\source\blender\makesdna\intern\ DNA_makesdna.exe dna. # Name "DNA_makesdna - Win32 Debug" # Name "DNA_makesdna - Win32 MT DLL Release" # Name "DNA_makesdna - Win32 MT DLL Debug" -# Name "DNA_makesdna - Win32 Profile" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" diff --git a/projectfiles/blender/misc/BL_misc.dsp b/projectfiles/blender/misc/BL_misc.dsp index 42ec7b34f83..f7aa85a99e3 100644 --- a/projectfiles/blender/misc/BL_misc.dsp +++ b/projectfiles/blender/misc/BL_misc.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Static Library" 0x0104 -CFG=BL_misc - Win32 Profile +CFG=BL_MISC - 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,13 +13,12 @@ CFG=BL_misc - Win32 Profile !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 "BL_misc.mak" CFG="BL_misc - Win32 Profile" +!MESSAGE NMAKE /f "BL_misc.mak" CFG="BL_MISC - WIN32 DEBUG" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "BL_misc - Win32 Release" (based on "Win32 (x86) Static Library") !MESSAGE "BL_misc - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE "BL_misc - Win32 Profile" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -38,8 +37,8 @@ RSC=rc.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\misc" +# PROP Output_Dir "..\..\..\obj\windows\blender\misc" +# PROP Intermediate_Dir "..\..\..\obj\windows\blender\misc" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c @@ -51,7 +50,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\misc\BL_misc.lib" +# ADD LIB32 /nologo !ELSEIF "$(CFG)" == "BL_misc - Win32 Debug" @@ -62,8 +61,8 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\misc\debug" +# PROP Output_Dir "..\..\..\obj\windows\blender\misc\debug" +# PROP Intermediate_Dir "..\..\..\obj\windows\blender\misc\debug" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c @@ -76,31 +75,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\misc\debug\BL_misc.lib" - -!ELSEIF "$(CFG)" == "BL_misc - Win32 Profile" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "BL_misc___Win32_Profile" -# PROP BASE Intermediate_Dir "BL_misc___Win32_Profile" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "BL_misc___Win32_Profile" -# PROP Intermediate_Dir "BL_misc___Win32_Profile" -# PROP Target_Dir "" -LINK32=link.exe -lib -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\render\intern\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /Zi /O2 /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\render\intern\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\misc\debug\BL_misc.lib" -# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\misc\profile\BL_misc.lib" +# ADD LIB32 /nologo !ENDIF @@ -108,7 +83,6 @@ LIB32=link.exe -lib # Name "BL_misc - Win32 Release" # Name "BL_misc - Win32 Debug" -# Name "BL_misc - Win32 Profile" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" diff --git a/projectfiles/blender/radiosity/BRA_radiosity.dsp b/projectfiles/blender/radiosity/BRA_radiosity.dsp index f529e812fd9..39391307507 100644 --- a/projectfiles/blender/radiosity/BRA_radiosity.dsp +++ b/projectfiles/blender/radiosity/BRA_radiosity.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Static Library" 0x0104 -CFG=BRA_radiosity - Win32 Profile +CFG=BRA_radiosity - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,13 +13,12 @@ CFG=BRA_radiosity - Win32 Profile !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 "BRA_radiosity.mak" CFG="BRA_radiosity - Win32 Profile" +!MESSAGE NMAKE /f "BRA_radiosity.mak" CFG="BRA_radiosity - Win32 Release" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "BRA_radiosity - Win32 Release" (based on "Win32 (x86) Static Library") !MESSAGE "BRA_radiosity - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE "BRA_radiosity - Win32 Profile" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -38,8 +37,8 @@ RSC=rc.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\radiosity" +# PROP Output_Dir "..\..\..\obj\windows\blender\radiosity" +# PROP Intermediate_Dir "..\..\..\obj\windows\blender\radiosity" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c @@ -51,7 +50,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\radiosity\BRA_radiosity.lib" +# ADD LIB32 /nologo !ELSEIF "$(CFG)" == "BRA_radiosity - Win32 Debug" @@ -62,8 +61,8 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\radiosity\debug" +# PROP Output_Dir "..\..\..\obj\windows\blender\radiosity\debug" +# PROP Intermediate_Dir "..\..\..\obj\windows\blender\radiosity\debug" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c @@ -76,31 +75,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\radiosity\debug\BRA_radiosity.lib" - -!ELSEIF "$(CFG)" == "BRA_radiosity - Win32 Profile" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "BRA_radiosity___Win32_Profile" -# PROP BASE Intermediate_Dir "BRA_radiosity___Win32_Profile" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "BRA_radiosity___Win32_Profile" -# PROP Intermediate_Dir "BRA_radiosity___Win32_Profile" -# PROP Target_Dir "" -LINK32=link.exe -lib -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\render\extern\include" /I "..\..\..\source\blender\radiosity\extern\include" /I "..\..\..\source\blender" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender\misc" /I "..\..\..\source\blender\makesdna" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /Zi /O2 /I "..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\render\extern\include" /I "..\..\..\source\blender\radiosity\extern\include" /I "..\..\..\source\blender" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender\misc" /I "..\..\..\source\blender\makesdna" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\radiosity\debug\BRA_radiosity.lib" -# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\radiosity\profile\BRA_radiosity.lib" +# ADD LIB32 /nologo !ENDIF @@ -108,7 +83,6 @@ LIB32=link.exe -lib # Name "BRA_radiosity - Win32 Release" # Name "BRA_radiosity - Win32 Debug" -# Name "BRA_radiosity - Win32 Profile" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" diff --git a/projectfiles/blender/render/BRE_render.dsp b/projectfiles/blender/render/BRE_render.dsp index 5a58246d4b6..c094d8e4780 100644 --- a/projectfiles/blender/render/BRE_render.dsp +++ b/projectfiles/blender/render/BRE_render.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Static Library" 0x0104 -CFG=BRE_render - Win32 Profile +CFG=BRE_render - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,13 +13,12 @@ CFG=BRE_render - Win32 Profile !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 "BRE_render.mak" CFG="BRE_render - Win32 Profile" +!MESSAGE NMAKE /f "BRE_render.mak" CFG="BRE_render - Win32 Release" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "BRE_render - Win32 Release" (based on "Win32 (x86) Static Library") !MESSAGE "BRE_render - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE "BRE_render - Win32 Profile" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -38,8 +37,8 @@ RSC=rc.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\render" +# PROP Output_Dir "..\..\..\obj\windows\blender\render" +# PROP Intermediate_Dir "..\..\..\obj\windows\blender\render" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c @@ -62,8 +61,8 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\render\debug" +# PROP Output_Dir "..\..\..\obj\windows\blender\render\debug" +# PROP Intermediate_Dir "..\..\..\obj\windows\blender\render\debug" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c @@ -78,37 +77,12 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo # ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\render\debug\BRE_render.lib" -!ELSEIF "$(CFG)" == "BRE_render - Win32 Profile" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "BRE_render___Win32_Profile" -# PROP BASE Intermediate_Dir "BRE_render___Win32_Profile" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "BRE_render___Win32_Profile" -# PROP Intermediate_Dir "BRE_render___Win32_Profile" -# PROP Target_Dir "" -LINK32=link.exe -lib -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\blender\blenloader" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender\misc" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\radiosity\extern\include" /I "..\..\..\source\blender\render\intern\include" /I "..\..\..\source\blender\render\extern\include" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\bpython\include" /I "..\..\..\source\blender" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /Zi /O2 /I "..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\kernel\gen_messaging" /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\blender\blenloader" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender\misc" /I "..\..\..\source\kernel" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\radiosity\extern\include" /I "..\..\..\source\blender\render\intern\include" /I "..\..\..\source\blender\render\extern\include" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\bpython\include" /I "..\..\..\source\blender" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\render\debug\BRE_render.lib" -# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\render\profile\BRE_render.lib" - !ENDIF # Begin Target # Name "BRE_render - Win32 Release" # Name "BRE_render - Win32 Debug" -# Name "BRE_render - Win32 Profile" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" diff --git a/projectfiles/blender/renderconverter/BRE_renderconverter.dsp b/projectfiles/blender/renderconverter/BRE_renderconverter.dsp index 627ffb7631c..311a9a8ae85 100644 --- a/projectfiles/blender/renderconverter/BRE_renderconverter.dsp +++ b/projectfiles/blender/renderconverter/BRE_renderconverter.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Static Library" 0x0104 -CFG=BRE_renderconverter - Win32 Profile +CFG=BRE_renderconverter - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,13 +13,12 @@ CFG=BRE_renderconverter - Win32 Profile !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 "BRE_renderconverter.mak" CFG="BRE_renderconverter - Win32 Profile" +!MESSAGE NMAKE /f "BRE_renderconverter.mak" CFG="BRE_renderconverter - Win32 Release" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "BRE_renderconverter - Win32 Release" (based on "Win32 (x86) Static Library") !MESSAGE "BRE_renderconverter - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE "BRE_renderconverter - Win32 Profile" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -38,8 +37,8 @@ RSC=rc.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\renderconverter" +# PROP Output_Dir "..\..\..\obj\windows\blender\renderconverter" +# PROP Intermediate_Dir "..\..\..\obj\windows\blender\renderconverter" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c @@ -62,8 +61,8 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\render\debug" +# PROP Output_Dir "..\..\..\obj\windows\blender\render\debug" +# PROP Intermediate_Dir "..\..\..\obj\windows\blender\render\debug" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c @@ -77,37 +76,12 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo # ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\renderconverter\debug\BRE_renderconverter.lib" -!ELSEIF "$(CFG)" == "BRE_renderconverter - Win32 Profile" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "BRE_renderconverter___Win32_Profile" -# PROP BASE Intermediate_Dir "BRE_renderconverter___Win32_Profile" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "BRE_renderconverter___Win32_Profile" -# PROP Intermediate_Dir "BRE_renderconverter___Win32_Profile" -# PROP Target_Dir "" -LINK32=link.exe -lib -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\bpython\include" /I "..\..\..\source\blender\misc" /I "..\..\..\source\blender\renderconverter" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\render\extern\include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /Zi /I "..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\bpython\include" /I "..\..\..\source\blender\misc" /I "..\..\..\source\blender\renderconverter" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\render\extern\include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c -# ADD BASE RSC /l 0x413 /d "_DEBUG" -# ADD RSC /l 0x413 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\renderconverter\debug\BRE_renderconverter.lib" -# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\renderconverter\debug\BRE_renderconverter.lib" - !ENDIF # Begin Target # Name "BRE_renderconverter - Win32 Release" # Name "BRE_renderconverter - Win32 Debug" -# Name "BRE_renderconverter - Win32 Profile" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" diff --git a/projectfiles/blender/renderui/BRE_renderui.dsp b/projectfiles/blender/renderui/BRE_renderui.dsp index 19d6d024727..ec37f3498fe 100644 --- a/projectfiles/blender/renderui/BRE_renderui.dsp +++ b/projectfiles/blender/renderui/BRE_renderui.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Static Library" 0x0104 -CFG=BRE_renderui - Win32 Profile +CFG=BRE_renderui - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,13 +13,12 @@ CFG=BRE_renderui - Win32 Profile !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 "BRE_renderui.mak" CFG="BRE_renderui - Win32 Profile" +!MESSAGE NMAKE /f "BRE_renderui.mak" CFG="BRE_renderui - Win32 Release" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "BRE_renderui - Win32 Release" (based on "Win32 (x86) Static Library") !MESSAGE "BRE_renderui - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE "BRE_renderui - Win32 Profile" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -38,8 +37,8 @@ RSC=rc.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\renderui" +# PROP Output_Dir "..\..\..\obj\windows\blender\renderui" +# PROP Intermediate_Dir "..\..\..\obj\windows\blender\renderui" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c @@ -62,8 +61,8 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\renderui" +# PROP Output_Dir "..\..\..\obj\windows\blender\renderui" +# PROP Intermediate_Dir "..\..\..\obj\windows\blender\renderui" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c @@ -77,37 +76,12 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo # ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\renderui\debug\BRE_renderui.lib" -!ELSEIF "$(CFG)" == "BRE_renderui - Win32 Profile" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "BRE_renderui___Win32_Profile" -# PROP BASE Intermediate_Dir "BRE_renderui___Win32_Profile" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "BRE_renderui___Win32_Profile" -# PROP Intermediate_Dir "BRE_renderui___Win32_Profile" -# PROP Target_Dir "" -LINK32=link.exe -lib -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\renderui" /I "..\..\..\source\blender" /I "..\..\..\source\blender\bpython\include" /I "..\..\..\source\blender\misc" /I "..\..\..\source\blender\renderconverter" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\render\extern\include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /Zi /I "..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\renderui" /I "..\..\..\source\blender" /I "..\..\..\source\blender\bpython\include" /I "..\..\..\source\blender\misc" /I "..\..\..\source\blender\renderconverter" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\render\extern\include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c -# ADD BASE RSC /l 0x413 /d "_DEBUG" -# ADD RSC /l 0x413 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\renderui\debug\BRE_renderui.lib" -# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\renderui\debug\BRE_renderui.lib" - !ENDIF # Begin Target # Name "BRE_renderui - Win32 Release" # Name "BRE_renderui - Win32 Debug" -# Name "BRE_renderui - Win32 Profile" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" diff --git a/projectfiles/blender/src/BL_src.dsp b/projectfiles/blender/src/BL_src.dsp index b41ed50162f..46746a9241d 100644 --- a/projectfiles/blender/src/BL_src.dsp +++ b/projectfiles/blender/src/BL_src.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Static Library" 0x0104 -CFG=BL_src - Win32 Profile +CFG=BL_SRC - 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,13 +13,12 @@ CFG=BL_src - Win32 Profile !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 "BL_src.mak" CFG="BL_src - Win32 Profile" +!MESSAGE NMAKE /f "BL_src.mak" CFG="BL_SRC - WIN32 DEBUG" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "BL_src - Win32 Release" (based on "Win32 (x86) Static Library") !MESSAGE "BL_src - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE "BL_src - Win32 Profile" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -38,8 +37,8 @@ RSC=rc.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\src" +# PROP Output_Dir "..\..\..\obj\windows\blender\src" +# PROP Intermediate_Dir "..\..\..\obj\windows\blender\src" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c @@ -51,7 +50,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\src\BL_src.lib" +# ADD LIB32 /nologo !ELSEIF "$(CFG)" == "BL_src - Win32 Debug" @@ -62,8 +61,8 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\src\debug" +# PROP Output_Dir "..\..\..\obj\windows\blender\src\debug" +# PROP Intermediate_Dir "..\..\..\obj\windows\blender\src\debug" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c @@ -76,32 +75,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\src\debug\BL_src.lib" - -!ELSEIF "$(CFG)" == "BL_src - Win32 Profile" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "BL_src___Win32_Profile" -# PROP BASE Intermediate_Dir "BL_src___Win32_Profile" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "BL_src___Win32_Profile" -# PROP Intermediate_Dir "BL_src___Win32_Profile" -# PROP Target_Dir "" -LINK32=link.exe -lib -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\source\gameengine\soundsystem" /I "..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\blender\blenloader" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\misc" /I "..\..\..\source\blender\bpython\include" /I "..\..\..\source\blender\radiosity\extern\include" /I "..\..\..\source\blender\render\extern\include" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\gameengine\network" /I "..\..\..\lib\windows\decimation\include" /I "..\..\..\source\blender\blenpluginapi\\" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "_CONSOLE" /D "NAN_GAME" /D "GAME" /J /FD /GZ /c -# SUBTRACT BASE CPP /Fr /YX -# ADD CPP /nologo /W3 /Gm /GX /Zi /O2 /I "..\..\..\source\gameengine\soundsystem" /I "..\..\..\lib\windows\python\include\python2.0" /I "..\..\..\lib\windows\bmfont\include" /I "..\..\..\source\blender\renderui" /I "..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\renderconverter" /I "..\..\..\source\blender\verify" /I "..\..\..\source\blender\readstreamglue" /I "..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\blender\blenloader" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\misc" /I "..\..\..\source\blender\bpython\include" /I "..\..\..\source\blender\radiosity\extern\include" /I "..\..\..\source\blender\render\extern\include" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\gameengine\network" /I "..\..\..\lib\windows\decimation\include" /I "..\..\..\source\blender\blenpluginapi\\" /I "..\..\..\lib\windows\blenkey\include" /I "..\..\..\lib\windows\ghost\include" /D "WIN32" /D "_MBCS" /D "_LIB" /D "_CONSOLE" /D "NAN_GAME" /D "GAME" /U "_DEBUG" /J /FD /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\src\debug\BL_src.lib" -# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\src\profile\BL_src.lib" +# ADD LIB32 /nologo !ENDIF @@ -109,7 +83,6 @@ LIB32=link.exe -lib # Name "BL_src - Win32 Release" # Name "BL_src - Win32 Debug" -# Name "BL_src - Win32 Profile" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" diff --git a/projectfiles/blender/src/BL_src_cre.dsp b/projectfiles/blender/src/BL_src_cre.dsp index f5296032a26..7ba9d1f8b31 100644 --- a/projectfiles/blender/src/BL_src_cre.dsp +++ b/projectfiles/blender/src/BL_src_cre.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Static Library" 0x0104 -CFG=BL_src_cre - Win32 Profile +CFG=BL_src_cre - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,13 +13,12 @@ CFG=BL_src_cre - Win32 Profile !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 "BL_src_cre.mak" CFG="BL_src_cre - Win32 Profile" +!MESSAGE NMAKE /f "BL_src_cre.mak" CFG="BL_src_cre - Win32 Release" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "BL_src_cre - Win32 Release" (based on "Win32 (x86) Static Library") !MESSAGE "BL_src_cre - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE "BL_src_cre - Win32 Profile" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -38,8 +37,8 @@ RSC=rc.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\src_cre" +# PROP Output_Dir "..\..\..\obj\windows\blender\src_cre" +# PROP Intermediate_Dir "..\..\..\obj\windows\blender\src_cre" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c @@ -51,7 +50,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\src\BL_src_cre.lib" +# ADD LIB32 /nologo /out:"..\..\..\obj\windows\blender\src\BL_src_cre.lib" !ELSEIF "$(CFG)" == "BL_src_cre - Win32 Debug" @@ -62,12 +61,12 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\src_cre\debug" +# PROP Output_Dir "..\..\..\obj\windows\blender\src_cre\debug" +# PROP Intermediate_Dir "..\..\..\obj\windows\blender\src_cre\debug" # PROP Target_Dir "" LINK32=link.exe -lib # 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 /Gm /GX /Zi /Od /I "..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\renderui" /I "..\..\..\source\gameengine\soundsystem\\" /I "..\..\..\lib\windows\python\include\python2.0\\" /I "..\..\..\source\blender\renderconverter" /I "..\..\..\source\blender\verify" /I "..\..\..\source\blender\readstreamglue" /I "..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\blender\blenloader" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\misc" /I "..\..\..\source\blender\bpython\include" /I "..\..\..\source\blender\radiosity\extern\include" /I "..\..\..\source\blender\render\extern\include" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\gameengine\network" /I "..\..\..\lib\windows\decimation\include" /I "..\..\..\source\blender\blenpluginapi\\" /I "..\..\..\lib\windows\blenkey\include" /D "WIN32" /D "_MBCS" /D "_LIB" /D "_CONSOLE" /D "NAN_GAME" /D "GAME" /U "_DEBUG" /J /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\renderui" /I "..\..\..\source\gameengine\soundsystem\\" /I "..\..\..\lib\windows\python\include\python2.2\\" /I "..\..\..\source\blender\renderconverter" /I "..\..\..\source\blender\verify" /I "..\..\..\source\blender\readstreamglue" /I "..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\blender\blenloader" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\misc" /I "..\..\..\source\blender\bpython\include" /I "..\..\..\source\blender\radiosity\extern\include" /I "..\..\..\source\blender\render\extern\include" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\gameengine\network" /I "..\..\..\lib\windows\decimation\include" /I "..\..\..\source\blender\blenpluginapi\\" /I "..\..\..\lib\windows\blenkey\include" /D "WIN32" /D "_MBCS" /D "_LIB" /D "_CONSOLE" /D "NAN_GAME" /D "GAME" /U "_DEBUG" /J /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe @@ -75,32 +74,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\src\debug\BL_src_cre.lib" - -!ELSEIF "$(CFG)" == "BL_src_cre - Win32 Profile" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "BL_src_cre___Win32_Profile" -# PROP BASE Intermediate_Dir "BL_src_cre___Win32_Profile" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "BL_src_cre___Win32_Profile" -# PROP Intermediate_Dir "BL_src_cre___Win32_Profile" -# PROP Target_Dir "" -LINK32=link.exe -lib -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\source\gameengine\soundsystem" /I "..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\blender\blenloader" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\misc" /I "..\..\..\source\blender\bpython\include" /I "..\..\..\source\blender\radiosity\extern\include" /I "..\..\..\source\blender\render\extern\include" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\gameengine\network" /I "..\..\..\lib\windows\decimation\include" /I "..\..\..\source\blender\blenpluginapi\\" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "_CONSOLE" /D "NAN_GAME" /D "GAME" /J /FD /GZ /c -# SUBTRACT BASE CPP /Fr /YX -# ADD CPP /nologo /W3 /Gm /GX /Zi /O2 /I "..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\renderui" /I "..\..\..\source\gameengine\soundsystem\\" /I "..\..\..\lib\windows\python\include\python2.0\\" /I "..\..\..\source\blender\renderconverter" /I "..\..\..\source\blender\verify" /I "..\..\..\source\blender\readstreamglue" /I "..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\blender\blenloader" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\misc" /I "..\..\..\source\blender\bpython\include" /I "..\..\..\source\blender\radiosity\extern\include" /I "..\..\..\source\blender\render\extern\include" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\gameengine\network" /I "..\..\..\lib\windows\decimation\include" /I "..\..\..\source\blender\blenpluginapi\\" /I "..\..\..\lib\windows\blenkey\include" /D "WIN32" /D "_MBCS" /D "_LIB" /D "_CONSOLE" /D "NAN_GAME" /D "GAME" /U "_DEBUG" /J /FD /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\src\debug\BL_src_cre.lib" -# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\src\profile\BL_src_cre.lib" +# ADD LIB32 /nologo /out:"..\..\..\obj\windows\blender\src\debug\BL_src_cre.lib" !ENDIF @@ -108,7 +82,6 @@ LIB32=link.exe -lib # Name "BL_src_cre - Win32 Release" # Name "BL_src_cre - Win32 Debug" -# Name "BL_src_cre - Win32 Profile" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" diff --git a/projectfiles/blender/src/BL_src_pub.dsp b/projectfiles/blender/src/BL_src_pub.dsp index 77f420d99a3..ed1ce74a4ae 100644 --- a/projectfiles/blender/src/BL_src_pub.dsp +++ b/projectfiles/blender/src/BL_src_pub.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Static Library" 0x0104 -CFG=BL_src_pub - Win32 Profile +CFG=BL_src_pub - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,13 +13,12 @@ CFG=BL_src_pub - Win32 Profile !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 "BL_src_pub.mak" CFG="BL_src_pub - Win32 Profile" +!MESSAGE NMAKE /f "BL_src_pub.mak" CFG="BL_src_pub - Win32 Release" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "BL_src_pub - Win32 Release" (based on "Win32 (x86) Static Library") !MESSAGE "BL_src_pub - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE "BL_src_pub - Win32 Profile" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -38,12 +37,12 @@ RSC=rc.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\src_pub" +# PROP Output_Dir "..\..\..\obj\windows\blender\src_pub" +# PROP Intermediate_Dir "..\..\..\obj\windows\blender\src_pub" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\renderui" /I "..\..\..\source\gameengine\soundsystem\\" /I "..\..\..\lib\windows\python\include\python2.0\\" /I "..\..\..\source\blender\renderconverter" /I "..\..\..\source\blender\verify" /I "..\..\..\source\blender\readstreamglue" /I "..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\blender\blenloader" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\misc" /I "..\..\..\source\blender\bpython\include" /I "..\..\..\source\blender\radiosity\extern\include" /I "..\..\..\source\blender\render\extern\include" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\gameengine\network" /I "..\..\..\lib\windows\decimation\include" /I "..\..\..\source\blender\blenpluginapi\\" /I "..\..\..\lib\windows\blenkey\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "_CONSOLE" /D "NAN_GAME" /D "GAME" /J /FD /c +# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\renderui" /I "..\..\..\source\gameengine\soundsystem\\" /I "..\..\..\lib\windows\python\include\python2.2\\" /I "..\..\..\source\blender\renderconverter" /I "..\..\..\source\blender\verify" /I "..\..\..\source\blender\readstreamglue" /I "..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\blender\blenloader" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\misc" /I "..\..\..\source\blender\bpython\include" /I "..\..\..\source\blender\radiosity\extern\include" /I "..\..\..\source\blender\render\extern\include" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\gameengine\network" /I "..\..\..\lib\windows\decimation\include" /I "..\..\..\source\blender\blenpluginapi\\" /I "..\..\..\lib\windows\blenkey\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "_CONSOLE" /D "NAN_GAME" /D "GAME" /J /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -51,7 +50,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\src\BL_src_pub.lib" +# ADD LIB32 /nologo /out:"..\..\..\obj\windows\blender\src\BL_src_pub.lib" !ELSEIF "$(CFG)" == "BL_src_pub - Win32 Debug" @@ -62,12 +61,12 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\src_pub\debug" +# PROP Output_Dir "..\..\..\obj\windows\blender\src_pub\debug" +# PROP Intermediate_Dir "..\..\..\obj\windows\blender\src_pub\debug" # PROP Target_Dir "" LINK32=link.exe -lib # 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 /Gm /GX /Zi /Od /I "..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\renderui" /I "..\..\..\source\gameengine\soundsystem\\" /I "..\..\..\lib\windows\python\include\python2.0\\" /I "..\..\..\source\blender\renderconverter" /I "..\..\..\source\blender\verify" /I "..\..\..\source\blender\readstreamglue" /I "..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\blender\blenloader" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\misc" /I "..\..\..\source\blender\bpython\include" /I "..\..\..\source\blender\radiosity\extern\include" /I "..\..\..\source\blender\render\extern\include" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\gameengine\network" /I "..\..\..\lib\windows\decimation\include" /I "..\..\..\source\blender\blenpluginapi\\" /I "..\..\..\lib\windows\blenkey\include" /D "WIN32" /D "_MBCS" /D "_LIB" /D "_CONSOLE" /D "NAN_GAME" /D "GAME" /U "_DEBUG" /J /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\renderui" /I "..\..\..\source\gameengine\soundsystem\\" /I "..\..\..\lib\windows\python\include\python2.2\\" /I "..\..\..\source\blender\renderconverter" /I "..\..\..\source\blender\verify" /I "..\..\..\source\blender\readstreamglue" /I "..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\blender\blenloader" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\misc" /I "..\..\..\source\blender\bpython\include" /I "..\..\..\source\blender\radiosity\extern\include" /I "..\..\..\source\blender\render\extern\include" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\gameengine\network" /I "..\..\..\lib\windows\decimation\include" /I "..\..\..\source\blender\blenpluginapi\\" /I "..\..\..\lib\windows\blenkey\include" /D "WIN32" /D "_MBCS" /D "_LIB" /D "_CONSOLE" /D "NAN_GAME" /D "GAME" /U "_DEBUG" /J /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe @@ -75,32 +74,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\src\debug\BL_src_pub.lib" - -!ELSEIF "$(CFG)" == "BL_src_pub - Win32 Profile" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "BL_src_pub___Win32_Profile" -# PROP BASE Intermediate_Dir "BL_src_pub___Win32_Profile" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "BL_src_pub___Win32_Profile" -# PROP Intermediate_Dir "BL_src_pub___Win32_Profile" -# PROP Target_Dir "" -LINK32=link.exe -lib -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\source\gameengine\soundsystem" /I "..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\blender\blenloader" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\misc" /I "..\..\..\source\blender\bpython\include" /I "..\..\..\source\blender\radiosity\extern\include" /I "..\..\..\source\blender\render\extern\include" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\gameengine\network" /I "..\..\..\lib\windows\decimation\include" /I "..\..\..\source\blender\blenpluginapi\\" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "_CONSOLE" /D "NAN_GAME" /D "GAME" /J /FD /GZ /c -# SUBTRACT BASE CPP /Fr /YX -# ADD CPP /nologo /W3 /Gm /GX /Zi /O2 /I "..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\renderui" /I "..\..\..\source\gameengine\soundsystem\\" /I "..\..\..\lib\windows\python\include\python2.0\\" /I "..\..\..\source\blender\renderconverter" /I "..\..\..\source\blender\verify" /I "..\..\..\source\blender\readstreamglue" /I "..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\blender\blenloader" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\misc" /I "..\..\..\source\blender\bpython\include" /I "..\..\..\source\blender\radiosity\extern\include" /I "..\..\..\source\blender\render\extern\include" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\gameengine\network" /I "..\..\..\lib\windows\decimation\include" /I "..\..\..\source\blender\blenpluginapi\\" /I "..\..\..\lib\windows\blenkey\include" /D "WIN32" /D "_MBCS" /D "_LIB" /D "_CONSOLE" /D "NAN_GAME" /D "GAME" /U "_DEBUG" /J /FD /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\src\debug\BL_src_pub.lib" -# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\src\profile\BL_src_pub.lib" +# ADD LIB32 /nologo /out:"..\..\..\obj\windows\blender\src\debug\BL_src_pub.lib" !ENDIF @@ -108,7 +82,6 @@ LIB32=link.exe -lib # Name "BL_src_pub - Win32 Release" # Name "BL_src_pub - Win32 Debug" -# Name "BL_src_pub - Win32 Profile" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" diff --git a/projectfiles/blenderpublisher/blenderpublisher.dsp b/projectfiles/blenderpublisher/blenderpublisher.dsp index 4227db68b0e..dc9f19cf376 100644 --- a/projectfiles/blenderpublisher/blenderpublisher.dsp +++ b/projectfiles/blenderpublisher/blenderpublisher.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103 -CFG=blenderpublisher - Win32 Profile +CFG=blenderpublisher - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,13 +13,12 @@ CFG=blenderpublisher - Win32 Profile !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 "blenderpublisher.mak" CFG="blenderpublisher - Win32 Profile" +!MESSAGE NMAKE /f "blenderpublisher.mak" CFG="blenderpublisher - Win32 Release" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "blenderpublisher - Win32 Release" (based on "Win32 (x86) Console Application") !MESSAGE "blenderpublisher - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE "blenderpublisher - Win32 Profile" (based on "Win32 (x86) Console Application") !MESSAGE # Begin Project @@ -63,7 +62,7 @@ LINK32=link.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" +# PROP Output_Dir "..\..\..\obj\windows\publisher\debug" # PROP Intermediate_Dir "..\..\..\obj\windows\publisher\debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" @@ -77,33 +76,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 /debug /machine:I386 /pdbtype:sept -# ADD LINK32 libfrozen.a fmodvc.lib libguardedalloc.a libbsp.a libbmfont.a libghost.a libstring.a ws2_32.lib openal_static.lib dxguid.lib opengl32.lib libjpeg.lib glu32.lib user32.lib gdi32.lib vfw32.lib advapi32.lib ole32.lib libdecimation.a libblenkey.a libeay32.lib libiksolver.a libpng.a libz.a libmoto.a /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"glut32.lib" /nodefaultlib:"libcd.lib" /nodefaultlib:"libc.lib" /nodefaultlib:"libcpd.lib" /nodefaultlib:"libcp.lib" /nodefaultlib:"libcmt.lib" /nodefaultlib:"libcpmtd.lib" /nodefaultlib:"msvcprtd.lib" /out:"..\..\..\obj\windows\debug\blenderpublisher.exe" /pdbtype:sept /libpath:"..\..\lib\windows\bsp\lib\debug\\" /libpath:"..\..\lib\windows\moto\lib\\" /libpath:"..\..\lib\windows\bmfont\lib\debug" /libpath:"..\..\lib\windows\ghost\lib\debug" /libpath:"..\..\lib\windows\glut-3.7\lib" /libpath:"..\..\lib\windows\ode-0.03\lib" /libpath:"..\..\lib\windows\python\frozen" /libpath:"..\..\lib\windows\fmod\lib" /libpath:"..\..\lib\windows\guardedalloc\lib" /libpath:"..\..\lib\windows\string\lib" /libpath:"..\..\lib\windows\python\lib" /libpath:"..\..\lib\windows\iksolver\lib\\" /libpath:"..\..\lib\windows\decimation\lib" /libpath:"..\..\lib\windows\openal\lib" /libpath:"..\..\lib\windows\jpeg\lib" /libpath:"..\..\lib\windows\blenkey\lib" /libpath:"..\..\lib\windows\openssl\lib" /libpath:"..\..\lib\windows\zlib\lib\\" /libpath:"..\..\lib\windows\png\lib\\" -# SUBTRACT LINK32 /pdb:none - -!ELSEIF "$(CFG)" == "blenderpublisher - Win32 Profile" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "blenderpublisher___Win32_Profile" -# PROP BASE Intermediate_Dir "blenderpublisher___Win32_Profile" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "blenderpublisher___Win32_Profile" -# PROP Intermediate_Dir "blenderpublisher___Win32_Profile" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\source\blender\blenlib" /I "..\..\source\kernel\gen_messaging" /I "..\..\source\blender\include" /I "..\..\source\blender" /I "..\..\source\blender\makesdna" /I "..\..\source\blender\blenkernel" /I "..\..\source\blender\blenloader" /I "..\..\source\blender\bpython\include" /I "..\..\source\blender\render\extern\include" /I "..\..\source\blender\radiosity\extern\include" /I "..\..\source\kernel\gen_system" /I "..\..\source\blender\renderconverter\\" /I "..\..\source\blender\renderui\\" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /Zi /O2 /I "..\..\lib\windows\guardedalloc\include" /I "..\..\source\blender\misc" /I "..\..\source\blender\blenlib" /I "..\..\source\kernel\gen_messaging" /I "..\..\source\blender\include" /I "..\..\source\blender" /I "..\..\source\blender\makesdna" /I "..\..\source\blender\blenkernel" /I "..\..\source\blender\blenloader" /I "..\..\source\blender\bpython\include" /I "..\..\source\blender\render\extern\include" /I "..\..\source\blender\radiosity\extern\include" /I "..\..\source\kernel\gen_system" /I "..\..\source\blender\renderconverter\\" /I "..\..\source\blender\renderui\\" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# SUBTRACT CPP /Fr -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 ws2_32.lib openal_static.lib dxguid.lib opengl32.lib libjpeg.lib glu32.lib user32.lib gdi32.lib advapi32.lib ole32.lib libdecimation.a libblenkey.a libeay32.lib libiksolver.a libz.a libmoto.a /nologo /subsystem:console /debug /machine:I386 /out:"..\..\..\obj\windows\debug\blenderpublisher.exe" /pdbtype:sept /libpath:"..\..\lib\windows\python\lib" /libpath:"..\..\lib\windows\iksolver\lib\\" /libpath:"..\..\lib\windows\decimation\lib" /libpath:"..\..\lib\windows\openal\lib" /libpath:"..\..\lib\windows\jpeg\lib" /libpath:"..\..\lib\windows\blenkey\lib" /libpath:"..\..\lib\windows\openssl\lib" /libpath:"..\..\lib\windows\zlib\lib\\" /libpath:"..\..\lib\windows\glut-3.7\lib" /libpath:"..\..\lib\windows\moto\lib\\" -# ADD LINK32 odelib.lib libfrozen.a fmodvc.lib libguardedalloc.a libbsp.a libbmfont.a libghost.a libstring.a ws2_32.lib openal_static.lib dxguid.lib opengl32.lib libjpeg.lib glu32.lib user32.lib gdi32.lib vfw32.lib advapi32.lib ole32.lib libdecimation.a libblenkey.a libeay32.lib libiksolver.a libpng.a libz.a libmoto.a /nologo /subsystem:console /debug /machine:I386 /out:"..\..\..\obj\windows\debug\blenderpublisher.exe" /pdbtype:sept /libpath:"..\..\lib\windows\moto\lib\\" /libpath:"..\..\lib\windows\bmfont\lib" /libpath:"..\..\lib\windows\ghost\lib" /libpath:"..\..\lib\windows\glut-3.7\lib" /libpath:"..\..\lib\windows\ode-0.03\lib" /libpath:"..\..\lib\windows\python\frozen" /libpath:"..\..\lib\windows\fmod\lib" /libpath:"..\..\lib\windows\guardedalloc\lib" /libpath:"..\..\lib\windows\string\lib" /libpath:"..\..\lib\windows\python\lib" /libpath:"..\..\lib\windows\iksolver\lib\\" /libpath:"..\..\lib\windows\decimation\lib" /libpath:"..\..\lib\windows\openal\lib" /libpath:"..\..\lib\windows\jpeg\lib" /libpath:"..\..\lib\windows\blenkey\lib" /libpath:"..\..\lib\windows\openssl\lib" /libpath:"..\..\lib\windows\zlib\lib\\" /libpath:"..\..\lib\windows\png\lib\\" +# ADD LINK32 libfrozen.a fmodvc.lib libguardedalloc.a libbsp.a libbmfont.a libghost.a libstring.a ws2_32.lib openal_static.lib dxguid.lib opengl32.lib libjpeg.lib glu32.lib user32.lib gdi32.lib vfw32.lib advapi32.lib ole32.lib libdecimation.a libblenkey.a libeay32.lib libiksolver.a libpng.a libz.a libmoto.a /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"glut32.lib" /nodefaultlib:"libcd.lib" /nodefaultlib:"libc.lib" /nodefaultlib:"libcpd.lib" /nodefaultlib:"libcp.lib" /nodefaultlib:"libcmt.lib" /nodefaultlib:"libcpmtd.lib" /nodefaultlib:"msvcprtd.lib" /out:"..\..\..\obj\windows\debug\blenderpublisher.exe" /pdbtype:sept /libpath:"..\..\lib\windows\bsp\lib\debug\\" /libpath:"..\..\lib\windows\moto\lib\\" /libpath:"..\..\lib\windows\bmfont\lib\debug" /libpath:"..\..\lib\windows\ghost\lib\debug" /libpath:"..\..\lib\windows\glut-3.7\lib" /libpath:"..\..\lib\windows\ode-0.03\lib" /libpath:"..\..\lib\windows\python\frozen" /libpath:"..\..\lib\windows\fmod\lib" /libpath:"..\..\lib\windows\guardedalloc\lib" /libpath:"..\..\lib\windows\string\lib" /libpath:"..\..\lib\windows\python\lib" /libpath:"..\..\lib\windows\iksolver\lib\\" /libpath:"..\..\lib\windows\decimation\lib" /libpath:"..\..\lib\windows\openal\lib" /libpath:"..\..\lib\windows\jpeg\lib" /libpath:"..\..\lib\windows\blenkey\lib" /libpath:"..\..\lib\windows\openssl\lib" /libpath:"..\..\lib\windows\zlib\lib\\" /libpath:"..\..\lib\windows\png\lib\\" # SUBTRACT LINK32 /pdb:none !ENDIF @@ -112,7 +85,6 @@ LINK32=link.exe # Name "blenderpublisher - Win32 Release" # Name "blenderpublisher - Win32 Debug" -# Name "blenderpublisher - Win32 Profile" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" diff --git a/projectfiles/creator/blendercreator.dsp b/projectfiles/creator/blendercreator.dsp index 3421f97bc17..d245af13a2e 100644 --- a/projectfiles/creator/blendercreator.dsp +++ b/projectfiles/creator/blendercreator.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103 -CFG=blendercreator - Win32 Profile +CFG=blendercreator - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,13 +13,12 @@ CFG=blendercreator - Win32 Profile !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 "blendercreator.mak" CFG="blendercreator - Win32 Profile" +!MESSAGE NMAKE /f "blendercreator.mak" CFG="blendercreator - Win32 Release" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "blendercreator - Win32 Release" (based on "Win32 (x86) Console Application") !MESSAGE "blendercreator - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE "blendercreator - Win32 Profile" (based on "Win32 (x86) Console Application") !MESSAGE # Begin Project @@ -38,7 +37,7 @@ RSC=rc.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" +# PROP Output_Dir "..\..\..\obj\windows\creator" # PROP Intermediate_Dir "..\..\..\obj\windows\creator" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" @@ -63,7 +62,7 @@ LINK32=link.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" +# PROP Output_Dir "..\..\..\obj\windows\creator\debug" # PROP Intermediate_Dir "..\..\..\obj\windows\creator\debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" @@ -77,34 +76,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 /debug /machine:I386 /pdbtype:sept -# ADD LINK32 odelib.lib libfrozen.a fmodvc.lib libbsp.a libguardedalloc.a libbmfont.a libstring.a libghost.a ws2_32.lib openal_static.lib dxguid.lib opengl32.lib libjpeg.lib glu32.lib user32.lib gdi32.lib vfw32.lib advapi32.lib ole32.lib libdecimation.a libblenkey.a libeay32.lib libiksolver.a libpng.a libz.a libmoto.a /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"glut32.lib" /nodefaultlib:"libcd.lib" /nodefaultlib:"libc.lib" /nodefaultlib:"libcpd.lib" /nodefaultlib:"libcp.lib" /nodefaultlib:"libcmt.lib" /out:"..\..\..\obj\windows\debug\blendercreator.exe" /pdbtype:sept /libpath:"..\..\lib\windows\bsp\lib" /libpath:"..\..\lib\windows\ghost\lib\debug" /libpath:"..\..\lib\windows\bmfont\lib\debug" /libpath:"..\..\lib\windows\openal\lib\debug" /libpath:"..\..\lib\windows\iksolver\lib" /libpath:"..\..\lib\windows\ode-0.03\lib" /libpath:"..\..\lib\windows\python\frozen" /libpath:"..\..\lib\windows\guardedalloc\lib" /libpath:"..\..\lib\windows\string\lib" /libpath:"..\..\lib\windows\moto\lib" /libpath:"..\..\lib\windows\python\lib" /libpath:"..\..\lib\windows\jpeg\lib" /libpath:"..\..\lib\windows\decimation\lib" /libpath:"..\..\lib\windows\blenkey\lib" /libpath:"..\..\lib\windows\openssl\lib" /libpath:"..\..\lib\windows\zlib\lib\\" /libpath:"..\..\lib\windows\png\lib\\" /libpath:"..\..\lib\windows\fmod\lib" -# SUBTRACT LINK32 /pdb:none - -!ELSEIF "$(CFG)" == "blendercreator - Win32 Profile" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "blendercreator___Win32_Profile" -# PROP BASE Intermediate_Dir "blendercreator___Win32_Profile" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "blendercreator___Win32_Profile" -# PROP Intermediate_Dir "blendercreator___Win32_Profile" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\source\blender\imbuf" /I "..\..\source\kernel\gen_system" /I "..\..\source\blender\radiosity\extern\include" /I "..\..\source\blender\render\extern\include" /I "..\..\source\blender\blenlib" /I "..\..\source\blender\makesdna" /I "..\..\source\blender\blenkernel" /I "..\..\source\blender\include" /I "..\..\source\blender" /I "..\..\source\blender\blenloader" /I "..\..\source\blender\bpython\include" /I "..\..\source\gameengine\SoundSystem" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /J /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /Zi /O2 /I "..\..\lib\windows\guardedalloc\include" /I "..\..\source\blender\misc" /I "..\..\source\blender\renderui" /I "..\..\source\blender\renderconverter" /I "..\..\source\kernel\gen_messaging" /I "..\..\source\blender\readstreamglue" /I "..\..\source\blender\imbuf" /I "..\..\source\kernel\gen_system" /I "..\..\source\blender\radiosity\extern\include" /I "..\..\source\blender\render\extern\include" /I "..\..\source\blender\blenlib" /I "..\..\source\blender\makesdna" /I "..\..\source\blender\blenkernel" /I "..\..\source\blender\include" /I "..\..\source\blender" /I "..\..\source\blender\blenloader" /I "..\..\source\blender\bpython\include" /I "..\..\source\gameengine\SoundSystem" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /J /FD /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 openal_static.lib dxguid.lib opengl32.lib libjpeg.lib glu32.lib user32.lib gdi32.lib advapi32.lib ole32.lib libdecimation.a libiksolver.a /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"glut32.lib" /out:"..\..\..\obj\windows\debug\blendercreator.exe" /pdbtype:sept /libpath:"..\..\lib\windows\openal\lib\debug" /libpath:"..\..\lib\windows\glut-3.7\lib" /libpath:"..\..\lib\windows\python\lib" /libpath:"..\..\lib\windows\jpeg\lib" /libpath:"..\..\lib\windows\decimation\lib" /libpath:"..\..\lib\windows\iksolver\lib" -# SUBTRACT BASE LINK32 /nodefaultlib -# ADD LINK32 odelib.lib libfrozen.a fmodvc.lib libbsp.a libguardedalloc.a libbmfont.a libstring.a libghost.a ws2_32.lib openal_static.lib dxguid.lib opengl32.lib libjpeg.lib glu32.lib user32.lib gdi32.lib vfw32.lib advapi32.lib ole32.lib libdecimation.a libblenkey.a libeay32.lib libiksolver.a libpng.a libz.a libmoto.a /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"glut32.lib" /out:"..\..\..\obj\windows\profile\blendercreator.exe" /pdbtype:sept /libpath:"..\..\lib\windows\openal\lib\debug" /libpath:"..\..\lib\windows\iksolver\lib" /libpath:"..\..\lib\windows\glut-3.7\lib" /libpath:"..\..\lib\windows\ode-0.03\lib" /libpath:"..\..\lib\windows\python\frozen" /libpath:"..\..\lib\windows\guardedalloc\lib" /libpath:"..\..\lib\windows\string\lib" /libpath:"..\..\lib\windows\moto\lib" /libpath:"..\..\lib\windows\python\lib" /libpath:"..\..\lib\windows\jpeg\lib" /libpath:"..\..\lib\windows\decimation\lib" /libpath:"..\..\lib\windows\blenkey\lib" /libpath:"..\..\lib\windows\openssl\lib" /libpath:"..\..\lib\windows\zlib\lib\\" /libpath:"..\..\lib\windows\png\lib\\" /libpath:"..\..\lib\windows\fmod\lib" +# ADD LINK32 odelib.lib libfrozen.a fmodvc.lib libbsp.a libguardedalloc.a libbmfont.a libstring.a libghost.a ws2_32.lib openal_static.lib dxguid.lib opengl32.lib libjpeg.lib glu32.lib user32.lib gdi32.lib vfw32.lib advapi32.lib ole32.lib libdecimation.a libblenkey.a libeay32.lib libiksolver.a libpng.a libz.a libmoto.a /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"glut32.lib" /nodefaultlib:"libcd.lib" /nodefaultlib:"libc.lib" /nodefaultlib:"libcpd.lib" /nodefaultlib:"libcp.lib" /nodefaultlib:"libcmt.lib" /out:"..\..\..\obj\windows\debug\blendercreator.exe" /pdbtype:sept /libpath:"..\..\lib\windows\ode\lib" /libpath:"..\..\lib\windows\bsp\lib" /libpath:"..\..\lib\windows\ghost\lib\debug" /libpath:"..\..\lib\windows\bmfont\lib\debug" /libpath:"..\..\lib\windows\openal\lib\debug" /libpath:"..\..\lib\windows\iksolver\lib" /libpath:"..\..\lib\windows\ode-0.03\lib" /libpath:"..\..\lib\windows\python\frozen" /libpath:"..\..\lib\windows\guardedalloc\lib" /libpath:"..\..\lib\windows\string\lib" /libpath:"..\..\lib\windows\moto\lib" /libpath:"..\..\lib\windows\python\lib" /libpath:"..\..\lib\windows\jpeg\lib" /libpath:"..\..\lib\windows\decimation\lib" /libpath:"..\..\lib\windows\blenkey\lib" /libpath:"..\..\lib\windows\openssl\lib" /libpath:"..\..\lib\windows\zlib\lib\\" /libpath:"..\..\lib\windows\png\lib\\" /libpath:"..\..\lib\windows\fmod\lib" # SUBTRACT LINK32 /pdb:none !ENDIF @@ -113,7 +85,6 @@ LINK32=link.exe # Name "blendercreator - Win32 Release" # Name "blendercreator - Win32 Debug" -# Name "blendercreator - Win32 Profile" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" diff --git a/projectfiles/creator/blendercreator.dsw b/projectfiles/creator/blendercreator.dsw index f2fe8b5b6a3..fead095c7c7 100644 --- a/projectfiles/creator/blendercreator.dsw +++ b/projectfiles/creator/blendercreator.dsw @@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00 ############################################################################### -Project: "BKE_blenkernel"=..\blender\blenkernel\BKE_blenkernel.dsp - Package Owner=<4> +Project: "BKE_blenkernel"="..\blender\blenkernel\BKE_blenkernel.dsp" - Package Owner=<4> Package=<5> {{{ @@ -15,7 +15,7 @@ Package=<4> ############################################################################### -Project: "BLI_blenlib"=..\blender\blenlib\BLI_blenlib.dsp - Package Owner=<4> +Project: "BLI_blenlib"="..\blender\blenlib\BLI_blenlib.dsp" - Package Owner=<4> Package=<5> {{{ @@ -27,7 +27,7 @@ Package=<4> ############################################################################### -Project: "BLO_decrypt"=..\BLENDER\BLO_decrypt\BLO_decrypt.dsp - Package Owner=<4> +Project: "BLO_decrypt"="..\BLENDER\BLO_decrypt\BLO_decrypt.dsp" - Package Owner=<4> Package=<5> {{{ @@ -39,7 +39,7 @@ Package=<4> ############################################################################### -Project: "BLO_decrypt_stub"=..\blender\BLO_decrypt_stub\BLO_decrypt_stub.dsp - Package Owner=<4> +Project: "BLO_decrypt_stub"="..\blender\BLO_decrypt_stub\BLO_decrypt_stub.dsp" - Package Owner=<4> Package=<5> {{{ @@ -51,7 +51,7 @@ Package=<4> ############################################################################### -Project: "BLO_deflate"=..\blender\BLO_deflate\BLO_deflate.dsp - Package Owner=<4> +Project: "BLO_deflate"="..\blender\BLO_deflate\BLO_deflate.dsp" - Package Owner=<4> Package=<5> {{{ @@ -63,7 +63,7 @@ Package=<4> ############################################################################### -Project: "BLO_encrypt"=..\BLENDER\BLO_encrypt\BLO_encrypt.dsp - Package Owner=<4> +Project: "BLO_encrypt"="..\BLENDER\BLO_encrypt\BLO_encrypt.dsp" - Package Owner=<4> Package=<5> {{{ @@ -75,7 +75,7 @@ Package=<4> ############################################################################### -Project: "BLO_inflate"=..\BLENDER\BLO_inflate\BLO_inflate.dsp - Package Owner=<4> +Project: "BLO_inflate"="..\BLENDER\BLO_inflate\BLO_inflate.dsp" - Package Owner=<4> Package=<5> {{{ @@ -87,7 +87,7 @@ Package=<4> ############################################################################### -Project: "BLO_loader"=..\blender\loader\BLO_loader.dsp - Package Owner=<4> +Project: "BLO_loader"="..\blender\loader\BLO_loader.dsp" - Package Owner=<4> Package=<5> {{{ @@ -99,7 +99,7 @@ Package=<4> ############################################################################### -Project: "BLO_readblenfile"=..\BLENDER\BLO_readblenfile\BLO_readblenfile.dsp - Package Owner=<4> +Project: "BLO_readblenfile"="..\BLENDER\BLO_readblenfile\BLO_readblenfile.dsp" - Package Owner=<4> Package=<5> {{{ @@ -111,7 +111,7 @@ Package=<4> ############################################################################### -Project: "BLO_readstreamglue"=..\BLENDER\BLO_readstreamglue\BLO_readstreamglue.dsp - Package Owner=<4> +Project: "BLO_readstreamglue"="..\BLENDER\BLO_readstreamglue\BLO_readstreamglue.dsp" - Package Owner=<4> Package=<5> {{{ @@ -123,7 +123,7 @@ Package=<4> ############################################################################### -Project: "BLO_sign"=..\BLENDER\BLO_sign\BLO_sign.dsp - Package Owner=<4> +Project: "BLO_sign"="..\BLENDER\BLO_sign\BLO_sign.dsp" - Package Owner=<4> Package=<5> {{{ @@ -135,7 +135,7 @@ Package=<4> ############################################################################### -Project: "BLO_verify"=..\BLENDER\BLO_verify\BLO_verify.dsp - Package Owner=<4> +Project: "BLO_verify"="..\BLENDER\BLO_verify\BLO_verify.dsp" - Package Owner=<4> Package=<5> {{{ @@ -147,7 +147,7 @@ Package=<4> ############################################################################### -Project: "BLO_writeblenfile"=..\BLENDER\BLO_writeblenfile\BLO_writeblenfile.dsp - Package Owner=<4> +Project: "BLO_writeblenfile"="..\BLENDER\BLO_writeblenfile\BLO_writeblenfile.dsp" - Package Owner=<4> Package=<5> {{{ @@ -159,7 +159,7 @@ Package=<4> ############################################################################### -Project: "BLO_writestreamglue"=..\BLENDER\BLO_writestreamglue\BLO_writestreamglue.dsp - Package Owner=<4> +Project: "BLO_writestreamglue"="..\BLENDER\BLO_writestreamglue\BLO_writestreamglue.dsp" - Package Owner=<4> Package=<5> {{{ @@ -171,7 +171,7 @@ Package=<4> ############################################################################### -Project: "BLO_writestreamglue_stub"=..\blender\BLO_writestreamglue_stub\BLO_writestreamglue_stub.dsp - Package Owner=<4> +Project: "BLO_writestreamglue_stub"="..\blender\BLO_writestreamglue_stub\BLO_writestreamglue_stub.dsp" - Package Owner=<4> Package=<5> {{{ @@ -183,7 +183,7 @@ Package=<4> ############################################################################### -Project: "BL_avi"=..\blender\avi\BL_avi.dsp - Package Owner=<4> +Project: "BL_avi"="..\blender\avi\BL_avi.dsp" - Package Owner=<4> Package=<5> {{{ @@ -195,7 +195,7 @@ Package=<4> ############################################################################### -Project: "BL_imbuf"=..\blender\imbuf\BL_imbuf.dsp - Package Owner=<4> +Project: "BL_imbuf"="..\blender\imbuf\BL_imbuf.dsp" - Package Owner=<4> Package=<5> {{{ @@ -207,7 +207,7 @@ Package=<4> ############################################################################### -Project: "BL_img"=..\blender\img\BL_img.dsp - Package Owner=<4> +Project: "BL_img"="..\blender\img\BL_img.dsp" - Package Owner=<4> Package=<5> {{{ @@ -219,7 +219,7 @@ Package=<4> ############################################################################### -Project: "BL_misc"=..\blender\misc\BL_misc.dsp - Package Owner=<4> +Project: "BL_misc"="..\blender\misc\BL_misc.dsp" - Package Owner=<4> Package=<5> {{{ @@ -231,7 +231,7 @@ Package=<4> ############################################################################### -Project: "BL_src"=..\blender\src\BL_src.dsp - Package Owner=<4> +Project: "BL_src"="..\blender\src\BL_src.dsp" - Package Owner=<4> Package=<5> {{{ @@ -243,7 +243,7 @@ Package=<4> ############################################################################### -Project: "BL_src_cre"=..\blender\src\BL_src_cre.dsp - Package Owner=<4> +Project: "BL_src_cre"="..\blender\src\BL_src_cre.dsp" - Package Owner=<4> Package=<5> {{{ @@ -255,7 +255,7 @@ Package=<4> ############################################################################### -Project: "BL_src_pub"=..\blender\src\BL_src_pub.dsp - Package Owner=<4> +Project: "BL_src_pub"="..\blender\src\BL_src_pub.dsp" - Package Owner=<4> Package=<5> {{{ @@ -267,7 +267,7 @@ Package=<4> ############################################################################### -Project: "BPY_python"=..\blender\bpython\intern\BPY_python\BPY_python.dsp - Package Owner=<4> +Project: "BPY_python"="..\blender\bpython\intern\BPY_python\BPY_python.dsp" - Package Owner=<4> Package=<5> {{{ @@ -279,7 +279,7 @@ Package=<4> ############################################################################### -Project: "BRA_radiosity"=..\blender\radiosity\BRA_radiosity.dsp - Package Owner=<4> +Project: "BRA_radiosity"="..\blender\radiosity\BRA_radiosity.dsp" - Package Owner=<4> Package=<5> {{{ @@ -291,7 +291,7 @@ Package=<4> ############################################################################### -Project: "BRE_render"=..\blender\render\BRE_render.dsp - Package Owner=<4> +Project: "BRE_render"="..\blender\render\BRE_render.dsp" - Package Owner=<4> Package=<5> {{{ @@ -303,7 +303,7 @@ Package=<4> ############################################################################### -Project: "BRE_renderconverter"=..\blender\renderconverter\BRE_renderconverter.dsp - Package Owner=<4> +Project: "BRE_renderconverter"="..\blender\renderconverter\BRE_renderconverter.dsp" - Package Owner=<4> Package=<5> {{{ @@ -315,7 +315,7 @@ Package=<4> ############################################################################### -Project: "BRE_renderui"=..\blender\renderui\BRE_renderui.dsp - Package Owner=<4> +Project: "BRE_renderui"="..\blender\renderui\BRE_renderui.dsp" - Package Owner=<4> Package=<5> {{{ @@ -327,7 +327,7 @@ Package=<4> ############################################################################### -Project: "DNA_makesdna"=..\blender\makesdna\DNA_makesdna.dsp - Package Owner=<4> +Project: "DNA_makesdna"="..\blender\makesdna\DNA_makesdna.dsp" - Package Owner=<4> Package=<5> {{{ @@ -339,7 +339,7 @@ Package=<4> ############################################################################### -Project: "EXP_expressions"=..\gameengine\expression\EXP_expressions.dsp - Package Owner=<4> +Project: "EXP_expressions"="..\gameengine\expression\EXP_expressions.dsp" - Package Owner=<4> Package=<5> {{{ @@ -351,7 +351,7 @@ Package=<4> ############################################################################### -Project: "GP_axctl"=..\gameengine\gameplayer\axctl\GP_axctl.dsp - Package Owner=<4> +Project: "GP_axctl"="..\gameengine\gameplayer\axctl\GP_axctl.dsp" - Package Owner=<4> Package=<5> {{{ @@ -447,7 +447,7 @@ Package=<4> ############################################################################### -Project: "GP_common"=..\gameengine\gameplayer\common\GP_common.dsp - Package Owner=<4> +Project: "GP_common"="..\gameengine\gameplayer\common\GP_common.dsp" - Package Owner=<4> Package=<5> {{{ @@ -459,7 +459,7 @@ Package=<4> ############################################################################### -Project: "GP_ghost"=..\gameengine\gameplayer\ghost\GP_ghost.dsp - Package Owner=<4> +Project: "GP_ghost"="..\gameengine\gameplayer\ghost\GP_ghost.dsp" - Package Owner=<4> Package=<5> {{{ @@ -561,13 +561,13 @@ Package=<4> Project_Dep_Name PHY_Dummy End Project Dependency Begin Project Dependency - Project_Dep_Name SM_solid + Project_Dep_Name PHY_Ode End Project Dependency }}} ############################################################################### -Project: "KX_blenderhook"=..\gameengine\blenderhook\KX_blenderhook.dsp - Package Owner=<4> +Project: "KX_blenderhook"="..\gameengine\blenderhook\KX_blenderhook.dsp" - Package Owner=<4> Package=<5> {{{ @@ -579,7 +579,7 @@ Package=<4> ############################################################################### -Project: "KX_converter"=..\gameengine\converter\KX_converter.dsp - Package Owner=<4> +Project: "KX_converter"="..\gameengine\converter\KX_converter.dsp" - Package Owner=<4> Package=<5> {{{ @@ -591,7 +591,7 @@ Package=<4> ############################################################################### -Project: "KX_ketsji"=..\gameengine\ketsji\KX_ketsji.dsp - Package Owner=<4> +Project: "KX_ketsji"="..\gameengine\ketsji\KX_ketsji.dsp" - Package Owner=<4> Package=<5> {{{ @@ -603,7 +603,7 @@ Package=<4> ############################################################################### -Project: "KX_network"=..\gameengine\ketsji\network\KX_network.dsp - Package Owner=<4> +Project: "KX_network"="..\gameengine\ketsji\network\KX_network.dsp" - Package Owner=<4> Package=<5> {{{ @@ -615,7 +615,7 @@ Package=<4> ############################################################################### -Project: "NG_loopbacknetwork"=..\gameengine\network\loopbacknetwork\NG_loopbacknetwork.dsp - Package Owner=<4> +Project: "NG_loopbacknetwork"="..\gameengine\network\loopbacknetwork\NG_loopbacknetwork.dsp" - Package Owner=<4> Package=<5> {{{ @@ -627,7 +627,7 @@ Package=<4> ############################################################################### -Project: "NG_network"=..\gameengine\network\network\NG_network.dsp - Package Owner=<4> +Project: "NG_network"="..\gameengine\network\network\NG_network.dsp" - Package Owner=<4> Package=<5> {{{ @@ -639,7 +639,7 @@ Package=<4> ############################################################################### -Project: "PHY_Dummy"=..\GAMEENGINE\PHYSICS\PHY_PHYSICS\PHY_Dummy\PHY_Dummy.dsp - Package Owner=<4> +Project: "PHY_Dummy"="..\GAMEENGINE\PHYSICS\PHY_PHYSICS\PHY_Dummy\PHY_Dummy.dsp" - Package Owner=<4> Package=<5> {{{ @@ -651,7 +651,7 @@ Package=<4> ############################################################################### -Project: "PHY_Physics"=..\gameengine\physics\PHY_Physics\PHY_Physics.dsp - Package Owner=<4> +Project: "PHY_Ode"="..\gameengine\physics\PHY_Physics\PHY_Ode\PHY_Ode.dsp" - Package Owner=<4> Package=<5> {{{ @@ -663,7 +663,7 @@ Package=<4> ############################################################################### -Project: "RAS_openglrasterizer"=..\gameengine\rasterizer\openglrasterizer\RAS_openglrasterizer.dsp - Package Owner=<4> +Project: "PHY_Physics"="..\gameengine\physics\PHY_Physics\PHY_Physics.dsp" - Package Owner=<4> Package=<5> {{{ @@ -675,7 +675,7 @@ Package=<4> ############################################################################### -Project: "RAS_rasterizer"=..\gameengine\rasterizer\RAS_rasterizer.dsp - Package Owner=<4> +Project: "RAS_openglrasterizer"="..\gameengine\rasterizer\openglrasterizer\RAS_openglrasterizer.dsp" - Package Owner=<4> Package=<5> {{{ @@ -687,7 +687,7 @@ Package=<4> ############################################################################### -Project: "SCA_GameLogic"=..\gameengine\gamelogic\SCA_GameLogic.dsp - Package Owner=<4> +Project: "RAS_rasterizer"="..\gameengine\rasterizer\RAS_rasterizer.dsp" - Package Owner=<4> Package=<5> {{{ @@ -699,7 +699,7 @@ Package=<4> ############################################################################### -Project: "SG_SceneGraph"=..\gameengine\scenegraph\SG_SceneGraph.dsp - Package Owner=<4> +Project: "SCA_GameLogic"="..\gameengine\gamelogic\SCA_GameLogic.dsp" - Package Owner=<4> Package=<5> {{{ @@ -711,7 +711,7 @@ Package=<4> ############################################################################### -Project: "SM_solid"=..\sumo\solid\SM_solid.dsp - Package Owner=<4> +Project: "SG_SceneGraph"="..\gameengine\scenegraph\SG_SceneGraph.dsp" - Package Owner=<4> Package=<5> {{{ @@ -723,7 +723,7 @@ Package=<4> ############################################################################### -Project: "SND_Dummy"=..\gameengine\sound\dummy\SND_Dummy.dsp - Package Owner=<4> +Project: "SM_solid"="..\sumo\solid\SM_solid.dsp" - Package Owner=<4> Package=<5> {{{ @@ -735,7 +735,7 @@ Package=<4> ############################################################################### -Project: "SND_fmod"=..\gameengine\sound\fmod\SND_fmod.dsp - Package Owner=<4> +Project: "SND_Dummy"="..\gameengine\sound\dummy\SND_Dummy.dsp" - Package Owner=<4> Package=<5> {{{ @@ -747,7 +747,7 @@ Package=<4> ############################################################################### -Project: "SND_openal"=..\gameengine\sound\openal\SND_openal.dsp - Package Owner=<4> +Project: "SND_fmod"="..\gameengine\sound\fmod\SND_fmod.dsp" - Package Owner=<4> Package=<5> {{{ @@ -759,7 +759,7 @@ Package=<4> ############################################################################### -Project: "SND_sound"=..\gameengine\sound\SND_sound.dsp - Package Owner=<4> +Project: "SND_openal"="..\gameengine\sound\openal\SND_openal.dsp" - Package Owner=<4> Package=<5> {{{ @@ -771,7 +771,7 @@ Package=<4> ############################################################################### -Project: "SSR_server"=..\ssr\SSR_server.dsp - Package Owner=<4> +Project: "SND_sound"="..\gameengine\sound\SND_sound.dsp" - Package Owner=<4> Package=<5> {{{ @@ -779,98 +779,11 @@ Package=<5> Package=<4> {{{ - Begin Project Dependency - Project_Dep_Name KX_ketsji - End Project Dependency - Begin Project Dependency - Project_Dep_Name SCA_GameLogic - End Project Dependency - Begin Project Dependency - Project_Dep_Name EXP_expressions - End Project Dependency - Begin Project Dependency - Project_Dep_Name RAS_openglrasterizer - End Project Dependency - Begin Project Dependency - Project_Dep_Name RAS_rasterizer - End Project Dependency - Begin Project Dependency - Project_Dep_Name SG_SceneGraph - End Project Dependency - Begin Project Dependency - Project_Dep_Name NG_network - End Project Dependency - Begin Project Dependency - Project_Dep_Name SND_sound - End Project Dependency - Begin Project Dependency - Project_Dep_Name GP_common - End Project Dependency - Begin Project Dependency - Project_Dep_Name KX_network - End Project Dependency - Begin Project Dependency - Project_Dep_Name SND_Dummy - End Project Dependency - Begin Project Dependency - Project_Dep_Name SND_openal - End Project Dependency - Begin Project Dependency - Project_Dep_Name BLO_loader - End Project Dependency - Begin Project Dependency - Project_Dep_Name gen_messaging - End Project Dependency - Begin Project Dependency - Project_Dep_Name SYS_system - End Project Dependency - Begin Project Dependency - Project_Dep_Name BKE_blenkernel - End Project Dependency - Begin Project Dependency - Project_Dep_Name BLI_blenlib - End Project Dependency - Begin Project Dependency - Project_Dep_Name KX_converter - End Project Dependency - Begin Project Dependency - Project_Dep_Name NG_loopbacknetwork - End Project Dependency - Begin Project Dependency - Project_Dep_Name BL_avi - End Project Dependency - Begin Project Dependency - Project_Dep_Name BL_imbuf - End Project Dependency - Begin Project Dependency - Project_Dep_Name BLO_readblenfile - End Project Dependency - Begin Project Dependency - Project_Dep_Name BLO_readstreamglue - End Project Dependency - Begin Project Dependency - Project_Dep_Name DNA_makesdna - End Project Dependency - Begin Project Dependency - Project_Dep_Name BLO_decrypt - End Project Dependency - Begin Project Dependency - Project_Dep_Name BLO_inflate - End Project Dependency - Begin Project Dependency - Project_Dep_Name BLO_verify - End Project Dependency - Begin Project Dependency - Project_Dep_Name BLO_writestreamglue_stub - End Project Dependency - Begin Project Dependency - Project_Dep_Name SND_fmod - End Project Dependency }}} ############################################################################### -Project: "SYS_system"=..\kernel\system\SYS_system.dsp - Package Owner=<4> +Project: "SYS_system"="..\kernel\system\SYS_system.dsp" - Package Owner=<4> Package=<5> {{{ @@ -882,7 +795,7 @@ Package=<4> ############################################################################### -Project: "blendercreator"=.\blendercreator.dsp - Package Owner=<4> +Project: "blendercreator"=".\blendercreator.dsp" - Package Owner=<4> Package=<5> {{{ @@ -1019,14 +932,11 @@ Package=<4> Begin Project Dependency Project_Dep_Name PHY_Dummy End Project Dependency - Begin Project Dependency - Project_Dep_Name SM_solid - End Project Dependency }}} ############################################################################### -Project: "blenderpublisher"=..\blenderpublisher\blenderpublisher.dsp - Package Owner=<4> +Project: "blenderpublisher"="..\blenderpublisher\blenderpublisher.dsp" - Package Owner=<4> Package=<5> {{{ @@ -1173,19 +1083,7 @@ Package=<4> ############################################################################### -Project: "blenpluginapi"=..\blender\blenpluginapi\blenpluginapi\blenpluginapi.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "datatoc"=..\datatoc\datatoc.dsp - Package Owner=<4> +Project: "blenpluginapi"="..\blender\blenpluginapi\blenpluginapi\blenpluginapi.dsp" - Package Owner=<4> Package=<5> {{{ @@ -1197,7 +1095,7 @@ Package=<4> ############################################################################### -Project: "gen_messaging"=..\KERNEL\gen_messaging\gen_messaging.dsp - Package Owner=<4> +Project: "gen_messaging"="..\KERNEL\gen_messaging\gen_messaging.dsp" - Package Owner=<4> Package=<5> {{{ diff --git a/projectfiles/gameengine/blenderhook/KX_blenderhook.dsp b/projectfiles/gameengine/blenderhook/KX_blenderhook.dsp index c2ceaa48372..8db14dacb92 100644 --- a/projectfiles/gameengine/blenderhook/KX_blenderhook.dsp +++ b/projectfiles/gameengine/blenderhook/KX_blenderhook.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Static Library" 0x0104 -CFG=KX_blenderhook - Win32 Profile +CFG=KX_blenderhook - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,13 +13,12 @@ CFG=KX_blenderhook - Win32 Profile !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 "KX_blenderhook.mak" CFG="KX_blenderhook - Win32 Profile" +!MESSAGE NMAKE /f "KX_blenderhook.mak" CFG="KX_blenderhook - Win32 Release" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "KX_blenderhook - Win32 Release" (based on "Win32 (x86) Static Library") !MESSAGE "KX_blenderhook - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE "KX_blenderhook - Win32 Profile" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -62,11 +61,11 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\blenderhook\debug" +# PROP Output_Dir "..\..\..\obj\windows\gameengine\blenderhook\debug" +# PROP Intermediate_Dir "..\..\..\obj\windows\gameengine\blenderhook\debug" # PROP Target_Dir "" LINK32=link.exe -lib -# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\gameengine\rasterizer\ras_openglrasterizer" /I "..\..\..\lib\windows\python\include\python2.0" /I "..\..\..\lib\windows\string\include" /I "..\..\..\lib\windows\bmfont\include" /I "..\..\..\source\gameengine\Converter\\" /I "..\..\..\source\blender\imbuf" /I "..\..\..\lib\windows\moto\include" /I "..\..\..\source\gameengine\ketsji" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\gameengine\rasterizer" /I "..\..\..\source\gameengine\gamelogic" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\gameengine\expressions" /I "..\..\..\source\gameengine\network" /I "..\..\..\source\gameengine\scenegraph" /I "..\..\..\source\sumo\include" /I "..\..\..\source\sumo\fuzzics\include" /I "..\..\..\source\gameengine\network\loopbacknetwork" /I "..\..\..\source\gameengine\soundsystem" /I "..\..\..\source\blender\misc" /I "..\..\..\source\blender\blenloader" /D "WIN32" /D "_MBCS" /D "_LIB" /U "_DEBUG" /YX /J /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\gameengine\rasterizer\ras_openglrasterizer" /I "..\..\..\lib\windows\python\include\python2.2" /I "..\..\..\lib\windows\string\include" /I "..\..\..\lib\windows\bmfont\include" /I "..\..\..\source\gameengine\Converter\\" /I "..\..\..\source\blender\imbuf" /I "..\..\..\lib\windows\moto\include" /I "..\..\..\source\gameengine\ketsji" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\gameengine\rasterizer" /I "..\..\..\source\gameengine\gamelogic" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\gameengine\expressions" /I "..\..\..\source\gameengine\network" /I "..\..\..\source\gameengine\scenegraph" /I "..\..\..\source\sumo\include" /I "..\..\..\source\sumo\fuzzics\include" /I "..\..\..\source\gameengine\network\loopbacknetwork" /I "..\..\..\source\gameengine\soundsystem" /I "..\..\..\source\blender\misc" /I "..\..\..\source\blender\blenloader" /D "WIN32" /D "_MBCS" /D "_LIB" /U "_DEBUG" /YX /J /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe @@ -74,31 +73,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\gameengine\blenderhook\debug\KX_blenderhook.lib" - -!ELSEIF "$(CFG)" == "KX_blenderhook - Win32 Profile" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "KX_blenderhook___Win32_Profile" -# PROP BASE Intermediate_Dir "KX_blenderhook___Win32_Profile" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "KX_blenderhook___Win32_Profile" -# PROP Intermediate_Dir "KX_blenderhook___Win32_Profile" -# PROP Target_Dir "" -LINK32=link.exe -lib -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\lib\windows\python\include\python1.5" /I "..\..\..\source\blender\imbuf" /I "..\..\..\lib\windows\moto\include" /I "..\..\..\source\gameengine\ketsji" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\gameengine\rasterizer" /I "..\..\..\source\gameengine\gamelogic" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\gameengine\expressions" /I "..\..\..\source\gameengine\network" /I "..\..\..\source\gameengine\scenegraph" /I "..\..\..\source\sumo\include" /I "..\..\..\source\sumo\fuzzics\include" /I "..\..\..\source\gameengine\network\loopbacknetwork" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /Zi /O2 /I "..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\gameengine\rasterizer\ras_openglrasterizer" /I "..\..\..\lib\windows\python\include\python2.0" /I "..\..\..\lib\windows\string\include" /I "..\..\..\lib\windows\bmfont\include" /I "..\..\..\source\gameengine\Converter\\" /I "..\..\..\source\blender\imbuf" /I "..\..\..\lib\windows\moto\include" /I "..\..\..\source\gameengine\ketsji" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\gameengine\rasterizer" /I "..\..\..\source\gameengine\gamelogic" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\gameengine\expressions" /I "..\..\..\source\gameengine\network" /I "..\..\..\source\gameengine\scenegraph" /I "..\..\..\source\sumo\include" /I "..\..\..\source\sumo\fuzzics\include" /I "..\..\..\source\gameengine\network\loopbacknetwork" /I "..\..\..\source\gameengine\soundsystem" /I "..\..\..\source\blender\misc" /I "..\..\..\source\blender\blenloader" /D "WIN32" /D "_MBCS" /D "_LIB" /U "_DEBUG" /YX /J /FD /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\..\..\obj\windows\gameengine\blenderhook\debug\KX_blenderhook.lib" -# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\gameengine\blenderhook\profile\KX_blenderhook.lib" +# ADD LIB32 /nologo !ENDIF @@ -106,7 +81,6 @@ LIB32=link.exe -lib # Name "KX_blenderhook - Win32 Release" # Name "KX_blenderhook - Win32 Debug" -# Name "KX_blenderhook - Win32 Profile" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" diff --git a/projectfiles/gameengine/converter/KX_converter.dsp b/projectfiles/gameengine/converter/KX_converter.dsp index 517b722682a..bb4783e0b1e 100644 --- a/projectfiles/gameengine/converter/KX_converter.dsp +++ b/projectfiles/gameengine/converter/KX_converter.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Static Library" 0x0104 -CFG=KX_converter - Win32 Profile +CFG=KX_converter - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,7 +13,7 @@ CFG=KX_converter - Win32 Profile !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 "KX_converter.mak" CFG="KX_converter - Win32 Profile" +!MESSAGE NMAKE /f "KX_converter.mak" CFG="KX_converter - Win32 Release" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -21,7 +21,6 @@ CFG=KX_converter - Win32 Profile !MESSAGE "KX_converter - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE "KX_converter - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library") !MESSAGE "KX_converter - Win32 MT DLL Release" (based on "Win32 (x86) Static Library") -!MESSAGE "KX_converter - Win32 Profile" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -64,12 +63,12 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\converter\debug" +# PROP Output_Dir "..\..\..\obj\windows\gameengine\converter\debug" +# PROP Intermediate_Dir "..\..\..\obj\windows\gameengine\converter\debug" # PROP Target_Dir "" LINK32=link.exe -lib # 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 /Gm /GX /Zi /Od /I "..\..\..\lib\windows\python\include\python2.0" /I "..\..\..\lib\windows\string\include" /I "..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\gameengine\expressions" /I "..\..\..\source\gameengine\BlenderRoutines" /I "..\..\..\source\sumo\include" /I "..\..\..\lib\windows\moto\include" /I "..\..\..\source\sumo\Fuzzics\include" /I "..\..\..\source\gameengine\Ketsji" /I "..\..\..\source\gameengine\SceneGraph" /I "..\..\..\source\gameengine\rasterizer" /I "..\..\..\source\gameengine\rasterizer\ras_openglrasterizer" /I "..\..\..\source\gameengine\gamelogic" /I "..\..\..\source\gameengine\soundsystem" /I "..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\source\gameengine\soundsystem\snd_blenderwavecache" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\gameengine\network" /I "..\..\..\source\gameengine\ketsji\kxnetwork" /I "..\..\..\source\gameengine\physics" /I "..\..\..\source\gameengine\physics\ode" /I "..\..\..\source\gameengine\physics\dummy" /I "..\..\..\source\gameengine\physics\sumo" /I "..\..\..\source\gameengine\physics\sumo\fuzzics\include" /I "..\..\..\source\gameengine\physics\sumo\include" /D "WIN32" /D "_MBCS" /D "_LIB" /U "_DEBUG" /YX /J /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\..\lib\windows\python\include\python2.2" /I "..\..\..\lib\windows\string\include" /I "..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\gameengine\expressions" /I "..\..\..\source\gameengine\BlenderRoutines" /I "..\..\..\source\sumo\include" /I "..\..\..\lib\windows\moto\include" /I "..\..\..\source\sumo\Fuzzics\include" /I "..\..\..\source\gameengine\Ketsji" /I "..\..\..\source\gameengine\SceneGraph" /I "..\..\..\source\gameengine\rasterizer" /I "..\..\..\source\gameengine\rasterizer\ras_openglrasterizer" /I "..\..\..\source\gameengine\gamelogic" /I "..\..\..\source\gameengine\soundsystem" /I "..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\source\gameengine\soundsystem\snd_blenderwavecache" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\gameengine\network" /I "..\..\..\source\gameengine\ketsji\kxnetwork" /I "..\..\..\source\gameengine\physics" /I "..\..\..\source\gameengine\physics\ode" /I "..\..\..\source\gameengine\physics\dummy" /I "..\..\..\source\gameengine\physics\sumo" /I "..\..\..\source\gameengine\physics\sumo\fuzzics\include" /I "..\..\..\source\gameengine\physics\common" /I "..\..\..\source\gameengine\physics\BlOde" /D "WIN32" /D "_MBCS" /D "_LIB" /U "_DEBUG" /YX /J /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe @@ -77,7 +76,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\gameengine\converter\debug\KX_converter.lib" +# ADD LIB32 /nologo !ELSEIF "$(CFG)" == "KX_converter - Win32 MT DLL Debug" @@ -127,30 +126,6 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\gameengine\converter\KX_converter.lib" # ADD LIB32 /nologo -!ELSEIF "$(CFG)" == "KX_converter - Win32 Profile" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "KX_converter___Win32_Profile" -# PROP BASE Intermediate_Dir "KX_converter___Win32_Profile" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "KX_converter___Win32_Profile" -# PROP Intermediate_Dir "KX_converter___Win32_Profile" -# PROP Target_Dir "" -LINK32=link.exe -lib -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\lib\windows\python\include\python1.5" /I "..\..\..\lib\windows\python\include\python2.0" /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\gameengine\expressions" /I "..\..\..\source\gameengine\BlenderRoutines" /I "..\..\..\source\sumo\include" /I "..\..\..\lib\windows\moto\include" /I "..\..\..\source\sumo\Fuzzics\include" /I "..\..\..\source\gameengine\Ketsji" /I "..\..\..\source\gameengine\SceneGraph" /I "..\..\..\source\gameengine\rasterizer" /I "..\..\..\source\gameengine\rasterizer\ras_openglrasterizer" /I "..\..\..\source\gameengine\gamelogic" /I "..\..\..\source\gameengine\soundsystem" /I "..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\source\gameengine\soundsystem\snd_blenderwavecache" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\gameengine\network" /I "..\..\..\source\gameengine\ketsji\kxnetwork" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /Zi /O2 /I "..\..\..\lib\windows\python\include\python2.0" /I "..\..\..\lib\windows\string\include" /I "..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\gameengine\expressions" /I "..\..\..\source\gameengine\BlenderRoutines" /I "..\..\..\source\sumo\include" /I "..\..\..\lib\windows\moto\include" /I "..\..\..\source\sumo\Fuzzics\include" /I "..\..\..\source\gameengine\Ketsji" /I "..\..\..\source\gameengine\SceneGraph" /I "..\..\..\source\gameengine\rasterizer" /I "..\..\..\source\gameengine\rasterizer\ras_openglrasterizer" /I "..\..\..\source\gameengine\gamelogic" /I "..\..\..\source\gameengine\soundsystem" /I "..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\source\gameengine\soundsystem\snd_blenderwavecache" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\include" /I "..\..\..\source\blender" /I "..\..\..\source\blender\makesdna" /I "..\..\..\source\gameengine\network" /I "..\..\..\source\gameengine\ketsji\kxnetwork" /I "..\..\..\source\gameengine\physics" /I "..\..\..\source\gameengine\physics\ode" /I "..\..\..\source\gameengine\physics\dummy" /I "..\..\..\source\gameengine\physics\sumo" /I "..\..\..\source\gameengine\physics\sumo\fuzzics\include" /I "..\..\..\source\gameengine\physics\sumo\include" /D "WIN32" /D "_MBCS" /D "_LIB" /U "_DEBUG" /YX /J /FD /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\..\..\obj\windows\gameengine\converter\debug\KX_converter.lib" -# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\gameengine\converter\profile\KX_converter.lib" - !ENDIF # Begin Target @@ -159,7 +134,6 @@ LIB32=link.exe -lib # Name "KX_converter - Win32 Debug" # Name "KX_converter - Win32 MT DLL Debug" # Name "KX_converter - Win32 MT DLL Release" -# Name "KX_converter - Win32 Profile" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" diff --git a/projectfiles/gameengine/expression/EXP_expressions.dsp b/projectfiles/gameengine/expression/EXP_expressions.dsp index 6e79da416f7..8868d91286e 100644 --- a/projectfiles/gameengine/expression/EXP_expressions.dsp +++ b/projectfiles/gameengine/expression/EXP_expressions.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Static Library" 0x0104 -CFG=EXP_expressions - Win32 Profile +CFG=EXP_expressions - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,7 +13,7 @@ CFG=EXP_expressions - Win32 Profile !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 "EXP_expressions.mak" CFG="EXP_expressions - Win32 Profile" +!MESSAGE NMAKE /f "EXP_expressions.mak" CFG="EXP_expressions - Win32 Release" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -21,7 +21,6 @@ CFG=EXP_expressions - Win32 Profile !MESSAGE "EXP_expressions - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE "EXP_expressions - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library") !MESSAGE "EXP_expressions - Win32 MT DLL Release" (based on "Win32 (x86) Static Library") -!MESSAGE "EXP_expressions - Win32 Profile" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -45,7 +44,7 @@ RSC=rc.exe # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\lib\windows\python\include\python2.0" /I "..\..\..\..\lib\windows\python\include\python2.0" /I "..\..\..\lib\windows\string\include" /I "..\..\..\source\kernel\gen_system" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "EXP_PYTHON_EMBEDDING" /YX /J /FD /c +# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\lib\windows\python\include\python2.0" /I "..\..\..\..\lib\windows\python\include\python2.0" /I "..\..\..\lib\windows\string\include" /I "..\..\..\source\kernel\gen_system" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "EXP_PYTHON_EMBEDDING" /YX /J /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -64,12 +63,12 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\expressions\debug" +# PROP Output_Dir "..\..\..\obj\windows\gameengine\expressions\debug" +# PROP Intermediate_Dir "..\..\..\obj\windows\gameengine\expressions\debug" # PROP Target_Dir "" LINK32=link.exe -lib # 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 /Gm /GX /Zi /Od /I "..\..\..\lib\windows\python\include\python2.0" /I "..\..\..\..\lib\windows\python\include\python2.0" /I "..\..\..\lib\windows\string\include" /I "..\..\..\source\kernel\gen_system" /D "WIN32" /D "_MBCS" /D "_LIB" /D "EXP_PYTHON_EMBEDDING" /U "_DEBUG" /YX /J /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\..\lib\windows\python\include\python2.2" /I "..\..\..\..\lib\windows\python\include\python2.0" /I "..\..\..\lib\windows\string\include" /I "..\..\..\source\kernel\gen_system" /D "WIN32" /D "_MBCS" /D "_LIB" /D "EXP_PYTHON_EMBEDDING" /U "_DEBUG" /YX /J /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe @@ -77,7 +76,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\gameengine\expressions\debug\EXP_expressions.lib" +# ADD LIB32 /nologo !ELSEIF "$(CFG)" == "EXP_expressions - Win32 MT DLL Debug" @@ -93,7 +92,7 @@ LIB32=link.exe -lib # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /MDd /Gm /GX /ZI /Od /I "..\..\..\source\kernel\gen_system" /I "..\..\..\lib\windows\python\include\python1.5" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "EXP_PYTHON_EMBEDDING" /YX /J /FD /GZ /c -# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "..\..\..\lib\windows\python\include\python2.0" /I "..\..\..\..\lib\windows\python\include\python2.0" /I "..\..\..\lib\windows\string\include" /I "..\..\..\source\kernel\gen_system" /D "WIN32" /D "_MBCS" /D "_LIB" /D "EXP_PYTHON_EMBEDDING" /U "_DEBUG" /YX /J /FD /GZ /c +# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "..\..\..\lib\windows\python\include\python2.0" /I "..\..\..\..\lib\windows\python\include\python2.0" /I "..\..\..\lib\windows\string\include" /I "..\..\..\source\kernel\gen_system" /D "WIN32" /D "_MBCS" /D "_LIB" /D "EXP_PYTHON_EMBEDDING" /U "_DEBUG" /YX /J /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe @@ -117,7 +116,7 @@ LIB32=link.exe -lib # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /GX /O2 /I "..\..\..\source\kernel\gen_system" /I "..\..\..\lib\windows\python\include\python2.0" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "EXP_PYTHON_EMBEDDING" /YX /J /FD /c -# ADD CPP /nologo /MD /GX /O2 /I "..\..\..\lib\windows\python\include\python2.0" /I "..\..\..\..\lib\windows\python\include\python2.0" /I "..\..\..\lib\windows\string\include" /I "..\..\..\source\kernel\gen_system" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "EXP_PYTHON_EMBEDDING" /YX /J /FD /c +# ADD CPP /nologo /MD /GX /O2 /I "..\..\..\lib\windows\python\include\python2.0" /I "..\..\..\..\lib\windows\python\include\python2.0" /I "..\..\..\lib\windows\string\include" /I "..\..\..\source\kernel\gen_system" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "EXP_PYTHON_EMBEDDING" /YX /J /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -127,30 +126,6 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\gameengine\expressions\EXP_expressions.lib" # ADD LIB32 /nologo -!ELSEIF "$(CFG)" == "EXP_expressions - Win32 Profile" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "EXP_expressions___Win32_Profile" -# PROP BASE Intermediate_Dir "EXP_expressions___Win32_Profile" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "EXP_expressions___Win32_Profile" -# PROP Intermediate_Dir "EXP_expressions___Win32_Profile" -# PROP Target_Dir "" -LINK32=link.exe -lib -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\source\kernel\gen_system" /I "..\..\..\lib\windows\python\include\python1.5" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "EXP_PYTHON_EMBEDDING" /YX /J /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /Zi /O2 /I "..\..\..\lib\windows\python\include\python2.0" /I "..\..\..\..\lib\windows\python\include\python2.0" /I "..\..\..\lib\windows\string\include" /I "..\..\..\source\kernel\gen_system" /D "WIN32" /D "_MBCS" /D "_LIB" /D "EXP_PYTHON_EMBEDDING" /U "_DEBUG" /YX /J /FD /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\..\..\obj\windows\gameengine\expressions\debug\EXP_expressions.lib" -# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\gameengine\expressions\profile\EXP_expressions.lib" - !ENDIF # Begin Target @@ -159,7 +134,6 @@ LIB32=link.exe -lib # Name "EXP_expressions - Win32 Debug" # Name "EXP_expressions - Win32 MT DLL Debug" # Name "EXP_expressions - Win32 MT DLL Release" -# Name "EXP_expressions - Win32 Profile" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" diff --git a/projectfiles/gameengine/gamelogic/SCA_gamelogic.dsp b/projectfiles/gameengine/gamelogic/SCA_gamelogic.dsp index 574d0feb35f..b32a9c30da6 100644 --- a/projectfiles/gameengine/gamelogic/SCA_gamelogic.dsp +++ b/projectfiles/gameengine/gamelogic/SCA_gamelogic.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Static Library" 0x0104 -CFG=SCA_GameLogic - Win32 Profile +CFG=SCA_GameLogic - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,7 +13,7 @@ CFG=SCA_GameLogic - Win32 Profile !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 "SCA_GameLogic.mak" CFG="SCA_GameLogic - Win32 Profile" +!MESSAGE NMAKE /f "SCA_GameLogic.mak" CFG="SCA_GameLogic - Win32 Release" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -21,7 +21,6 @@ CFG=SCA_GameLogic - Win32 Profile !MESSAGE "SCA_GameLogic - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE "SCA_GameLogic - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library") !MESSAGE "SCA_GameLogic - Win32 MT DLL Release" (based on "Win32 (x86) Static Library") -!MESSAGE "SCA_GameLogic - Win32 Profile" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -45,7 +44,7 @@ RSC=rc.exe # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\lib\windows\python\include\python2.0" /I "..\..\..\lib\windows\string\include" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\gameengine\expressions" /I "..\..\..\lib\windows\moto\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "EXP_PYTHON_EMBEDDING" /YX /J /FD /c +# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\lib\windows\python\include\python2.0" /I "..\..\..\lib\windows\string\include" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\gameengine\expressions" /I "..\..\..\lib\windows\moto\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "EXP_PYTHON_EMBEDDING" /YX /J /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -64,12 +63,12 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\gamelogic\debug" +# PROP Output_Dir "..\..\..\obj\windows\gameengine\gamelogic\debug" +# PROP Intermediate_Dir "..\..\..\obj\windows\gameengine\gamelogic\debug" # PROP Target_Dir "" LINK32=link.exe -lib # 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 /Gm /GX /Zi /Od /I "..\..\..\lib\windows\python\include\python2.0" /I "..\..\..\lib\windows\string\include" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\gameengine\expressions" /I "..\..\..\lib\windows\moto\include" /D "WIN32" /D "_MBCS" /D "_LIB" /D "EXP_PYTHON_EMBEDDING" /U "_DEBUG" /YX /J /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\..\lib\windows\python\include\python2.2" /I "..\..\..\lib\windows\string\include" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\gameengine\expressions" /I "..\..\..\lib\windows\moto\include" /D "WIN32" /D "_MBCS" /D "_LIB" /D "EXP_PYTHON_EMBEDDING" /U "_DEBUG" /YX /J /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe @@ -77,7 +76,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\gameengine\gamelogic\debug\SCA_GameLogic.lib" +# ADD LIB32 /nologo !ELSEIF "$(CFG)" == "SCA_GameLogic - Win32 MT DLL Debug" @@ -93,7 +92,7 @@ LIB32=link.exe -lib # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /Gm /GX /ZI /Od /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\gameengine\expressions" /I "..\..\..\lib\windows\moto\include" /I "..\..\..\lib\windows\python\include\python1.5" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "EXP_PYTHON_EMBEDDING" /YX /J /FD /GZ /c -# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "..\..\..\lib\windows\python\include\python2.0" /I "..\..\..\lib\windows\string\include" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\gameengine\expressions" /I "..\..\..\lib\windows\moto\include" /D "WIN32" /D "_MBCS" /D "_LIB" /D "EXP_PYTHON_EMBEDDING" /U "_DEBUG" /YX /J /FD /GZ /c +# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "..\..\..\lib\windows\python\include\python2.0" /I "..\..\..\lib\windows\string\include" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\gameengine\expressions" /I "..\..\..\lib\windows\moto\include" /D "WIN32" /D "_MBCS" /D "_LIB" /D "EXP_PYTHON_EMBEDDING" /U "_DEBUG" /YX /J /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe @@ -117,7 +116,7 @@ LIB32=link.exe -lib # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /GX /O2 /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\gameengine\expressions" /I "..\..\..\lib\windows\moto\include" /I "..\..\..\lib\windows\python\include\python2.0" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "EXP_PYTHON_EMBEDDING" /YX /J /FD /c -# ADD CPP /nologo /MD /GX /O2 /I "..\..\..\lib\windows\python\include\python2.0" /I "..\..\..\lib\windows\string\include" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\gameengine\expressions" /I "..\..\..\lib\windows\moto\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "EXP_PYTHON_EMBEDDING" /YX /J /FD /c +# ADD CPP /nologo /MD /GX /O2 /I "..\..\..\lib\windows\python\include\python2.0" /I "..\..\..\lib\windows\string\include" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\gameengine\expressions" /I "..\..\..\lib\windows\moto\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "EXP_PYTHON_EMBEDDING" /YX /J /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -127,30 +126,6 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\gameengine\gamelogic\SCA_GameLogic.lib" # ADD LIB32 /nologo -!ELSEIF "$(CFG)" == "SCA_GameLogic - Win32 Profile" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "SCA_GameLogic___Win32_Profile" -# PROP BASE Intermediate_Dir "SCA_GameLogic___Win32_Profile" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "SCA_GameLogic___Win32_Profile" -# PROP Intermediate_Dir "SCA_GameLogic___Win32_Profile" -# PROP Target_Dir "" -LINK32=link.exe -lib -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\gameengine\expressions" /I "..\..\..\lib\windows\moto\include" /I "..\..\..\lib\windows\python\include\python1.5" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "EXP_PYTHON_EMBEDDING" /YX /J /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /Zi /O2 /I "..\..\..\lib\windows\python\include\python2.0" /I "..\..\..\lib\windows\string\include" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\gameengine\expressions" /I "..\..\..\lib\windows\moto\include" /D "WIN32" /D "_MBCS" /D "_LIB" /D "EXP_PYTHON_EMBEDDING" /U "_DEBUG" /YX /J /FD /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\..\..\obj\windows\gameengine\gamelogic\debug\SCA_GameLogic.lib" -# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\gameengine\gamelogic\profile\SCA_GameLogic.lib" - !ENDIF # Begin Target @@ -159,7 +134,6 @@ LIB32=link.exe -lib # Name "SCA_GameLogic - Win32 Debug" # Name "SCA_GameLogic - Win32 MT DLL Debug" # Name "SCA_GameLogic - Win32 MT DLL Release" -# Name "SCA_GameLogic - Win32 Profile" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" diff --git a/projectfiles/gameengine/gameplayer/axctl/GP_axctl.dsp b/projectfiles/gameengine/gameplayer/axctl/GP_axctl.dsp index 8650b90a0f0..afa793fd9a9 100644 --- a/projectfiles/gameengine/gameplayer/axctl/GP_axctl.dsp +++ b/projectfiles/gameengine/gameplayer/axctl/GP_axctl.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 -CFG=GP_axctl - Win32 Profile +CFG=GP_axctl - Win32 MT DLL Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,13 +13,12 @@ CFG=GP_axctl - Win32 Profile !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 "GP_axctl.mak" CFG="GP_axctl - Win32 Profile" +!MESSAGE NMAKE /f "GP_axctl.mak" CFG="GP_axctl - Win32 MT DLL Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "GP_axctl - Win32 MT DLL Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "GP_axctl - Win32 MT DLL Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "GP_axctl - Win32 Profile" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE # Begin Project @@ -61,17 +60,6 @@ LINK32=link.exe # SUBTRACT BASE LINK32 /nodefaultlib # ADD LINK32 libmoto.a libguardedalloc.a libbmfont.a libstring.a ws2_32.lib opengl32.lib glu32.lib glaux.lib dxguid.lib ole32.lib vfw32.lib libjpeg.lib libblenkey.a libeay32.lib libz.a libpng.a fmodvc.lib /nologo /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libc.lib" /nodefaultlib:"libcmtd.lib" /nodefaultlib:"msvcrtd.lib" /nodefaultlib:"mfc42.lib" /nodefaultlib:"mfcs42.lib" /out:"..\..\..\..\..\obj\windows\debug\Blender3DPlugin.ocx" /pdbtype:sept /libpath:"../../../../lib/windows/fmod/lib" /libpath:"../../../../lib/windows/guardedalloc/lib" /libpath:"../../../../lib/windows/openal/lib/debug_MT" /libpath:"../../../../lib/windows/moto/lib" /libpath:"../../../../lib/windows/bmfont/lib" /libpath:"../../../../lib/windows/string/lib" /libpath:"../../../../lib/windows/python/lib" /libpath:"../../../../lib/windows/jpeg/lib" /libpath:"..\..\..\..\lib\windows\openssl\lib\mt_dll" /libpath:"..\..\..\..\lib\windows\zlib\lib\\" /libpath:"..\..\..\..\lib\windows\blenkey\lib\\" /libpath:"..\..\..\..\lib\windows\png\lib" # SUBTRACT LINK32 /nodefaultlib -# Begin Custom Build - Registering ActiveX Control... -OutDir=.\..\..\..\..\..\obj\windows\gameengine\gameplayer\axctl\mtdll_debug -TargetPath=\Documents and Settings\maarten\My Documents\obj\windows\debug\Blender3DPlugin.ocx -InputPath=\Documents and Settings\maarten\My Documents\obj\windows\debug\Blender3DPlugin.ocx -SOURCE="$(InputPath)" - -"$(OutDir)\regsvr32.trg" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - regsvr32 /s /c "$(TargetPath)" - echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg" - -# End Custom Build !ELSEIF "$(CFG)" == "GP_axctl - Win32 MT DLL Release" @@ -101,60 +89,6 @@ BSC32=bscmake.exe LINK32=link.exe # ADD BASE LINK32 opengl32.lib glu32.lib glaux.lib /nologo /subsystem:windows /dll /machine:I386 /out:"Release/ActiveXgp.ocx" # ADD LINK32 fmodvc.lib libmoto.a libguardedalloc.a libbmfont.a libstring.a ws2_32.lib opengl32.lib glu32.lib glaux.lib dxguid.lib ole32.lib vfw32.lib libjpeg.lib openal_static.lib libblenkey.a libeay32.lib libz.a libpng.a /nologo /subsystem:windows /dll /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib" /nodefaultlib:"msvcrtd.lib" /out:"..\..\..\..\..\obj\windows\Blender3DPlugin.ocx" /libpath:"../../../../lib/windows/fmod/lib" /libpath:"../../../../lib/windows/guardedalloc/lib" /libpath:"../../../../lib/windows/openal/lib/release_MT" /libpath:"../../../../lib/windows/moto/lib" /libpath:"../../../../lib/windows/bmfont/lib" /libpath:"../../../../lib/windows/string/lib" /libpath:"../../../../lib/windows/python/lib" /libpath:"../../../../lib/windows/jpeg/lib" /libpath:"..\..\..\..\lib\windows\openssl\lib\mt_dll" /libpath:"..\..\..\..\lib\windows\zlib\lib\\" /libpath:"..\..\..\..\lib\windows\blenkey\lib\\" /libpath:"..\..\..\..\lib\windows\png\lib" -# Begin Custom Build - Registering ActiveX Control... -OutDir=.\..\..\..\..\..\obj\windows\gameengine\gameplayer\axctl\mtdll -TargetPath=\Documents and Settings\maarten\My Documents\obj\windows\Blender3DPlugin.ocx -InputPath=\Documents and Settings\maarten\My Documents\obj\windows\Blender3DPlugin.ocx -SOURCE="$(InputPath)" - -"$(OutDir)\regsvr32.trg" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - regsvr32 /s /c "$(TargetPath)" - echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg" - -# End Custom Build - -!ELSEIF "$(CFG)" == "GP_axctl - Win32 Profile" - -# PROP BASE Use_MFC 2 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "GP_axctl___Win32_Profile" -# PROP BASE Intermediate_Dir "GP_axctl___Win32_Profile" -# PROP BASE Target_Ext "ocx" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 2 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "GP_axctl___Win32_Profile" -# PROP Intermediate_Dir "GP_axctl___Win32_Profile" -# PROP Target_Ext "ocx" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\expressions" /I "..\..\..\..\source\gameengine\ketsji" /I "..\..\..\..\source\gameengine\ketsji\kxnetwork" /I "..\..\..\..\source\gameengine\rasterizer" /I "..\..\..\..\source\gameengine\rasterizer\ras_openglrasterizer" /I "..\..\..\..\source\gameengine\scenegraph" /I "..\..\..\..\source\gameengine\gamelogic" /I "..\..\..\..\source\gameengine\soundsystem" /I "..\..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\gameengine\network\loopbacknetwork" /I "..\..\..\..\source\sumo\include" /I "..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\source\sumo\fuzzics\include" /I "..\..\..\..\lib\windows\openal\include" /I "..\..\..\..\lib\windows\python\include\python1.5" /I "..\..\..\..\source\gameengine\gameplayer\common" /I "../../../../source/blender/blenkernel" /I "../../../../source/blender/makesdna" /I "../../../../source/blender/blenlib" /I "../../../../source/blender/blenloader" /I "../../../../source/blender/render/extern/include" /I "../../../../source/blender/imbuf" /I "..\..\..\..\source\gameengine\converter" /I "..\..\..\..\source\gameengine\GamePlayer\common" /I "..\..\..\..\source\gameengine\GamePlayer\common\windows" /I "..\..\..\..\lib\windows\iksolver\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# SUBTRACT BASE CPP /Fr -# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /O2 /I "..\..\..\..\lib\windows\python\include\python2.0" /I "..\..\..\..\lib\windows\bmfont\include" /I "..\..\..\..\lib\windows\string\include" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\expressions" /I "..\..\..\..\source\gameengine\ketsji" /I "..\..\..\..\source\gameengine\ketsji\kxnetwork" /I "..\..\..\..\source\gameengine\rasterizer" /I "..\..\..\..\source\gameengine\rasterizer\ras_openglrasterizer" /I "..\..\..\..\source\gameengine\scenegraph" /I "..\..\..\..\source\gameengine\gamelogic" /I "..\..\..\..\source\gameengine\soundsystem" /I "..\..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\gameengine\network\loopbacknetwork" /I "..\..\..\..\source\sumo\include" /I "..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\source\sumo\fuzzics\include" /I "..\..\..\..\lib\windows\openal\include" /I "..\..\..\..\source\gameengine\gameplayer\common" /I "../../../../source/blender/blenkernel" /I "../../../../source/blender/makesdna" /I "../../../../source/blender/blenlib" /I "../../../../source/blender/blenloader" /I "../../../../source/blender/render/extern/include" /I "../../../../source/blender/imbuf" /I "..\..\..\..\source\gameengine\converter" /I "..\..\..\..\source\gameengine\GamePlayer\common" /I "..\..\..\..\source\gameengine\GamePlayer\common\windows" /I "..\..\..\..\lib\windows\iksolver\include" /D "WIN32" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /D "_MBCS" /D "_USRDLL" /U "_DEBUG" /YX /FD /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL" -# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 opengl32.lib glu32.lib glaux.lib dxguid.lib ole32.lib libjpeg.lib openal_static.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"..\..\..\..\..\obj\windows\debug\BlenderPlayer.ocx" /pdbtype:sept /libpath:"../../../../lib/windows/python/lib" /libpath:"../../../../lib/windows/jpeg/lib" /libpath:"../../../../lib/windows/openal/lib/debug_MT" -# SUBTRACT BASE LINK32 /nodefaultlib -# ADD LINK32 libbmfont.a libstring.a ws2_32.lib opengl32.lib glu32.lib glaux.lib dxguid.lib ole32.lib libjpeg.lib openal_static.lib libblenkey.a libeay32.lib libz.a libpng.a /nologo /subsystem:windows /dll /debug /machine:I386 /out:"..\..\..\..\..\obj\windows\profile\BlenderPlayer.ocx" /pdbtype:sept /libpath:"../../../../lib/windows/openal/lib/debug_MT" /libpath:"../../../../lib/windows/bmfont/lib" /libpath:"../../../../lib/windows/string/lib" /libpath:"../../../../lib/windows/python/lib" /libpath:"../../../../lib/windows/jpeg/lib" /libpath:"..\..\..\..\lib\windows\openssl\lib" /libpath:"..\..\..\..\lib\windows\zlib\lib\\" /libpath:"..\..\..\..\lib\windows\blenkey\lib\\" /libpath:"..\..\..\..\lib\windows\png\lib" -# SUBTRACT LINK32 /nodefaultlib -# Begin Custom Build - Registering ActiveX Control... -OutDir=.\GP_axctl___Win32_Profile -TargetPath=\Documents and Settings\maarten\My Documents\obj\windows\profile\BlenderPlayer.ocx -InputPath=\Documents and Settings\maarten\My Documents\obj\windows\profile\BlenderPlayer.ocx -SOURCE="$(InputPath)" - -"$(OutDir)\regsvr32.trg" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - regsvr32 /s /c "$(TargetPath)" - echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg" - -# End Custom Build !ENDIF @@ -162,7 +96,6 @@ SOURCE="$(InputPath)" # Name "GP_axctl - Win32 MT DLL Debug" # Name "GP_axctl - Win32 MT DLL Release" -# Name "GP_axctl - Win32 Profile" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" diff --git a/projectfiles/gameengine/gameplayer/common/GP_common.dsp b/projectfiles/gameengine/gameplayer/common/GP_common.dsp index 89c4e8d6eca..5462524f903 100644 --- a/projectfiles/gameengine/gameplayer/common/GP_common.dsp +++ b/projectfiles/gameengine/gameplayer/common/GP_common.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Static Library" 0x0104 -CFG=GP_common - Win32 Profile +CFG=GP_common - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,7 +13,7 @@ CFG=GP_common - Win32 Profile !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 "GP_common.mak" CFG="GP_common - Win32 Profile" +!MESSAGE NMAKE /f "GP_common.mak" CFG="GP_common - Win32 Release" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -21,7 +21,6 @@ CFG=GP_common - Win32 Profile !MESSAGE "GP_common - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE "GP_common - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library") !MESSAGE "GP_common - Win32 MT DLL Release" (based on "Win32 (x86) Static Library") -!MESSAGE "GP_common - Win32 Profile" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -64,12 +63,12 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "..\..\..\..\..\obj\windows\gameengine\gameplayer\common\debug" +# PROP Output_Dir "..\..\..\..\obj\windows\gameengine\gameplayer\common\debug" +# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\gameplayer\common\debug" # PROP Target_Dir "" LINK32=link.exe -lib # 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 /Gm /GX /Zi /Od /I "..\..\..\..\lib\windows\python\include\python2.0" /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\..\source\gameengine\Converter" /I "..\..\..\..\source\gameengine\soundsystem\snd_dummy" /I "..\..\..\..\lib\windows\bmfont\include" /I "..\..\..\..\lib\windows\string\include" /I "..\..\..\lib\windows\string\include" /I "..\..\..\..\source\gameengine\expressions" /I "..\..\..\..\source\gameengine\ketsji" /I "..\..\..\..\source\gameengine\GamePlayer\common\\" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\ketsji\kxnetwork" /I "..\..\..\..\source\gameengine\rasterizer" /I "..\..\..\..\source\gameengine\rasterizer\ras_openglrasterizer" /I "..\..\..\..\source\gameengine\scenegraph" /I "..\..\..\..\source\gameengine\gamelogic" /I "..\..\..\..\source\gameengine\soundsystem" /I "..\..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\gameengine\network\loopbacknetwork" /I "..\..\..\..\source\sumo\include" /I "..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\source\sumo\fuzzics\include" /I "..\..\..\..\lib\windows\openal\include" /I "../../../../source/blender/blenkernel" /I "../../../../source/blender/makesdna" /I "../../../../source/blender/blenlib" /I "../../../../source/blender/blenloader" /I "../../../../source/blender/render/extern/include" /I "../../../../source/blender/imbuf" /D "WIN32" /D "_MBCS" /D "_LIB" /U "_DEBUG" /YX /FD /GZ /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\lib\windows\python\include\python2.2" /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\..\source\gameengine\Converter" /I "..\..\..\..\source\gameengine\soundsystem\snd_dummy" /I "..\..\..\..\lib\windows\bmfont\include" /I "..\..\..\..\lib\windows\string\include" /I "..\..\..\lib\windows\string\include" /I "..\..\..\..\source\gameengine\expressions" /I "..\..\..\..\source\gameengine\ketsji" /I "..\..\..\..\source\gameengine\GamePlayer\common\\" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\ketsji\kxnetwork" /I "..\..\..\..\source\gameengine\rasterizer" /I "..\..\..\..\source\gameengine\rasterizer\ras_openglrasterizer" /I "..\..\..\..\source\gameengine\scenegraph" /I "..\..\..\..\source\gameengine\gamelogic" /I "..\..\..\..\source\gameengine\soundsystem" /I "..\..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\gameengine\network\loopbacknetwork" /I "..\..\..\..\source\sumo\include" /I "..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\source\sumo\fuzzics\include" /I "..\..\..\..\lib\windows\openal\include" /I "../../../../source/blender/blenkernel" /I "../../../../source/blender/makesdna" /I "../../../../source/blender/blenlib" /I "../../../../source/blender/blenloader" /I "../../../../source/blender/render/extern/include" /I "../../../../source/blender/imbuf" /D "WIN32" /D "_MBCS" /D "_LIB" /U "_DEBUG" /YX /FD /GZ /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe @@ -77,7 +76,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\..\..\obj\windows\gameengine\gameplayer\common\debug\GP_common.lib" +# ADD LIB32 /nologo !ELSEIF "$(CFG)" == "GP_common - Win32 MT DLL Debug" @@ -128,30 +127,6 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\gameengine\gameplayer\common\GP_common.lib" # ADD LIB32 /nologo -!ELSEIF "$(CFG)" == "GP_common - Win32 Profile" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "GP_common___Win32_Profile" -# PROP BASE Intermediate_Dir "GP_common___Win32_Profile" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "GP_common___Win32_Profile" -# PROP Intermediate_Dir "GP_common___Win32_Profile" -# PROP Target_Dir "" -LINK32=link.exe -lib -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\source\gameengine\expressions" /I "..\..\..\..\source\gameengine\ketsji" /I "..\..\..\..\source\gameengine\GamePlayer\common\\" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\ketsji\kxnetwork" /I "..\..\..\..\source\gameengine\rasterizer" /I "..\..\..\..\source\gameengine\rasterizer\ras_openglrasterizer" /I "..\..\..\..\source\gameengine\scenegraph" /I "..\..\..\..\source\gameengine\gamelogic" /I "..\..\..\..\source\gameengine\soundsystem" /I "..\..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\gameengine\network\loopbacknetwork" /I "..\..\..\..\source\sumo\include" /I "..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\source\sumo\fuzzics\include" /I "..\..\..\..\lib\windows\openal\include" /I "..\..\..\..\lib\windows\python\include\python1.5" /I "../../../../source/blender/blenkernel" /I "../../../../source/blender/makesdna" /I "../../../../source/blender/blenlib" /I "../../../../source/blender/blenloader" /I "../../../../source/blender/render/extern/include" /I "../../../../source/blender/imbuf" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /FD /GZ /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /Zi /O2 /I "..\..\..\..\lib\windows\python\include\python2.0" /I "..\..\..\..\lib\windows\bmfont\include" /I "..\..\..\..\lib\windows\string\include" /I "..\..\..\lib\windows\string\include" /I "..\..\..\..\source\gameengine\expressions" /I "..\..\..\..\source\gameengine\ketsji" /I "..\..\..\..\source\gameengine\GamePlayer\common\\" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\ketsji\kxnetwork" /I "..\..\..\..\source\gameengine\rasterizer" /I "..\..\..\..\source\gameengine\rasterizer\ras_openglrasterizer" /I "..\..\..\..\source\gameengine\scenegraph" /I "..\..\..\..\source\gameengine\gamelogic" /I "..\..\..\..\source\gameengine\soundsystem" /I "..\..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\gameengine\network\loopbacknetwork" /I "..\..\..\..\source\sumo\include" /I "..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\source\sumo\fuzzics\include" /I "..\..\..\..\lib\windows\openal\include" /I "../../../../source/blender/blenkernel" /I "../../../../source/blender/makesdna" /I "../../../../source/blender/blenlib" /I "../../../../source/blender/blenloader" /I "../../../../source/blender/render/extern/include" /I "../../../../source/blender/imbuf" /D "WIN32" /D "_MBCS" /D "_LIB" /U "_DEBUG" /YX /FD /GZ /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\gameengine\gameplayer\common\debug\GP_common.lib" -# ADD LIB32 /nologo /out:"..\..\..\..\..\obj\windows\gameengine\gameplayer\common\profile\GP_common.lib" - !ENDIF # Begin Target @@ -160,7 +135,6 @@ LIB32=link.exe -lib # Name "GP_common - Win32 Debug" # Name "GP_common - Win32 MT DLL Debug" # Name "GP_common - Win32 MT DLL Release" -# Name "GP_common - Win32 Profile" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" diff --git a/projectfiles/gameengine/gameplayer/ghost/GP_ghost.dsp b/projectfiles/gameengine/gameplayer/ghost/GP_ghost.dsp index 0778a4ed3d2..8b0df07a3fc 100644 --- a/projectfiles/gameengine/gameplayer/ghost/GP_ghost.dsp +++ b/projectfiles/gameengine/gameplayer/ghost/GP_ghost.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103 -CFG=GP_ghost - Win32 Profile +CFG=GP_ghost - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,13 +13,12 @@ CFG=GP_ghost - Win32 Profile !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 "GP_ghost.mak" CFG="GP_ghost - Win32 Profile" +!MESSAGE NMAKE /f "GP_ghost.mak" CFG="GP_ghost - Win32 Release" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "GP_ghost - Win32 Release" (based on "Win32 (x86) Console Application") !MESSAGE "GP_ghost - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE "GP_ghost - Win32 Profile" (based on "Win32 (x86) Console Application") !MESSAGE # Begin Project @@ -63,12 +62,12 @@ LINK32=link.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\..\..\..\..\obj\windows\debug" -# PROP Intermediate_Dir "..\..\..\..\..\obj\windows\gameengine\gameplayer\ghost\debug" +# PROP Output_Dir "..\..\..\..\obj\windows\debug" +# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\gameplayer\ghost\debug" # 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" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../../../lib/windows/moto/include" /I "..\..\..\..\source\gameengine\Physics\Ode" /I "..\..\..\..\source\gameengine\Physics" /I "..\..\..\..\lib\windows\python\include\python2.0" /I "..\..\..\..\lib\windows\bmfont\include" /I "..\..\..\..\source\kernel\gen_messaging" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\expressions" /I "..\..\..\..\source\gameengine\ketsji" /I "..\..\..\..\source\gameengine\ketsji\kxnetwork" /I "..\..\..\..\source\gameengine\rasterizer" /I "..\..\..\..\source\gameengine\rasterizer\ras_openglrasterizer" /I "..\..\..\..\source\gameengine\scenegraph" /I "..\..\..\..\source\gameengine\gamelogic" /I "..\..\..\..\source\gameengine\soundsystem" /I "..\..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\gameengine\network\loopbacknetwork" /I "..\..\..\..\source\sumo\include" /I "..\..\..\..\source\sumo\fuzzics\include" /I "..\..\..\..\lib\windows\openal\include" /I "..\..\..\..\source\gameengine\gameplayer\common" /I "../../../../source/blender/blenkernel" /I "../../../../source/blender/makesdna" /I "../../../../source/blender/blenlib" /I "../../../../source/blender/blenloader" /I "../../../../source/blender/readblenfile" /I "../../../../source/blender/render/extern/include" /I "../../../../source/blender/imbuf" /I "..\..\..\..\source\gameengine\converter" /I "..\..\..\..\source\gameengine\gameplayer\common\windows" /I "..\..\..\..\lib\windows\string\include" /I "..\..\..\..\lib\windows\ghost\include" /I "../../../../lib/windows/iksolver/include" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /U "_DEBUG" /YX /FD /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../../../lib/windows/moto/include" /I "..\..\..\..\source\gameengine\Physics\Ode" /I "..\..\..\..\source\gameengine\Physics" /I "..\..\..\..\lib\windows\python\include\python2.2" /I "..\..\..\..\lib\windows\bmfont\include" /I "..\..\..\..\source\kernel\gen_messaging" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\expressions" /I "..\..\..\..\source\gameengine\ketsji" /I "..\..\..\..\source\gameengine\ketsji\kxnetwork" /I "..\..\..\..\source\gameengine\rasterizer" /I "..\..\..\..\source\gameengine\rasterizer\ras_openglrasterizer" /I "..\..\..\..\source\gameengine\scenegraph" /I "..\..\..\..\source\gameengine\gamelogic" /I "..\..\..\..\source\gameengine\soundsystem" /I "..\..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\gameengine\network\loopbacknetwork" /I "..\..\..\..\source\sumo\include" /I "..\..\..\..\source\sumo\fuzzics\include" /I "..\..\..\..\lib\windows\openal\include" /I "..\..\..\..\source\gameengine\gameplayer\common" /I "../../../../source/blender/blenkernel" /I "../../../../source/blender/makesdna" /I "../../../../source/blender/blenlib" /I "../../../../source/blender/blenloader" /I "../../../../source/blender/readblenfile" /I "../../../../source/blender/render/extern/include" /I "../../../../source/blender/imbuf" /I "..\..\..\..\source\gameengine\converter" /I "..\..\..\..\source\gameengine\gameplayer\common\windows" /I "..\..\..\..\lib\windows\string\include" /I "..\..\..\..\lib\windows\ghost\include" /I "../../../../lib/windows/iksolver/include" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /U "_DEBUG" /YX /FD /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe @@ -76,33 +75,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 /debug /machine:I386 /pdbtype:sept -# ADD LINK32 libguardedalloc.a libstring.a libghost.a odelib.lib fmodvc.lib libbmfont.a ws2_32.lib kernel32.lib user32.lib gdi32.lib vfw32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libjpeg.lib opengl32.lib glu32.lib openal_static.lib dxguid.lib libblenkey.a libeay32.lib libpng.a libz.a libmoto.a /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib" /nodefaultlib:"msvcrt.lib" /nodefaultlib:"msvcrtd.lib" /nodefaultlib:"msvcprtd.lib" /out:"..\..\..\..\..\obj\windows\debug/blenderplayer.exe" /pdbtype:sept /libpath:"..\..\..\..\lib\windows\bmfont\lib\debug" /libpath:"..\..\..\..\lib\windows\guardedalloc\lib" /libpath:"..\..\..\..\lib\windows\string\lib\\" /libpath:"..\..\..\..\lib\windows\ghost\lib\debug" /libpath:"..\..\..\..\lib\windows\jpeg\lib" /libpath:"..\..\..\..\lib\windows\moto\lib\\" /libpath:"..\..\..\..\lib\windows\zlib\lib\\" /libpath:"..\..\..\..\lib\windows\png\lib\\" /libpath:"..\..\..\..\lib\windows\ode-0.03\lib" /libpath:"../../../../lib/windows/fmod/lib" /libpath:"..\..\..\..\lib\windows\python\lib" /libpath:"../../../../lib/windows/openal/lib" /libpath:"..\..\..\..\lib\windows\openssl\lib" /libpath:"..\..\..\..\lib\windows\blenkey\lib\\" -# SUBTRACT LINK32 /pdb:none - -!ELSEIF "$(CFG)" == "GP_ghost - Win32 Profile" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "GP_ghost___Win32_Profile" -# PROP BASE Intermediate_Dir "GP_ghost___Win32_Profile" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "GP_ghost___Win32_Profile" -# PROP Intermediate_Dir "GP_ghost___Win32_Profile" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /O2 /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\expressions" /I "..\..\..\..\source\gameengine\ketsji" /I "..\..\..\..\source\gameengine\ketsji\kxnetwork" /I "..\..\..\..\source\gameengine\rasterizer" /I "..\..\..\..\source\gameengine\rasterizer\ras_openglrasterizer" /I "..\..\..\..\source\gameengine\scenegraph" /I "..\..\..\..\source\gameengine\gamelogic" /I "..\..\..\..\source\gameengine\soundsystem" /I "..\..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\gameengine\network\loopbacknetwork" /I "..\..\..\..\source\gameengine\GamePlayer\Netscape\windows_sdk" /I "..\..\..\..\source\sumo\include" /I "..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\source\sumo\fuzzics\include" /I "..\..\..\..\lib\windows\openal\include" /I "..\..\..\..\lib\windows\python\include\python1.5" /I "..\..\..\..\source\gameengine\gameplayer\common" /I "../../../../source/blender/blenkernel" /I "../../../../source/blender/makesdna" /I "../../../../source/blender/blenlib" /I "../../../../source/blender/blenloader" /I "../../../../source/blender/render/extern/include" /I "../../../../source/blender/imbuf" /I "..\..\..\..\source\gameengine\converter" /I "..\..\..\..\source\gameengine\gameplayer\common\windows" /I "..\..\..\..\lib\windows\string\include" /I "..\..\..\..\lib\windows\ghost\include" /I "../../../../lib/windows/iksolver/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /W3 /Gm /GX /Zi /O2 /I "..\..\..\..\source\gameengine\GamePlayer\Netscape\windows_sdk" /I "..\..\..\..\lib\windows\moto\include" /I "..\..\..\..\source\gameengine\Physics\Ode" /I "..\..\..\..\source\gameengine\Physics" /I "..\..\..\..\lib\windows\python\include\python2.0" /I "..\..\..\..\lib\windows\bmfont\include" /I "..\..\..\..\source\kernel\gen_messaging" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\expressions" /I "..\..\..\..\source\gameengine\ketsji" /I "..\..\..\..\source\gameengine\ketsji\kxnetwork" /I "..\..\..\..\source\gameengine\rasterizer" /I "..\..\..\..\source\gameengine\rasterizer\ras_openglrasterizer" /I "..\..\..\..\source\gameengine\scenegraph" /I "..\..\..\..\source\gameengine\gamelogic" /I "..\..\..\..\source\gameengine\soundsystem" /I "..\..\..\..\source\gameengine\soundsystem\snd_openal" /I "..\..\..\..\source\gameengine\network" /I "..\..\..\..\source\gameengine\network\loopbacknetwork" /I "..\..\..\..\source\sumo\include" /I "..\..\..\..\source\sumo\fuzzics\include" /I "..\..\..\..\lib\windows\openal\include" /I "..\..\..\..\source\gameengine\gameplayer\common" /I "../../../../source/blender/blenkernel" /I "../../../../source/blender/makesdna" /I "../../../../source/blender/blenlib" /I "../../../../source/blender/blenloader" /I "../../../../source/blender/readblenfile" /I "../../../../source/blender/render/extern/include" /I "../../../../source/blender/imbuf" /I "..\..\..\..\source\gameengine\converter" /I "..\..\..\..\source\gameengine\gameplayer\common\windows" /I "..\..\..\..\lib\windows\string\include" /I "..\..\..\..\lib\windows\ghost\include" /I "../../../../lib/windows/iksolver/include" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /U "_DEBUG" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -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 libjpeg.lib opengl32.lib glu32.lib openal_static.lib dxguid.lib string.lib ghost.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\lib\windows\python\lib" /libpath:"..\..\..\..\lib\windows\jpeg/lib" /libpath:"../../../../lib/windows/openal/lib" /libpath:"..\..\..\..\lib\windows\string\lib\debug" /libpath:"..\..\..\..\lib\windows\ghost\lib\debug" -# ADD LINK32 string.lib ghost.lib odelib.lib fmodvc.lib libbmfont.a ws2_32.lib kernel32.lib user32.lib gdi32.lib vfw32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libjpeg.lib opengl32.lib glu32.lib openal_static.lib dxguid.lib libblenkey.a libeay32.lib libpng.a libz.a libmoto.a /nologo /subsystem:console /debug /machine:I386 /out:"GP_ghost___Win32_Profile/blenderplayer.exe" /pdbtype:sept /libpath:"..\..\..\..\lib\windows\string\lib\debug" /libpath:"..\..\..\..\lib\windows\ghost\lib\debug" /libpath:"..\..\..\..\lib\windows\jpeg/lib" /libpath:"..\..\lib\windows\moto\lib\\" /libpath:"..\..\..\..\lib\windows\zlib\lib\\" /libpath:"..\..\..\..\lib\windows\ode-0.03\lib" /libpath:"../../../../lib/windows/fmod/lib" /libpath:"..\..\..\..\lib\windows\python\lib" /libpath:"../../../../lib/windows/openal/lib" /libpath:"..\..\..\..\lib\windows\openssl\lib" /libpath:"..\..\..\..\lib\windows\blenkey\lib\\" +# ADD LINK32 libguardedalloc.a libstring.a libghost.a odelib.lib fmodvc.lib libbmfont.a ws2_32.lib kernel32.lib user32.lib gdi32.lib vfw32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libjpeg.lib opengl32.lib glu32.lib openal_static.lib dxguid.lib libblenkey.a libeay32.lib libpng.a libz.a libmoto.a /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib" /nodefaultlib:"msvcrt.lib" /nodefaultlib:"msvcrtd.lib" /nodefaultlib:"msvcprtd.lib" /out:"..\..\..\..\obj\windows\debug\blenderplayer.exe" /pdbtype:sept /libpath:"..\..\..\..\source\ode\lib" /libpath:"..\..\..\..\lib\windows\bmfont\lib\debug" /libpath:"..\..\..\..\lib\windows\guardedalloc\lib" /libpath:"..\..\..\..\lib\windows\string\lib\\" /libpath:"..\..\..\..\lib\windows\ghost\lib\debug" /libpath:"..\..\..\..\lib\windows\jpeg\lib" /libpath:"..\..\..\..\lib\windows\moto\lib\\" /libpath:"..\..\..\..\lib\windows\zlib\lib\\" /libpath:"..\..\..\..\lib\windows\png\lib\\" /libpath:"..\..\..\..\lib\windows\ode-0.03\lib" /libpath:"../../../../lib/windows/fmod/lib" /libpath:"..\..\..\..\lib\windows\python\lib" /libpath:"../../../../lib/windows/openal/lib" /libpath:"..\..\..\..\lib\windows\openssl\lib" /libpath:"..\..\..\..\lib\windows\blenkey\lib\\" # SUBTRACT LINK32 /pdb:none !ENDIF @@ -111,7 +84,6 @@ LINK32=link.exe # Name "GP_ghost - Win32 Release" # Name "GP_ghost - Win32 Debug" -# Name "GP_ghost - Win32 Profile" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" diff --git a/projectfiles/gameengine/ketsji/KX_ketsji.dsp b/projectfiles/gameengine/ketsji/KX_ketsji.dsp index a2016752fd8..eccb2089d3a 100644 --- a/projectfiles/gameengine/ketsji/KX_ketsji.dsp +++ b/projectfiles/gameengine/ketsji/KX_ketsji.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Static Library" 0x0104 -CFG=KX_ketsji - Win32 Profile +CFG=KX_ketsji - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,7 +13,7 @@ CFG=KX_ketsji - Win32 Profile !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 "KX_ketsji.mak" CFG="KX_ketsji - Win32 Profile" +!MESSAGE NMAKE /f "KX_ketsji.mak" CFG="KX_ketsji - Win32 Release" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -21,7 +21,6 @@ CFG=KX_ketsji - Win32 Profile !MESSAGE "KX_ketsji - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE "KX_ketsji - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library") !MESSAGE "KX_ketsji - Win32 MT DLL Release" (based on "Win32 (x86) Static Library") -!MESSAGE "KX_ketsji - Win32 Profile" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -64,12 +63,12 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\ketsji\debug" +# PROP Output_Dir "..\..\..\obj\windows\gameengine\ketsji\debug" +# PROP Intermediate_Dir "..\..\..\obj\windows\gameengine\ketsji\debug" # PROP Target_Dir "" LINK32=link.exe -lib # 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 /Gm /GX /Zi /Od /I "..\..\..\source\gameengine\physics\common\dummy" /I "..\..\..\lib\windows\python\include\python2.0" /I "..\..\..\lib\windows\string\include" /I "..\..\..\lib\windows\moto\include" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\gameengine\soundsystem" /I "..\..\..\source\gameengine\rasterizer" /I "..\..\..\source\gameengine\scenegraph" /I "..\..\..\source\gameengine\gamelogic" /I "..\..\..\source\gameengine\expressions" /I "..\..\..\source\sumo\include" /I "..\..\..\source\sumo\fuzzics\include" /I "..\..\..\source\gameengine\network" /I "..\..\..\source\gameengine\ketsji\kxnetwork" /I "..\..\..\source\gameengine\physics" /I "..\..\..\source\gameengine\physics\common" /I "..\..\..\source\gameengine\physics\dummy" /I "..\..\..\source\gameengine\physics\sumo" /I "..\..\..\source\gameengine\physics\sumo\fuzzics\include" /I "..\..\..\source\gameengine\physics\sumo\include" /D "JANCODEPANCO" /D "WIN32" /D "_MBCS" /D "_LIB" /D "EXP_PYTHON_EMBEDDING" /U "_DEBUG" /YX /J /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\..\source\gameengine\physics\common\dummy" /I "..\..\..\lib\windows\python\include\python2.2" /I "..\..\..\lib\windows\string\include" /I "..\..\..\lib\windows\moto\include" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\gameengine\soundsystem" /I "..\..\..\source\gameengine\rasterizer" /I "..\..\..\source\gameengine\scenegraph" /I "..\..\..\source\gameengine\gamelogic" /I "..\..\..\source\gameengine\expressions" /I "..\..\..\source\sumo\include" /I "..\..\..\source\sumo\fuzzics\include" /I "..\..\..\source\gameengine\network" /I "..\..\..\source\gameengine\ketsji\kxnetwork" /I "..\..\..\source\gameengine\physics" /I "..\..\..\source\gameengine\physics\common" /I "..\..\..\source\gameengine\physics\dummy" /I "..\..\..\source\gameengine\physics\sumo" /I "..\..\..\source\gameengine\physics\sumo\fuzzics\include" /I "..\..\..\source\gameengine\physics\sumo\include" /I "..\..\..\source\gameengine\physics\BlOde" /D "JANCODEPANCO" /D "WIN32" /D "_MBCS" /D "_LIB" /D "EXP_PYTHON_EMBEDDING" /U "_DEBUG" /YX /J /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe @@ -77,7 +76,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\gameengine\ketsji\debug\KX_ketsji.lib" +# ADD LIB32 /nologo !ELSEIF "$(CFG)" == "KX_ketsji - Win32 MT DLL Debug" @@ -127,30 +126,6 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\gameengine\ketsji\KX_ketsji.lib" # ADD LIB32 /nologo -!ELSEIF "$(CFG)" == "KX_ketsji - Win32 Profile" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "KX_ketsji___Win32_Profile" -# PROP BASE Intermediate_Dir "KX_ketsji___Win32_Profile" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "KX_ketsji___Win32_Profile" -# PROP Intermediate_Dir "KX_ketsji___Win32_Profile" -# PROP Target_Dir "" -LINK32=link.exe -lib -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\lib\windows\python\include\python1.5" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\gameengine\soundsystem" /I "..\..\..\source\gameengine\rasterizer" /I "..\..\..\source\gameengine\scenegraph" /I "..\..\..\source\gameengine\gamelogic" /I "..\..\..\source\gameengine\expressions" /I "..\..\..\source\sumo\include" /I "..\..\..\source\sumo\fuzzics\include" /I "..\..\..\lib\windows\moto\include" /I "..\..\..\source\gameengine\network" /I "..\..\..\source\gameengine\ketsji\kxnetwork" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "EXP_PYTHON_EMBEDDING" /YX /J /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /Zi /O2 /I "..\..\..\source\gameengine\physics\dummy" /I "..\..\..\lib\windows\python\include\python2.0" /I "..\..\..\lib\windows\string\include" /I "..\..\..\lib\windows\moto\include" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\source\gameengine\soundsystem" /I "..\..\..\source\gameengine\rasterizer" /I "..\..\..\source\gameengine\scenegraph" /I "..\..\..\source\gameengine\gamelogic" /I "..\..\..\source\gameengine\expressions" /I "..\..\..\source\sumo\include" /I "..\..\..\source\sumo\fuzzics\include" /I "..\..\..\source\gameengine\network" /I "..\..\..\source\gameengine\ketsji\kxnetwork" /I "..\..\..\source\gameengine\physics" /I "..\..\..\source\gameengine\physics\common" /I "..\..\..\source\gameengine\physics\sumo" /I "..\..\..\source\gameengine\physics\sumo\fuzzics\include" /I "..\..\..\source\gameengine\physics\sumo\include" /D "WIN32" /D "_MBCS" /D "_LIB" /D "EXP_PYTHON_EMBEDDING" /U "_DEBUG" /YX /J /FD /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\..\..\obj\windows\gameengine\ketsji\debug\KX_ketsji.lib" -# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\gameengine\ketsji\profile\KX_ketsji.lib" - !ENDIF # Begin Target @@ -159,7 +134,6 @@ LIB32=link.exe -lib # Name "KX_ketsji - Win32 Debug" # Name "KX_ketsji - Win32 MT DLL Debug" # Name "KX_ketsji - Win32 MT DLL Release" -# Name "KX_ketsji - Win32 Profile" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" @@ -333,6 +307,10 @@ SOURCE=..\..\..\source\gameengine\Ketsji\KX_MotionState.h # End Source File # Begin Source File +SOURCE=..\..\..\source\gameengine\Ketsji\KX_OdePhysicsController.cpp +# End Source File +# Begin Source File + SOURCE=..\..\..\source\gameengine\Ketsji\KX_PhysicsObjectWrapper.cpp # End Source File # Begin Source File diff --git a/projectfiles/gameengine/ketsji/network/KX_network.dsp b/projectfiles/gameengine/ketsji/network/KX_network.dsp index c4fed906988..dc865b22324 100644 --- a/projectfiles/gameengine/ketsji/network/KX_network.dsp +++ b/projectfiles/gameengine/ketsji/network/KX_network.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Static Library" 0x0104 -CFG=KX_network - Win32 Profile +CFG=KX_network - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,7 +13,7 @@ CFG=KX_network - Win32 Profile !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 "KX_network.mak" CFG="KX_network - Win32 Profile" +!MESSAGE NMAKE /f "KX_network.mak" CFG="KX_network - Win32 Release" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -21,7 +21,6 @@ CFG=KX_network - Win32 Profile !MESSAGE "KX_network - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE "KX_network - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library") !MESSAGE "KX_network - Win32 MT DLL Release" (based on "Win32 (x86) Static Library") -!MESSAGE "KX_network - Win32 Profile" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -64,12 +63,12 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "..\..\..\..\..\obj\windows\gameengine\ketsji\network\debug" +# PROP Output_Dir "..\..\..\..\obj\windows\gameengine\ketsji\network\debug" +# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\ketsji\network\debug" # PROP Target_Dir "" LINK32=link.exe -lib # 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 /Gm /GX /Zi /Od /I "..\..\..\..\lib\windows\python\include\python2.0" /I "..\..\..\..\lib\windows\string\include" /I "..\..\..\..\source\gameengine\ketsji" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\GameLogic" /I "..\..\..\..\source\gameengine\expressions" /I "..\..\..\..\source\gameengine\Network" /D "WIN32" /D "_MBCS" /D "_LIB" /U "_DEBUG" /YX /J /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\lib\windows\python\include\python2.2" /I "..\..\..\..\lib\windows\string\include" /I "..\..\..\..\source\gameengine\ketsji" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\GameLogic" /I "..\..\..\..\source\gameengine\expressions" /I "..\..\..\..\source\gameengine\Network" /D "WIN32" /D "_MBCS" /D "_LIB" /U "_DEBUG" /YX /J /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe @@ -77,7 +76,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\..\..\obj\windows\gameengine\ketsji\network\debug\KX_network.lib" +# ADD LIB32 /nologo !ELSEIF "$(CFG)" == "KX_network - Win32 MT DLL Debug" @@ -127,30 +126,6 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\..\..\..\..\..\obj\windows\gameengine\ketsji\network\KX_network.lib" # ADD LIB32 /nologo -!ELSEIF "$(CFG)" == "KX_network - Win32 Profile" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "KX_network___Win32_Profile" -# PROP BASE Intermediate_Dir "KX_network___Win32_Profile" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "KX_network___Win32_Profile" -# PROP Intermediate_Dir "KX_network___Win32_Profile" -# PROP Target_Dir "" -LINK32=link.exe -lib -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\GameLogic" /I "..\..\..\..\source\gameengine\expressions" /I "..\..\..\..\source\gameengine\Network" /I "..\..\..\..\lib\windows\python\include\python1.5" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /Zi /O2 /I "..\..\..\..\lib\windows\python\include\python2.0" /I "..\..\..\..\lib\windows\string\include" /I "..\..\..\..\source\gameengine\ketsji" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\GameLogic" /I "..\..\..\..\source\gameengine\expressions" /I "..\..\..\..\source\gameengine\Network" /D "WIN32" /D "_MBCS" /D "_LIB" /U "_DEBUG" /YX /J /FD /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\gameengine\ketsji\network\debug\KX_network.lib" -# ADD LIB32 /nologo /out:"..\..\..\..\..\obj\windows\gameengine\ketsji\network\profile\KX_network.lib" - !ENDIF # Begin Target @@ -159,7 +134,6 @@ LIB32=link.exe -lib # Name "KX_network - Win32 Debug" # Name "KX_network - Win32 MT DLL Debug" # Name "KX_network - Win32 MT DLL Release" -# Name "KX_network - Win32 Profile" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" diff --git a/projectfiles/gameengine/network/loopbacknetwork/NG_loopbacknetwork.dsp b/projectfiles/gameengine/network/loopbacknetwork/NG_loopbacknetwork.dsp index 317c14d7bed..524838703a3 100644 --- a/projectfiles/gameengine/network/loopbacknetwork/NG_loopbacknetwork.dsp +++ b/projectfiles/gameengine/network/loopbacknetwork/NG_loopbacknetwork.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Static Library" 0x0104 -CFG=NG_loopbacknetwork - Win32 Profile +CFG=NG_loopbacknetwork - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,7 +13,7 @@ CFG=NG_loopbacknetwork - Win32 Profile !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 "NG_loopbacknetwork.mak" CFG="NG_loopbacknetwork - Win32 Profile" +!MESSAGE NMAKE /f "NG_loopbacknetwork.mak" CFG="NG_loopbacknetwork - Win32 Release" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -21,7 +21,6 @@ CFG=NG_loopbacknetwork - Win32 Profile !MESSAGE "NG_loopbacknetwork - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE "NG_loopbacknetwork - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library") !MESSAGE "NG_loopbacknetwork - Win32 MT DLL Release" (based on "Win32 (x86) Static Library") -!MESSAGE "NG_loopbacknetwork - Win32 Profile" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -64,8 +63,8 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "..\..\..\..\..\obj\windows\gameengine\network\loopbacknetwork\debug" +# PROP Output_Dir "..\..\..\..\obj\windows\gameengine\network\loopbacknetwork\debug" +# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\network\loopbacknetwork\debug" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c @@ -78,7 +77,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\..\..\obj\windows\gameengine\network\loopbacknetwork\debug\NG_loopbacknetwork.lib" +# ADD LIB32 /nologo !ELSEIF "$(CFG)" == "NG_loopbacknetwork - Win32 MT DLL Debug" @@ -128,30 +127,6 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\..\..\..\..\..\obj\windows\gameengine\network\loopbacknetwork\NG_loopbacknetwork.lib" # ADD LIB32 /nologo -!ELSEIF "$(CFG)" == "NG_loopbacknetwork - Win32 Profile" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "NG_loopbacknetwork___Win32_Profile" -# PROP BASE Intermediate_Dir "NG_loopbacknetwork___Win32_Profile" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "NG_loopbacknetwork___Win32_Profile" -# PROP Intermediate_Dir "NG_loopbacknetwork___Win32_Profile" -# PROP Target_Dir "" -LINK32=link.exe -lib -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\Network" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /Zi /O2 /I "..\..\..\..\lib\windows\string\include" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\Network" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\gameengine\network\loopbacknetwork\debug\NG_loopbacknetwork.lib" -# ADD LIB32 /nologo /out:"..\..\..\..\..\obj\windows\gameengine\network\loopbacknetwork\profile\NG_loopbacknetwork.lib" - !ENDIF # Begin Target @@ -160,7 +135,6 @@ LIB32=link.exe -lib # Name "NG_loopbacknetwork - Win32 Debug" # Name "NG_loopbacknetwork - Win32 MT DLL Debug" # Name "NG_loopbacknetwork - Win32 MT DLL Release" -# Name "NG_loopbacknetwork - Win32 Profile" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" diff --git a/projectfiles/gameengine/network/network/NG_network.dsp b/projectfiles/gameengine/network/network/NG_network.dsp index c63316af730..4db844ae874 100644 --- a/projectfiles/gameengine/network/network/NG_network.dsp +++ b/projectfiles/gameengine/network/network/NG_network.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Static Library" 0x0104 -CFG=NG_network - Win32 Profile +CFG=NG_network - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,7 +13,7 @@ CFG=NG_network - Win32 Profile !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 "NG_network.mak" CFG="NG_network - Win32 Profile" +!MESSAGE NMAKE /f "NG_network.mak" CFG="NG_network - Win32 Release" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -21,7 +21,6 @@ CFG=NG_network - Win32 Profile !MESSAGE "NG_network - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE "NG_network - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library") !MESSAGE "NG_network - Win32 MT DLL Release" (based on "Win32 (x86) Static Library") -!MESSAGE "NG_network - Win32 Profile" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -64,8 +63,8 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "..\..\..\..\..\obj\windows\gameengine\network\network\debug" +# PROP Output_Dir "..\..\..\..\obj\windows\gameengine\network\network\debug" +# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\network\network\debug" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c @@ -78,7 +77,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\..\..\obj\windows\gameengine\network\network\debug\NG_network.lib" +# ADD LIB32 /nologo !ELSEIF "$(CFG)" == "NG_network - Win32 MT DLL Debug" @@ -128,30 +127,6 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\..\..\..\..\..\obj\windows\gameengine\network\network\NG_network.lib" # ADD LIB32 /nologo -!ELSEIF "$(CFG)" == "NG_network - Win32 Profile" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "NG_network___Win32_Profile" -# PROP BASE Intermediate_Dir "NG_network___Win32_Profile" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "NG_network___Win32_Profile" -# PROP Intermediate_Dir "NG_network___Win32_Profile" -# PROP Target_Dir "" -LINK32=link.exe -lib -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\source\kernel\gen_system" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /Zi /O2 /I "..\..\..\..\lib\windows\string\include" /I "..\..\..\..\source\kernel\gen_system" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\gameengine\network\network\debug\NG_network.lib" -# ADD LIB32 /nologo /out:"..\..\..\..\..\obj\windows\gameengine\network\network\profile\NG_network.lib" - !ENDIF # Begin Target @@ -160,7 +135,6 @@ LIB32=link.exe -lib # Name "NG_network - Win32 Debug" # Name "NG_network - Win32 MT DLL Debug" # Name "NG_network - Win32 MT DLL Release" -# Name "NG_network - Win32 Profile" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" diff --git a/projectfiles/gameengine/physics/PHY_Physics/PHY_Dummy/PHY_Dummy.dsp b/projectfiles/gameengine/physics/PHY_Physics/PHY_Dummy/PHY_Dummy.dsp index f46ea4dffc7..a5617490415 100644 --- a/projectfiles/gameengine/physics/PHY_Physics/PHY_Dummy/PHY_Dummy.dsp +++ b/projectfiles/gameengine/physics/PHY_Physics/PHY_Dummy/PHY_Dummy.dsp @@ -61,8 +61,8 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" +# PROP Output_Dir "..\..\..\..\obj\windows\gameengine\physics\dummy\debug" +# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\physics\dummy\debug" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c diff --git a/projectfiles/gameengine/physics/PHY_Physics/PHY_Ode/PHY_Ode.dsp b/projectfiles/gameengine/physics/PHY_Physics/PHY_Ode/PHY_Ode.dsp new file mode 100644 index 00000000000..e08b179a8f5 --- /dev/null +++ b/projectfiles/gameengine/physics/PHY_Physics/PHY_Ode/PHY_Ode.dsp @@ -0,0 +1,110 @@ +# Microsoft Developer Studio Project File - Name="PHY_Ode" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Static Library" 0x0104 + +CFG=PHY_Ode - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "PHY_Ode.mak". +!MESSAGE +!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 "PHY_Ode.mak" CFG="PHY_Ode - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "PHY_Ode - Win32 Release" (based on "Win32 (x86) Static Library") +!MESSAGE "PHY_Ode - Win32 Debug" (based on "Win32 (x86) Static Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "PHY_Ode - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Target_Dir "" +LINK32=link.exe -lib +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c +# ADD CPP /nologo /W3 /GX /O2 /I "../../../../../source/gameengine/physics" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo + +!ELSEIF "$(CFG)" == "PHY_Ode - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\..\..\..\obj\windows\gameengine\physics\ode\debug" +# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\physics\ode\debug" +# PROP Target_Dir "" +LINK32=link.exe -lib +# 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 /Gm /GX /ZI /Od /I "../../../../../source/ode/include" /I "../../../../../source/gameengine/physics/common" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo + +!ENDIF + +# Begin Target + +# Name "PHY_Ode - Win32 Release" +# Name "PHY_Ode - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=..\..\..\..\..\source\gameengine\Physics\BlOde\OdePhysicsController.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\..\source\gameengine\Physics\BlOde\OdePhysicsEnvironment.cpp +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Source File + +SOURCE=..\..\..\..\..\source\gameengine\Physics\BlOde\OdePhysicsController.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\..\source\gameengine\Physics\BlOde\OdePhysicsEnvironment.h +# End Source File +# End Group +# End Target +# End Project diff --git a/projectfiles/gameengine/physics/PHY_Physics/PHY_Physics.dsp b/projectfiles/gameengine/physics/PHY_Physics/PHY_Physics.dsp index e029a772155..0ec8764e2d2 100644 --- a/projectfiles/gameengine/physics/PHY_Physics/PHY_Physics.dsp +++ b/projectfiles/gameengine/physics/PHY_Physics/PHY_Physics.dsp @@ -61,8 +61,8 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" +# PROP Output_Dir "..\..\..\obj\windows\gameengine\physics\debug" +# PROP Intermediate_Dir "..\..\..\obj\windows\gameengine\physics\debug" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c diff --git a/projectfiles/gameengine/rasterizer/RAS_rasterizer.dsp b/projectfiles/gameengine/rasterizer/RAS_rasterizer.dsp index 34d4e2ee70a..3a31154fd42 100644 --- a/projectfiles/gameengine/rasterizer/RAS_rasterizer.dsp +++ b/projectfiles/gameengine/rasterizer/RAS_rasterizer.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Static Library" 0x0104 -CFG=RAS_rasterizer - Win32 Profile +CFG=RAS_rasterizer - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,7 +13,7 @@ CFG=RAS_rasterizer - Win32 Profile !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 "RAS_rasterizer.mak" CFG="RAS_rasterizer - Win32 Profile" +!MESSAGE NMAKE /f "RAS_rasterizer.mak" CFG="RAS_rasterizer - Win32 Release" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -21,7 +21,6 @@ CFG=RAS_rasterizer - Win32 Profile !MESSAGE "RAS_rasterizer - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE "RAS_rasterizer - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library") !MESSAGE "RAS_rasterizer - Win32 MT DLL Release" (based on "Win32 (x86) Static Library") -!MESSAGE "RAS_rasterizer - Win32 Profile" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -64,8 +63,8 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\rasterizer\debug" +# PROP Output_Dir "..\..\..\obj\windows\gameengine\rasterizer\debug" +# PROP Intermediate_Dir "..\..\..\obj\windows\gameengine\rasterizer\debug" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c @@ -78,7 +77,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\gameengine\rasterizer\debug\RAS_rasterizer.lib" +# ADD LIB32 /nologo !ELSEIF "$(CFG)" == "RAS_rasterizer - Win32 MT DLL Debug" @@ -128,30 +127,6 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\gameengine\rasterizer\RAS_rasterizer.lib" # ADD LIB32 /nologo -!ELSEIF "$(CFG)" == "RAS_rasterizer - Win32 Profile" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "RAS_rasterizer___Win32_Profile" -# PROP BASE Intermediate_Dir "RAS_rasterizer___Win32_Profile" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "RAS_rasterizer___Win32_Profile" -# PROP Intermediate_Dir "RAS_rasterizer___Win32_Profile" -# PROP Target_Dir "" -LINK32=link.exe -lib -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "../../../../lib/windows/moto/include" /I "..\..\..\source\kernel\gen_system" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /Zi /O2 /I "..\..\..\lib\windows\moto\include\\" /I "..\..\..\lib\windows\string\include" /I "..\..\..\source\kernel\gen_system" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\..\..\obj\windows\gameengine\rasterizer\debug\RAS_rasterizer.lib" -# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\gameengine\rasterizer\profile\RAS_rasterizer.lib" - !ENDIF # Begin Target @@ -160,7 +135,6 @@ LIB32=link.exe -lib # Name "RAS_rasterizer - Win32 Debug" # Name "RAS_rasterizer - Win32 MT DLL Debug" # Name "RAS_rasterizer - Win32 MT DLL Release" -# Name "RAS_rasterizer - Win32 Profile" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" diff --git a/projectfiles/gameengine/rasterizer/openglrasterizer/RAS_openglrasterizer.dsp b/projectfiles/gameengine/rasterizer/openglrasterizer/RAS_openglrasterizer.dsp index c2a3f3c1328..320d0e1b82c 100644 --- a/projectfiles/gameengine/rasterizer/openglrasterizer/RAS_openglrasterizer.dsp +++ b/projectfiles/gameengine/rasterizer/openglrasterizer/RAS_openglrasterizer.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Static Library" 0x0104 -CFG=RAS_openglrasterizer - Win32 Profile +CFG=RAS_openglrasterizer - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,7 +13,7 @@ CFG=RAS_openglrasterizer - Win32 Profile !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 "RAS_openglrasterizer.mak" CFG="RAS_openglrasterizer - Win32 Profile" +!MESSAGE NMAKE /f "RAS_openglrasterizer.mak" CFG="RAS_openglrasterizer - Win32 Release" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -21,7 +21,6 @@ CFG=RAS_openglrasterizer - Win32 Profile !MESSAGE "RAS_openglrasterizer - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE "RAS_openglrasterizer - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library") !MESSAGE "RAS_openglrasterizer - Win32 MT DLL Release" (based on "Win32 (x86) Static Library") -!MESSAGE "RAS_openglrasterizer - Win32 Profile" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -64,8 +63,8 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "..\..\..\..\..\obj\windows\gameengine\rasterizer\openglrasterizer\debug" +# PROP Output_Dir "..\..\..\..\obj\windows\gameengine\rasterizer\openglrasterizer\debug" +# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\rasterizer\openglrasterizer\debug" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c @@ -78,7 +77,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\..\..\obj\windows\gameengine\rasterizer\openglrasterizer\debug\RAS_openglrasterizer.lib" +# ADD LIB32 /nologo !ELSEIF "$(CFG)" == "RAS_openglrasterizer - Win32 MT DLL Debug" @@ -128,30 +127,6 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\..\..\..\..\..\obj\windows\gameengine\rasterizer\openglrasterizer\RAS_openglrasterizer.lib" # ADD LIB32 /nologo -!ELSEIF "$(CFG)" == "RAS_openglrasterizer - Win32 Profile" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "RAS_openglrasterizer___Win32_Profile" -# PROP BASE Intermediate_Dir "RAS_openglrasterizer___Win32_Profile" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "RAS_openglrasterizer___Win32_Profile" -# PROP Intermediate_Dir "RAS_openglrasterizer___Win32_Profile" -# PROP Target_Dir "" -LINK32=link.exe -lib -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\source\kernel\gen_system" /I "../../../../lib/windows/moto/include" /I "..\..\..\..\source\gameengine\Rasterizer" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /Zi /O2 /I "..\..\..\..\lib\windows\string\include" /I "..\..\..\..\source\kernel\gen_system" /I "../../../../lib/windows/moto/include" /I "..\..\..\..\source\gameengine\Rasterizer" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\gameengine\rasterizer\openglrasterizer\debug\RAS_openglrasterizer.lib" -# ADD LIB32 /nologo /out:"..\..\..\..\..\obj\windows\gameengine\rasterizer\openglrasterizer\profile\RAS_openglrasterizer.lib" - !ENDIF # Begin Target @@ -160,7 +135,6 @@ LIB32=link.exe -lib # Name "RAS_openglrasterizer - Win32 Debug" # Name "RAS_openglrasterizer - Win32 MT DLL Debug" # Name "RAS_openglrasterizer - Win32 MT DLL Release" -# Name "RAS_openglrasterizer - Win32 Profile" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" diff --git a/projectfiles/gameengine/scenegraph/SG_scenegraph.dsp b/projectfiles/gameengine/scenegraph/SG_scenegraph.dsp index 6978c86cbdf..63943ad87f0 100644 --- a/projectfiles/gameengine/scenegraph/SG_scenegraph.dsp +++ b/projectfiles/gameengine/scenegraph/SG_scenegraph.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Static Library" 0x0104 -CFG=SG_SceneGraph - Win32 Profile +CFG=SG_SceneGraph - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,7 +13,7 @@ CFG=SG_SceneGraph - Win32 Profile !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 "SG_SceneGraph.mak" CFG="SG_SceneGraph - Win32 Profile" +!MESSAGE NMAKE /f "SG_SceneGraph.mak" CFG="SG_SceneGraph - Win32 Release" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -21,7 +21,6 @@ CFG=SG_SceneGraph - Win32 Profile !MESSAGE "SG_SceneGraph - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE "SG_SceneGraph - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library") !MESSAGE "SG_SceneGraph - Win32 MT DLL Release" (based on "Win32 (x86) Static Library") -!MESSAGE "SG_SceneGraph - Win32 Profile" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -64,8 +63,8 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\scenegraph\debug" +# PROP Output_Dir "..\..\..\obj\windows\gameengine\scenegraph\debug" +# PROP Intermediate_Dir "..\..\..\obj\windows\gameengine\scenegraph\debug" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c @@ -78,7 +77,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\gameengine\scenegraph\debug\SG_SceneGraph.lib" +# ADD LIB32 /nologo !ELSEIF "$(CFG)" == "SG_SceneGraph - Win32 MT DLL Debug" @@ -128,30 +127,6 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\gameengine\scenegraph\SG_SceneGraph.lib" # ADD LIB32 /nologo -!ELSEIF "$(CFG)" == "SG_SceneGraph - Win32 Profile" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "SG_SceneGraph___Win32_Profile" -# PROP BASE Intermediate_Dir "SG_SceneGraph___Win32_Profile" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "SG_SceneGraph___Win32_Profile" -# PROP Intermediate_Dir "SG_SceneGraph___Win32_Profile" -# PROP Target_Dir "" -LINK32=link.exe -lib -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "../../../../lib/windows/moto/include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /Zi /O2 /I "../../../lib/windows/moto/include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\..\..\obj\windows\gameengine\scenegraph\debug\SG_SceneGraph.lib" -# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\gameengine\scenegraph\profile\SG_SceneGraph.lib" - !ENDIF # Begin Target @@ -160,7 +135,6 @@ LIB32=link.exe -lib # Name "SG_SceneGraph - Win32 Debug" # Name "SG_SceneGraph - Win32 MT DLL Debug" # Name "SG_SceneGraph - Win32 MT DLL Release" -# Name "SG_SceneGraph - Win32 Profile" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" diff --git a/projectfiles/gameengine/sound/SND_sound.dsp b/projectfiles/gameengine/sound/SND_sound.dsp index 137fabe825f..8c9c000d3db 100644 --- a/projectfiles/gameengine/sound/SND_sound.dsp +++ b/projectfiles/gameengine/sound/SND_sound.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Static Library" 0x0104 -CFG=SND_sound - Win32 Profile +CFG=SND_sound - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,7 +13,7 @@ CFG=SND_sound - Win32 Profile !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 "SND_sound.mak" CFG="SND_sound - Win32 Profile" +!MESSAGE NMAKE /f "SND_sound.mak" CFG="SND_sound - Win32 Release" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -21,7 +21,6 @@ CFG=SND_sound - Win32 Profile !MESSAGE "SND_sound - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE "SND_sound - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library") !MESSAGE "SND_sound - Win32 MT DLL Release" (based on "Win32 (x86) Static Library") -!MESSAGE "SND_sound - Win32 Profile" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -64,8 +63,8 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\soundsystem\debug" +# PROP Output_Dir "..\..\..\obj\windows\gameengine\soundsystem\debug" +# PROP Intermediate_Dir "..\..\..\obj\windows\gameengine\soundsystem\debug" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c @@ -78,7 +77,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\gameengine\soundsystem\debug\SND_sound.lib" +# ADD LIB32 /nologo !ELSEIF "$(CFG)" == "SND_sound - Win32 MT DLL Debug" @@ -128,30 +127,6 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\gameengine\soundsystem\SND_sound.lib" # ADD LIB32 /nologo -!ELSEIF "$(CFG)" == "SND_sound - Win32 Profile" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "SND_sound___Win32_Profile" -# PROP BASE Intermediate_Dir "SND_sound___Win32_Profile" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "SND_sound___Win32_Profile" -# PROP Intermediate_Dir "SND_sound___Win32_Profile" -# PROP Target_Dir "" -LINK32=link.exe -lib -# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /O2 /I "../../../../lib/windows/moto/include" /I "..\..\..\source\kernel\gen_system" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c -# ADD CPP /nologo /W3 /Gm /GX /Zi /O2 /I "..\..\..\lib\windows\fmod\include" /I "..\..\..\source\gameengine\soundsystem" /I "..\..\..\source\gameengine\soundsystem\openal" /I "..\..\..\source\gameengine\soundsystem\fmod" /I "..\..\..\source\gameengine\soundsystem\dummy" /I "..\..\..\lib\windows\string\include" /I "../../../lib/windows/moto/include" /I "..\..\..\source\kernel\gen_system" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\..\..\obj\windows\gameengine\soundsystem\debug\SND_sound.lib" -# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\gameengine\soundsystem\profile\SND_sound.lib" - !ENDIF # Begin Target @@ -160,7 +135,6 @@ LIB32=link.exe -lib # Name "SND_sound - Win32 Debug" # Name "SND_sound - Win32 MT DLL Debug" # Name "SND_sound - Win32 MT DLL Release" -# Name "SND_sound - Win32 Profile" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" diff --git a/projectfiles/gameengine/sound/dummy/SND_Dummy.dsp b/projectfiles/gameengine/sound/dummy/SND_Dummy.dsp index 918397865e0..afac89e5e1b 100644 --- a/projectfiles/gameengine/sound/dummy/SND_Dummy.dsp +++ b/projectfiles/gameengine/sound/dummy/SND_Dummy.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Static Library" 0x0104 -CFG=SND_Dummy - Win32 Profile +CFG=SND_Dummy - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,7 +13,7 @@ CFG=SND_Dummy - Win32 Profile !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 "SND_Dummy.mak" CFG="SND_Dummy - Win32 Profile" +!MESSAGE NMAKE /f "SND_Dummy.mak" CFG="SND_Dummy - Win32 Release" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -21,7 +21,6 @@ CFG=SND_Dummy - Win32 Profile !MESSAGE "SND_Dummy - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE "SND_Dummy - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library") !MESSAGE "SND_Dummy - Win32 MT DLL Release" (based on "Win32 (x86) Static Library") -!MESSAGE "SND_Dummy - Win32 Profile" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -64,8 +63,8 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "..\..\..\..\..\obj\windows\gameengine\soundsystem\dummy\debug" +# PROP Output_Dir "..\..\..\..\obj\windows\gameengine\soundsystem\dummy\debug" +# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\soundsystem\dummy\debug" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c @@ -78,7 +77,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\..\..\obj\windows\gameengine\soundsystem\dummy\debug\SND_Dummy.lib" +# ADD LIB32 /nologo !ELSEIF "$(CFG)" == "SND_Dummy - Win32 MT DLL Debug" @@ -128,30 +127,6 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\..\..\..\..\..\obj\windows\gameengine\soundsystem\dummy\SND_Dummy.lib" # ADD LIB32 /nologo -!ELSEIF "$(CFG)" == "SND_Dummy - Win32 Profile" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "SND_Dummy___Win32_Profile" -# PROP BASE Intermediate_Dir "SND_Dummy___Win32_Profile" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "SND_Dummy___Win32_Profile" -# PROP Intermediate_Dir "SND_Dummy___Win32_Profile" -# PROP Target_Dir "" -LINK32=link.exe -lib -# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /O2 /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\soundsystem" /I "../../../../lib/windows/moto/include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /J /FD /c -# ADD CPP /nologo /W3 /Gm /GX /Zi /O2 /I "..\..\..\lib\windows\string\include" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\soundsystem" /I "..\..\..\..\source\gameengine\soundsystem\intern" /I "..\..\..\..\lib\windows\string\include" /I "../../../../lib/windows/moto/include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /J /FD /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\gameengine\soundsystem\dummy\debug\SND_Dummy.lib" -# ADD LIB32 /nologo /out:"..\..\..\..\..\obj\windows\gameengine\soundsystem\dummy\profile\SND_Dummy.lib" - !ENDIF # Begin Target @@ -160,7 +135,6 @@ LIB32=link.exe -lib # Name "SND_Dummy - Win32 Debug" # Name "SND_Dummy - Win32 MT DLL Debug" # Name "SND_Dummy - Win32 MT DLL Release" -# Name "SND_Dummy - Win32 Profile" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" diff --git a/projectfiles/gameengine/sound/fmod/SND_fmod.dsp b/projectfiles/gameengine/sound/fmod/SND_fmod.dsp index 850e1a3c5ca..77944b55e9a 100644 --- a/projectfiles/gameengine/sound/fmod/SND_fmod.dsp +++ b/projectfiles/gameengine/sound/fmod/SND_fmod.dsp @@ -63,8 +63,8 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "..\..\..\..\..\obj\windows\gameengine\soundsystem\fmod\debug" +# PROP Output_Dir "..\..\..\..\obj\windows\gameengine\soundsystem\fmod\debug" +# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\soundsystem\fmod\debug" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c @@ -77,7 +77,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\..\..\obj\windows\gameengine\soundsystem\fmod\debug\SND_fmod.lib" +# ADD LIB32 /nologo !ELSEIF "$(CFG)" == "SND_fmod - Win32 MT DLL Debug" diff --git a/projectfiles/gameengine/sound/openal/SND_openal.dsp b/projectfiles/gameengine/sound/openal/SND_openal.dsp index f28201bb3c2..63104be4dde 100644 --- a/projectfiles/gameengine/sound/openal/SND_openal.dsp +++ b/projectfiles/gameengine/sound/openal/SND_openal.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Static Library" 0x0104 -CFG=SND_openal - Win32 Profile +CFG=SND_openal - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,7 +13,7 @@ CFG=SND_openal - Win32 Profile !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 "SND_openal.mak" CFG="SND_openal - Win32 Profile" +!MESSAGE NMAKE /f "SND_openal.mak" CFG="SND_openal - Win32 Release" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -21,7 +21,6 @@ CFG=SND_openal - Win32 Profile !MESSAGE "SND_openal - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE "SND_openal - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library") !MESSAGE "SND_openal - Win32 MT DLL Release" (based on "Win32 (x86) Static Library") -!MESSAGE "SND_openal - Win32 Profile" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -64,8 +63,8 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "..\..\..\..\..\obj\windows\gameengine\soundsystem\openal\debug" +# PROP Output_Dir "..\..\..\..\obj\windows\gameengine\soundsystem\openal\debug" +# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\soundsystem\openal\debug" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c @@ -78,7 +77,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\..\..\obj\windows\gameengine\soundsystem\openal\debug\SND_openal.lib" +# ADD LIB32 /nologo !ELSEIF "$(CFG)" == "SND_openal - Win32 MT DLL Debug" @@ -128,30 +127,6 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\..\..\..\..\..\obj\windows\gameengine\soundsystem\openal\SND_openal.lib" # ADD LIB32 /nologo -!ELSEIF "$(CFG)" == "SND_openal - Win32 Profile" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "SND_openal___Win32_Profile" -# PROP BASE Intermediate_Dir "SND_openal___Win32_Profile" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "SND_openal___Win32_Profile" -# PROP Intermediate_Dir "SND_openal___Win32_Profile" -# PROP Target_Dir "" -LINK32=link.exe -lib -# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /O2 /I "../../../../lib/windows/moto/include" /I "..\..\..\..\source\kernel\gen_system" /I "..\..\..\..\source\gameengine\soundsystem" /I "..\..\..\..\lib\windows\openal\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c -# ADD CPP /nologo /W3 /Gm /GX /Zi /O2 /I "..\..\..\..\source\gameengine\soundsystem" /I "../../../../source/gameengine/soundsystem/intern" /I "../../../../source/gameengine/soundsystem" /I "..\..\..\..\lib\windows\string\include" /I "../../../../lib/windows/moto/include" /I "..\..\..\..\lib\windows\openal\include" /I "..\..\..\..\source\kernel\gen_system" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\gameengine\soundsystem\openal\debug\SND_openal.lib" -# ADD LIB32 /nologo /out:"..\..\..\..\..\obj\windows\gameengine\soundsystem\openal\profile\SND_openal.lib" - !ENDIF # Begin Target @@ -160,7 +135,6 @@ LIB32=link.exe -lib # Name "SND_openal - Win32 Debug" # Name "SND_openal - Win32 MT DLL Debug" # Name "SND_openal - Win32 MT DLL Release" -# Name "SND_openal - Win32 Profile" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" diff --git a/projectfiles/kernel/gen_messaging/gen_messaging.dsp b/projectfiles/kernel/gen_messaging/gen_messaging.dsp index 000a867e3d0..da07c71bc9e 100644 --- a/projectfiles/kernel/gen_messaging/gen_messaging.dsp +++ b/projectfiles/kernel/gen_messaging/gen_messaging.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Static Library" 0x0104 -CFG=gen_messaging - Win32 Profile +CFG=gen_messaging - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,7 +13,7 @@ CFG=gen_messaging - Win32 Profile !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 "gen_messaging.mak" CFG="gen_messaging - Win32 Profile" +!MESSAGE NMAKE /f "gen_messaging.mak" CFG="gen_messaging - Win32 Release" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -21,7 +21,6 @@ CFG=gen_messaging - Win32 Profile !MESSAGE "gen_messaging - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE "gen_messaging - Win32 MT DLL Release" (based on "Win32 (x86) Static Library") !MESSAGE "gen_messaging - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library") -!MESSAGE "gen_messaging - Win32 Profile" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -64,8 +63,8 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\..\..\..\obj\windows\kernel\gen_messaging\debug" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\kernel\gen_messaging\debug" +# PROP Output_Dir "..\..\..\obj\windows\kernel\gen_messaging\debug" +# PROP Intermediate_Dir "..\..\..\obj\windows\kernel\gen_messaging\debug" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c @@ -128,30 +127,6 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo # ADD LIB32 /nologo -!ELSEIF "$(CFG)" == "gen_messaging - Win32 Profile" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "gen_messaging___Win32_Profile" -# PROP BASE Intermediate_Dir "gen_messaging___Win32_Profile" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "gen_messaging___Win32_Profile" -# PROP Intermediate_Dir "gen_messaging___Win32_Profile" -# PROP Target_Dir "" -LINK32=link.exe -lib -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\source\kernel\gen_messaging" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FR /YX /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /Zi /I "..\..\..\source\kernel\gen_messaging" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - !ENDIF # Begin Target @@ -160,7 +135,6 @@ LIB32=link.exe -lib # Name "gen_messaging - Win32 Debug" # Name "gen_messaging - Win32 MT DLL Release" # Name "gen_messaging - Win32 MT DLL Debug" -# Name "gen_messaging - Win32 Profile" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" diff --git a/projectfiles/kernel/system/SYS_system.dsp b/projectfiles/kernel/system/SYS_system.dsp index d05cd8498a0..ecb0e413b5a 100644 --- a/projectfiles/kernel/system/SYS_system.dsp +++ b/projectfiles/kernel/system/SYS_system.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Static Library" 0x0104 -CFG=SYS_system - Win32 Profile +CFG=SYS_system - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,7 +13,7 @@ CFG=SYS_system - Win32 Profile !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 "SYS_system.mak" CFG="SYS_system - Win32 Profile" +!MESSAGE NMAKE /f "SYS_system.mak" CFG="SYS_system - Win32 Release" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -21,7 +21,6 @@ CFG=SYS_system - Win32 Profile !MESSAGE "SYS_system - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE "SYS_system - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library") !MESSAGE "SYS_system - Win32 MT DLL Release" (based on "Win32 (x86) Static Library") -!MESSAGE "SYS_system - Win32 Profile" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -64,8 +63,8 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\gameengine\kernel\gen_system\debug" +# PROP Output_Dir "..\..\..\obj\windows\gameengine\kernel\gen_system\debug" +# PROP Intermediate_Dir "..\..\..\obj\windows\gameengine\kernel\gen_system\debug" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c @@ -78,7 +77,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\gameengine\kernel\gen_system\debug\SYS_system.lib" +# ADD LIB32 /nologo !ELSEIF "$(CFG)" == "SYS_system - Win32 MT DLL Debug" @@ -128,30 +127,6 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\gameengine\kernel\gen_system\SYS_system.lib" # ADD LIB32 /nologo -!ELSEIF "$(CFG)" == "SYS_system - Win32 Profile" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "SYS_system___Win32_Profile" -# PROP BASE Intermediate_Dir "SYS_system___Win32_Profile" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "SYS_system___Win32_Profile" -# PROP Intermediate_Dir "SYS_system___Win32_Profile" -# PROP Target_Dir "" -LINK32=link.exe -lib -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /Zi /O2 /I "..\..\..\lib\windows\string\include" /I "../../../../lib/windows/moto/include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\..\..\obj\windows\gameengine\kernel\gen_system\debug\SYS_system.lib" -# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\gameengine\kernel\gen_system\profileg\SYS_system.lib" - !ENDIF # Begin Target @@ -160,7 +135,6 @@ LIB32=link.exe -lib # Name "SYS_system - Win32 Debug" # Name "SYS_system - Win32 MT DLL Debug" # Name "SYS_system - Win32 MT DLL Release" -# Name "SYS_system - Win32 Profile" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" diff --git a/projectfiles/sumo/solid/SM_solid.dsp b/projectfiles/sumo/solid/SM_solid.dsp index 064199c38eb..8f780c6d02b 100644 --- a/projectfiles/sumo/solid/SM_solid.dsp +++ b/projectfiles/sumo/solid/SM_solid.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Static Library" 0x0104 -CFG=SM_solid - Win32 Profile +CFG=SM_solid - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,7 +13,7 @@ CFG=SM_solid - Win32 Profile !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 "SM_solid.mak" CFG="SM_solid - Win32 Profile" +!MESSAGE NMAKE /f "SM_solid.mak" CFG="SM_solid - Win32 Release" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -21,7 +21,6 @@ CFG=SM_solid - Win32 Profile !MESSAGE "SM_solid - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE "SM_solid - Win32 MT DLL Debug" (based on "Win32 (x86) Static Library") !MESSAGE "SM_solid - Win32 MT DLL Release" (based on "Win32 (x86) Static Library") -!MESSAGE "SM_solid - Win32 Profile" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -65,8 +64,8 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "..\..\..\..\obj\windows\sumo\solid\debug" +# PROP Output_Dir "..\..\..\obj\windows\sumo\solid\debug" +# PROP Intermediate_Dir "..\..\..\obj\windows\sumo\solid\debug" # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c @@ -79,7 +78,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\sumo\solid\debug\SM_solid.lib" +# ADD LIB32 /nologo !ELSEIF "$(CFG)" == "SM_solid - Win32 MT DLL Debug" @@ -129,30 +128,6 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\..\..\..\..\obj\windows\sumo\solid\SM_solid.lib" # ADD LIB32 /nologo -!ELSEIF "$(CFG)" == "SM_solid - Win32 Profile" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "SM_solid___Win32_Profile" -# PROP BASE Intermediate_Dir "SM_solid___Win32_Profile" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "SM_solid___Win32_Profile" -# PROP Intermediate_Dir "SM_solid___Win32_Profile" -# PROP Target_Dir "" -LINK32=link.exe -lib -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\source\sumo\SOLID-3.0\include" /I "../../../../lib/windows/moto/include" /I "..\..\..\source\sumo\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /Zi /O2 /I "..\..\..\source\gameengine\physics\sumo\SOLID-3.0\include" /I "../../../lib/windows/moto/include" /I "..\..\..\source\gameengine\physics\sumo\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /J /FD /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\..\..\obj\windows\sumo\solid\debug\SM_solid.lib" -# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\sumo\solid\profile\SM_solid.lib" - !ENDIF # Begin Target @@ -161,7 +136,6 @@ LIB32=link.exe -lib # Name "SM_solid - Win32 Debug" # Name "SM_solid - Win32 MT DLL Debug" # Name "SM_solid - Win32 MT DLL Release" -# Name "SM_solid - Win32 Profile" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" |