Fixed the MSVC project files. They now build both the release and debug

targets of creator publisher and player.
Assuming you have the libraries installed in lib/windows of course...
Maarten

19 files changed, 63 insertions, 141 deletions

diff --git a/projectfiles/blender/BLO_deflate/BLO_deflate.dsp b/projectfiles/blender/BLO_deflate/BLO_deflate.dsp
index b2148c06c23..4807eef578d 100644
--- a/projectfiles/blender/BLO_deflate/BLO_deflate.dsp
+++ b/projectfiles/blender/BLO_deflate/BLO_deflate.dsp
@@ -77,7 +77,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\obj\windows\blender\deflate\debug\BLO_deflate.lib"
+# ADD LIB32 /nologo
 
 !ELSEIF  "$(CFG)" == "BLO_deflate - Win32 MT DLL Release"
 
diff --git a/projectfiles/blender/BLO_encrypt/BLO_encrypt.dsp b/projectfiles/blender/BLO_encrypt/BLO_encrypt.dsp
index b15eebd8bd0..57c00161150 100644
--- a/projectfiles/blender/BLO_encrypt/BLO_encrypt.dsp
+++ b/projectfiles/blender/BLO_encrypt/BLO_encrypt.dsp
@@ -39,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\encrypt"
+# PROP Output_Dir "..\..\..\obj\windows\blender\encrypt"
+# PROP Intermediate_Dir "..\..\..\obj\windows\blender\encrypt"
 # 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
@@ -52,7 +52,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\encrypt\BLO_encrypt.lib"
+# ADD LIB32 /nologo
 
 !ELSEIF  "$(CFG)" == "BLO_encrypt - Win32 Debug"
 
diff --git a/projectfiles/blender/BLO_inflate/BLO_inflate.dsp b/projectfiles/blender/BLO_inflate/BLO_inflate.dsp
index fe8be5a88b6..f7dcb24f00a 100644
--- a/projectfiles/blender/BLO_inflate/BLO_inflate.dsp
+++ b/projectfiles/blender/BLO_inflate/BLO_inflate.dsp
@@ -39,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\inflate"
+# PROP Output_Dir "..\..\..\obj\windows\blender\inflate"
+# PROP Intermediate_Dir "..\..\..\obj\windows\blender\inflate"
 # 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
@@ -52,7 +52,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\inflate\BLO_inflate.lib"
+# ADD LIB32 /nologo
 
 !ELSEIF  "$(CFG)" == "BLO_inflate - Win32 Debug"
 
diff --git a/projectfiles/blender/BLO_readblenfile/BLO_readblenfile.dsp b/projectfiles/blender/BLO_readblenfile/BLO_readblenfile.dsp
index a43e47a8b3a..af9ab748f6d 100644
--- a/projectfiles/blender/BLO_readblenfile/BLO_readblenfile.dsp
+++ b/projectfiles/blender/BLO_readblenfile/BLO_readblenfile.dsp
@@ -39,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\readblenfile"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\readblenfile"
+# PROP Output_Dir "..\..\..\obj\windows\blender\readblenfile"
+# PROP Intermediate_Dir "..\..\..\obj\windows\blender\readblenfile"
 # 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
diff --git a/projectfiles/blender/BLO_readstreamglue/BLO_readstreamglue.dsp b/projectfiles/blender/BLO_readstreamglue/BLO_readstreamglue.dsp
index cd40bc89674..4f4d70bff9e 100644
--- a/projectfiles/blender/BLO_readstreamglue/BLO_readstreamglue.dsp
+++ b/projectfiles/blender/BLO_readstreamglue/BLO_readstreamglue.dsp
@@ -39,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\readstreamglue"
+# PROP Output_Dir "..\..\..\obj\windows\blender\readstreamglue"
+# PROP Intermediate_Dir "..\..\..\obj\windows\blender\readstreamglue"
 # 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
@@ -52,7 +52,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\readstreamglue\BLO_readstreamglue.lib"
+# ADD LIB32 /nologo
 
 !ELSEIF  "$(CFG)" == "BLO_readstreamglue - Win32 Debug"
 
diff --git a/projectfiles/blender/BLO_sign/BLO_sign.dsp b/projectfiles/blender/BLO_sign/BLO_sign.dsp
index ecac53cc3d7..7281f4d5b36 100644
--- a/projectfiles/blender/BLO_sign/BLO_sign.dsp
+++ b/projectfiles/blender/BLO_sign/BLO_sign.dsp
@@ -39,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\sign"
+# PROP Output_Dir "..\..\..\obj\windows\blender\sign"
+# PROP Intermediate_Dir "..\..\..\obj\windows\blender\sign"
 # 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
@@ -52,7 +52,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\sign\BLO_sign.lib"
+# ADD LIB32 /nologo
 
 !ELSEIF  "$(CFG)" == "BLO_sign - Win32 Debug"
 
diff --git a/projectfiles/blender/BLO_verify/BLO_verify.dsp b/projectfiles/blender/BLO_verify/BLO_verify.dsp
index 3d17800d9a2..38ebdfdc783 100644
--- a/projectfiles/blender/BLO_verify/BLO_verify.dsp
+++ b/projectfiles/blender/BLO_verify/BLO_verify.dsp
@@ -39,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\verify"
+# PROP Output_Dir "..\..\..\obj\windows\blender\verify"
+# PROP Intermediate_Dir "..\..\..\obj\windows\blender\verify"
 # 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
@@ -52,7 +52,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\verify\BLO_verify.lib"
+# ADD LIB32 /nologo
 
 !ELSEIF  "$(CFG)" == "BLO_verify - Win32 Debug"
 
diff --git a/projectfiles/blender/BLO_writeblenfile/BLO_writeblenfile.dsp b/projectfiles/blender/BLO_writeblenfile/BLO_writeblenfile.dsp
index 6d0dfab0bef..670e87c3e41 100644
--- a/projectfiles/blender/BLO_writeblenfile/BLO_writeblenfile.dsp
+++ b/projectfiles/blender/BLO_writeblenfile/BLO_writeblenfile.dsp
@@ -39,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\writeblenfile"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\writeblenfile"
+# PROP Output_Dir "..\..\..\obj\windows\blender\writeblenfile"
+# PROP Intermediate_Dir "..\..\..\obj\windows\blender\writeblenfile"
 # 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
diff --git a/projectfiles/blender/BLO_writestreamglue/BLO_writestreamglue.dsp b/projectfiles/blender/BLO_writestreamglue/BLO_writestreamglue.dsp
index fb54ff37bd6..2e725c8c109 100644
--- a/projectfiles/blender/BLO_writestreamglue/BLO_writestreamglue.dsp
+++ b/projectfiles/blender/BLO_writestreamglue/BLO_writestreamglue.dsp
@@ -39,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\writestreamglue"
+# PROP Output_Dir "..\..\..\obj\windows\blender\writestreamglue"
+# PROP Intermediate_Dir "..\..\..\obj\windows\blender\writestreamglue"
 # 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
@@ -52,7 +52,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\writestreamglue\BLO_writestreamglue.lib"
+# ADD LIB32 /nologo
 
 !ELSEIF  "$(CFG)" == "BLO_writestreamglue - Win32 Debug"
 
diff --git a/projectfiles/blender/BLO_writestreamglue_stub/BLO_writestreamglue_stub.dsp b/projectfiles/blender/BLO_writestreamglue_stub/BLO_writestreamglue_stub.dsp
index 4e4dff71526..07b62fbf830 100644
--- a/projectfiles/blender/BLO_writestreamglue_stub/BLO_writestreamglue_stub.dsp
+++ b/projectfiles/blender/BLO_writestreamglue_stub/BLO_writestreamglue_stub.dsp
@@ -39,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 "Release"
+# PROP Output_Dir "..\..\..\obj\windows\blender\writestreamglue_stub"
+# PROP Intermediate_Dir "..\..\..\obj\windows\blender\writestreamglue_stub"
 # 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
diff --git a/projectfiles/blender/bpython/frozen/BPY_frozen.dsp b/projectfiles/blender/bpython/frozen/BPY_frozen.dsp
index 1b94bc5fc57..b445381371d 100644
--- a/projectfiles/blender/bpython/frozen/BPY_frozen.dsp
+++ b/projectfiles/blender/bpython/frozen/BPY_frozen.dsp
@@ -4,7 +4,7 @@
 
 # TARGTYPE "Win32 (x86) Static Library" 0x0104
 
-CFG=BPY_frozen - Win32 Profile
+CFG=BPY_FROZEN - 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_frozen - 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_frozen.mak" CFG="BPY_frozen - Win32 Profile"
+!MESSAGE NMAKE /f "BPY_frozen.mak" CFG="BPY_FROZEN - WIN32 RELEASE"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
 !MESSAGE "BPY_frozen - Win32 Release" (based on "Win32 (x86) Static Library")
 !MESSAGE "BPY_frozen - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "BPY_frozen - 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\bpython\frozen"
+# PROP Output_Dir "..\..\..\..\obj\windows\blender\bpython\frozen\"
+# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\bpython\frozen"
 # 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" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\..\lib\windows\python\include\python2.2" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
 # ADD BASE RSC /l 0x413 /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\bpython\frozen\BPY_frozen.lib"
+# ADD LIB32 /nologo
 
 !ELSEIF  "$(CFG)" == "BPY_frozen - 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\bpython\frozen\debug"
+# PROP Output_Dir "..\..\..\..\obj\windows\blender\bpython\frozen\debug"
+# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\bpython\frozen\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" /D "WIN32" /D "_MBCS" /D "_LIB" /U "_DEBUG" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\lib\windows\python\include\python2.2" /D "WIN32" /D "_MBCS" /D "_LIB" /U "_DEBUG" /YX /FD /GZ /c
 # ADD BASE RSC /l 0x413 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
@@ -75,31 +74,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\..\..\obj\windows\blender\bpython\frozen\debug\BPY_frozen.lib"
-
-!ELSEIF  "$(CFG)" == "BPY_frozen - Win32 Profile"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "BPY_frozen___Win32_Profile"
-# PROP BASE Intermediate_Dir "BPY_frozen___Win32_Profile"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "BPY_frozen___Win32_Profile"
-# PROP Intermediate_Dir "BPY_frozen___Win32_Profile"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\lib\windows\python\include\python2.0" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /Zi /O2 /I "..\..\..\..\lib\windows\python\include\python2.0" /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\blender\bpython\frozen\debug\BPY_frozen.lib"
-# ADD LIB32 /nologo /out:"..\..\..\..\..\..\obj\windows\blender\bpython\frozen\debug\BPY_frozen.lib"
+# ADD LIB32 /nologo
 
 !ENDIF 
 
@@ -107,33 +82,32 @@ LIB32=link.exe -lib
 
 # Name "BPY_frozen - Win32 Release"
 # Name "BPY_frozen - Win32 Debug"
-# Name "BPY_frozen - Win32 Profile"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 # Begin Source File
 
-SOURCE=..\..\..\..\source\blender\bpython\frozen\config.c
+SOURCE=..\..\..\..\source\blender\bpython\frozen\frozen.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\..\source\blender\bpython\frozen\frozen.c
+SOURCE=..\..\..\..\source\blender\bpython\frozen\frozen_extensions.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\..\source\blender\bpython\frozen\M_beta.c
+SOURCE=..\..\..\..\source\blender\bpython\frozen\M___future__.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\..\source\blender\bpython\frozen\M_beta__Objects.c
+SOURCE=..\..\..\..\source\blender\bpython\frozen\M_beta.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\..\source\blender\bpython\frozen\M_beta__Scenegraph.c
+SOURCE=..\..\..\..\source\blender\bpython\frozen\M_beta__Objects.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\..\source\blender\bpython\frozen\M_blenderos.c
+SOURCE=..\..\..\..\source\blender\bpython\frozen\M_beta__Scenegraph.c
 # End Source File
 # Begin Source File
 
@@ -165,26 +139,6 @@ SOURCE=..\..\..\..\source\blender\bpython\frozen\M_gzip.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\..\source\blender\bpython\frozen\M_mcf.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\blender\bpython\frozen\M_mcf__utils.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\blender\bpython\frozen\M_mcf__utils__hier_rx.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\blender\bpython\frozen\M_mcf__utils__hierobj.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\blender\bpython\frozen\M_mcf__utils__singletonlist.c
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\..\..\source\blender\bpython\frozen\M_repr.c
 # End Source File
 # Begin Source File
@@ -233,18 +187,6 @@ SOURCE=..\..\..\..\source\blender\bpython\frozen\M_types.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\..\source\blender\bpython\frozen\M_utils.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\blender\bpython\frozen\M_utils__quat.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\blender\bpython\frozen\M_utils__vect.c
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\..\..\source\blender\bpython\frozen\M_vrml.c
 # End Source File
 # Begin Source File
@@ -267,26 +209,6 @@ SOURCE=..\..\..\..\source\blender\bpython\frozen\M_vrml__parser.c
 
 SOURCE=..\..\..\..\source\blender\bpython\frozen\M_vrml__scenegraph.c
 # End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\blender\bpython\frozen\M_vrml__utils.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\blender\bpython\frozen\M_vrml__utils__collapse.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\blender\bpython\frozen\M_vrml__utils__err.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\blender\bpython\frozen\M_vrml__utils__namespace.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\blender\bpython\frozen\M_vrml__utils__typeclasses.c
-# End Source File
 # End Group
 # Begin Group "Header Files"
 
diff --git a/projectfiles/blender/bpython/intern/BPY_python/BPY_python.dsp b/projectfiles/blender/bpython/intern/BPY_python/BPY_python.dsp
index 74a03854707..f655b775a73 100644
--- a/projectfiles/blender/bpython/intern/BPY_python/BPY_python.dsp
+++ b/projectfiles/blender/bpython/intern/BPY_python/BPY_python.dsp
@@ -37,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\bpython"
+# PROP Output_Dir "..\..\..\..\..\obj\windows\blender\bpython"
+# PROP Intermediate_Dir "..\..\..\..\..\obj\windows\blender\bpython"
 # 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
@@ -50,7 +50,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\..\..\..\obj\windows\blender\bpython\BPY_python.lib"
+# ADD LIB32 /nologo
 
 !ELSEIF  "$(CFG)" == "BPY_python - Win32 Debug"
 
diff --git a/projectfiles/blender/imbuf/BL_imbuf.dsp b/projectfiles/blender/imbuf/BL_imbuf.dsp
index 17b16c4e3d2..079156c2cca 100644
--- a/projectfiles/blender/imbuf/BL_imbuf.dsp
+++ b/projectfiles/blender/imbuf/BL_imbuf.dsp
@@ -39,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\imbuf"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\imbuf"
+# PROP Output_Dir "..\..\..\obj\windows\blender\imbuf"
+# PROP Intermediate_Dir "..\..\..\obj\windows\blender\imbuf"
 # 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
@@ -52,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
 
 !ELSEIF  "$(CFG)" == "BL_imbuf - Win32 Debug"
 
diff --git a/projectfiles/blender/img/BL_img.dsp b/projectfiles/blender/img/BL_img.dsp
index 0569df37cd9..16f0827fbe9 100644
--- a/projectfiles/blender/img/BL_img.dsp
+++ b/projectfiles/blender/img/BL_img.dsp
@@ -37,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\img"
+# PROP Output_Dir "..\..\..\obj\windows\blender\img"
+# PROP Intermediate_Dir "..\..\..\obj\windows\blender\img"
 # 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
@@ -50,7 +50,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\img\BL_img.lib"
+# ADD LIB32 /nologo
 
 !ELSEIF  "$(CFG)" == "BL_img - Win32 Debug"
 
@@ -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 "..\..\..\..\obj\windows\blender\img\debug"
+# PROP Output_Dir "..\..\..\obj\windows\blender\img\debug"
+# PROP Intermediate_Dir "..\..\..\obj\windows\blender\img\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
@@ -75,7 +75,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\img\debug\BL_img.lib"
+# ADD LIB32 /nologo
 
 !ENDIF 
 
diff --git a/projectfiles/blender/loader/BLO_loader.dsp b/projectfiles/blender/loader/BLO_loader.dsp
index 56550042696..8a658e9b7e8 100644
--- a/projectfiles/blender/loader/BLO_loader.dsp
+++ b/projectfiles/blender/loader/BLO_loader.dsp
@@ -39,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\loader"
+# PROP Output_Dir "..\..\..\obj\windows\blender\loader"
+# PROP Intermediate_Dir "..\..\..\obj\windows\blender\loader"
 # 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
@@ -52,7 +52,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\loader\BLO_loader.lib"
+# ADD LIB32 /nologo
 
 !ELSEIF  "$(CFG)" == "BLO_loader - Win32 Debug"
 
diff --git a/projectfiles/blender/render/BRE_render.dsp b/projectfiles/blender/render/BRE_render.dsp
index c094d8e4780..a0aafe76ee7 100644
--- a/projectfiles/blender/render/BRE_render.dsp
+++ b/projectfiles/blender/render/BRE_render.dsp
@@ -50,7 +50,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\render\BRE_render.lib"
+# ADD LIB32 /nologo
 
 !ELSEIF  "$(CFG)" == "BRE_render - Win32 Debug"
 
@@ -75,7 +75,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\render\debug\BRE_render.lib"
+# ADD LIB32 /nologo
 
 !ENDIF 
 
diff --git a/projectfiles/blender/renderconverter/BRE_renderconverter.dsp b/projectfiles/blender/renderconverter/BRE_renderconverter.dsp
index 311a9a8ae85..17f7fcb2de9 100644
--- a/projectfiles/blender/renderconverter/BRE_renderconverter.dsp
+++ b/projectfiles/blender/renderconverter/BRE_renderconverter.dsp
@@ -50,7 +50,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\renderconverter\BRE_renderconverter.lib"
+# ADD LIB32 /nologo
 
 !ELSEIF  "$(CFG)" == "BRE_renderconverter - Win32 Debug"
 
@@ -74,7 +74,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\renderconverter\debug\BRE_renderconverter.lib"
+# ADD LIB32 /nologo /out:"..\..\..\obj\windows\blender\renderconverter\debug\BRE_renderconverter.lib"
 
 !ENDIF 
 
diff --git a/projectfiles/blender/renderui/BRE_renderui.dsp b/projectfiles/blender/renderui/BRE_renderui.dsp
index ec37f3498fe..d5942ec9c62 100644
--- a/projectfiles/blender/renderui/BRE_renderui.dsp
+++ b/projectfiles/blender/renderui/BRE_renderui.dsp
@@ -50,7 +50,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\renderui\BRE_renderui.lib"
+# ADD LIB32 /nologo
 
 !ELSEIF  "$(CFG)" == "BRE_renderui - Win32 Debug"
 
@@ -74,7 +74,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\blender\renderui\debug\BRE_renderui.lib"
+# ADD LIB32 /nologo /out:"..\..\..\obj\windows\blender\renderui\debug\BRE_renderui.lib"
 
 !ENDIF 
 
diff --git a/projectfiles/blender/src/BL_src_cre.dsp b/projectfiles/blender/src/BL_src_cre.dsp
index 7ba9d1f8b31..9fc4c0aaaae 100644
--- a/projectfiles/blender/src/BL_src_cre.dsp
+++ b/projectfiles/blender/src/BL_src_cre.dsp
@@ -42,7 +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\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