Fixed ActiveX control libraries and library paths.

Removed abundant frozen python files.
Maarten

3 files changed, 4 insertions, 124 deletions

diff --git a/projectfiles/blender/BLO_writeblenfile/BLO_writeblenfile.dsp b/projectfiles/blender/BLO_writeblenfile/BLO_writeblenfile.dsp
index 670e87c3e41..96084cd2bc3 100644
--- a/projectfiles/blender/BLO_writeblenfile/BLO_writeblenfile.dsp
+++ b/projectfiles/blender/BLO_writeblenfile/BLO_writeblenfile.dsp
@@ -19,8 +19,6 @@ CFG=BLO_writeblenfile - Win32 Release
 !MESSAGE 
 !MESSAGE "BLO_writeblenfile - Win32 Release" (based on "Win32 (x86) Static Library")
 !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 
 
 # Begin Project
@@ -79,62 +77,12 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo
 
-!ELSEIF  "$(CFG)" == "BLO_writeblenfile - Win32 MT_DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "BLO_writeblenfile___Win32_MT_DLL_Release"
-# PROP BASE Intermediate_Dir "BLO_writeblenfile___Win32_MT_DLL_Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "BLO_writeblenfile___Win32_MT_DLL_Release"
-# PROP Intermediate_Dir "BLO_writeblenfile___Win32_MT_DLL_Release"
-# PROP Target_Dir ""
-LINK32=link.exe -lib
-# ADD BASE CPP /nologo /W3 /GX /O2 /I "..\..\..\source\blender\writestreamglue\\" /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 "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\source\blender\writestreamglue\\" /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 "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD BASE RSC /l 0x413 /d "NDEBUG"
-# ADD RSC /l 0x413 /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)" == "BLO_writeblenfile - Win32 MT DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "BLO_writeblenfile___Win32_MT_DLL_Debug"
-# PROP BASE Intermediate_Dir "BLO_writeblenfile___Win32_MT_DLL_Debug"
-# 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 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
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /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
 
 # Name "BLO_writeblenfile - Win32 Release"
 # Name "BLO_writeblenfile - Win32 Debug"
-# Name "BLO_writeblenfile - Win32 MT_DLL Release"
-# Name "BLO_writeblenfile - Win32 MT DLL Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
diff --git a/projectfiles/blender/bpython/frozen/BPY_frozen.dsp b/projectfiles/blender/bpython/frozen/BPY_frozen.dsp
index 3886c002560..e817ab3af70 100644
--- a/projectfiles/blender/bpython/frozen/BPY_frozen.dsp
+++ b/projectfiles/blender/bpython/frozen/BPY_frozen.dsp
@@ -207,54 +207,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_mx.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\blender\bpython\frozen\M_mx__TextTools.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\blender\bpython\frozen\M_mx__TextTools__Constants.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\blender\bpython\frozen\M_mx__TextTools__Constants__Sets.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\blender\bpython\frozen\M_mx__TextTools__Constants__TagTables.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\blender\bpython\frozen\M_mx__TextTools__mxTextTools.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\source\blender\bpython\frozen\M_mx__TextTools__TextTools.c
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\..\..\source\blender\bpython\frozen\M_repr.c
 # End Source File
 # Begin Source File
@@ -337,26 +289,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/makesdna/DNA_makesdna.dsp b/projectfiles/blender/makesdna/DNA_makesdna.dsp
index 864e8fac3ea..5513042f16c 100644
--- a/projectfiles/blender/makesdna/DNA_makesdna.dsp
+++ b/projectfiles/blender/makesdna/DNA_makesdna.dsp
@@ -102,7 +102,7 @@ PostBuild_Cmds=CD ..\..\..\source\blender\makesdna\intern\	DNA_makesdna.exe dna.
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
 # PROP Output_Dir "..\..\..\source\blender\makesdna\intern"
-# PROP Intermediate_Dir "..\..\..\..\obj\windows\blender\makesdna\mtdll"
+# PROP Intermediate_Dir "..\..\..\obj\windows\blender\makesdna\mtdll"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /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
@@ -115,7 +115,7 @@ BSC32=bscmake.exe
 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" /machine:I386 /out:"..\..\..\source\blender\makesdna\intern\DNA_makesdna.exe" /libpath:"..\..\..\..\obj\windows\blender\blenlib"
 # SUBTRACT BASE LINK32 /pdb:none
-# ADD LINK32 libguardedalloc.a 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 /nologo /subsystem:console /pdb:"DNA_makesdna.pdb" /machine:I386 /libpath:"..\..\..\lib\windows\guardedalloc\lib" /libpath:"..\..\..\..\obj\windows\blender\blenlib"
 # SUBTRACT LINK32 /pdb:none
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
@@ -133,7 +133,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\mtdll_debug"
+# PROP Intermediate_Dir "..\..\..\obj\windows\blender\makesdna\mtdll_debug"
 # 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
@@ -146,7 +146,7 @@ BSC32=bscmake.exe
 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 /out:"..\..\..\source\blender\makesdna\debug\DNA_makesdna.exe" /pdbtype:sept /libpath:"..\..\..\..\obj\windows\blender\blenlib\debug"
 # SUBTRACT BASE LINK32 /pdb:none
-# ADD LINK32 libguardedalloc.a 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"
+# ADD LINK32 libguardedalloc.a /nologo /subsystem:console /pdb:"DNA_makesdna.pdb" /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\lib\windows\guardedalloc\lib"
 # SUBTRACT LINK32 /pdb:none
 # Begin Special Build Tool
 SOURCE="$(InputPath)"