Corrected intern lib names so blendercreator.dsp can find them.

Previous commit broke this. --aphex

diff --git a/intern/bmfont/make/msvc_6_0/bmfont.dsp b/intern/bmfont/make/msvc_6_0/bmfont.dsp
index bee8ae9946bf82523b59b989c5cf16ee6f2f8cde..38897dca84f70bd310084618b10b31aa3518e47b 100644 (file)
--- a/intern/bmfont/make/msvc_6_0/bmfont.dsp
+++ b/intern/bmfont/make/msvc_6_0/bmfont.dsp
@@ -50,7 +50,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\intern\bmfont\libbmfont.lib"
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PostBuild_Desc=Copying BMFONT files library (release target) to lib tree.
@@ -79,7 +79,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\intern\bmfont\debug\libbmfont.lib"
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PostBuild_Desc=Copying BMFONT files library (debug target) to lib tree.

diff --git a/intern/ghost/make/msvc/ghost.dsp b/intern/ghost/make/msvc/ghost.dsp
index 4864540027155eecdcb0a925884648290467617a..55c5f71b2c178b9ac7a1eac490a3f739c23ed09a 100644 (file)
--- a/intern/ghost/make/msvc/ghost.dsp
+++ b/intern/ghost/make/msvc/ghost.dsp
@@ -50,7 +50,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\intern\ghost\libghost.lib"
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PostBuild_Desc=Copying GHOST files library (release target) to lib tree.
@@ -79,7 +79,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\intern\ghost\debug\libghost.lib"
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PostBuild_Desc=Copying GHOST files library (debug target) to lib tree.

diff --git a/intern/guardedalloc/make/msvc_6_0/guardedalloc.dsp b/intern/guardedalloc/make/msvc_6_0/guardedalloc.dsp
index 6888b7f8403d508d3aee75714572403fcce2c3de..f5e5254546b700352cb2cc2f147727844f213271 100644 (file)
--- a/intern/guardedalloc/make/msvc_6_0/guardedalloc.dsp
+++ b/intern/guardedalloc/make/msvc_6_0/guardedalloc.dsp
@@ -50,7 +50,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\intern\guardedalloc\libguardedalloc.lib"
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PostBuild_Cmds=ECHO Copying header files       XCOPY /E ..\..\*.h ..\..\..\..\lib\windows\guardedalloc\include\        ECHO Copying lib        XCOPY /E ..\..\..\..\obj\windows\intern\guardedalloc\*.lib ..\..\..\..\lib\windows\guardedalloc\lib\*.a ECHO Done
@@ -78,7 +78,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\intern\guardedalloc\debug\libguardedalloc.lib"
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PostBuild_Cmds=ECHO Copying header files       XCOPY /E ..\..\*.h ..\..\..\..\lib\windows\guardedalloc\include\        ECHO Copying lib        XCOPY /E ..\..\..\..\obj\windows\intern\guardedalloc\debug\*.lib ..\..\..\..\lib\windows\guardedalloc\lib\debug\*.a     ECHO Done

diff --git a/intern/iksolver/make/msvc_6_0/iksolver.dsp b/intern/iksolver/make/msvc_6_0/iksolver.dsp
index 73fff933fd4dcf6601694c300a4f1c83defa6a19..d0ab008e2d4b61240cb95d4f15b49be3d8676d28 100644 (file)
--- a/intern/iksolver/make/msvc_6_0/iksolver.dsp
+++ b/intern/iksolver/make/msvc_6_0/iksolver.dsp
@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\intern\iksolver\libiksolver.lib"
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PostBuild_Cmds=ECHO Copying header files       XCOPY /E ..\..\extern\*.h ..\..\..\..\lib\windows\iksolver\include\     ECHO Copying lib        XCOPY /E ..\..\..\..\obj\windows\intern\iksolver\*.lib ..\..\..\..\lib\windows\iksolver\lib\*.a ECHO Done
@@ -80,7 +80,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\intern\iksolver\debug\libiksolver.lib"
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PostBuild_Cmds=ECHO Copying header files       XCOPY /E ..\..\extern\*.h ..\..\..\..\lib\windows\iksolver\include\     ECHO Copying lib        XCOPY /E ..\..\..\..\obj\windows\intern\iksolver\debug\*.lib ..\..\..\..\lib\windows\iksolver\lib\debug\*.a     ECHO Done

diff --git a/intern/keymaker/make/msvc_6_0/blenkey.dsp b/intern/keymaker/make/msvc_6_0/blenkey.dsp
index 758006d81738b7abba3d3a0f9f2b16310f43d224..4fa00fe66b6b11a034b9ef358fc49f137f992da5 100644 (file)
--- a/intern/keymaker/make/msvc_6_0/blenkey.dsp
+++ b/intern/keymaker/make/msvc_6_0/blenkey.dsp
@@ -50,7 +50,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\intern\blenkey\libblenkey.lib"
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PostBuild_Cmds=ECHO Copying header files       XCOPY /E ..\..\blenkey.h ..\..\..\..\lib\windows\blenkey\include\       ECHO Copying lib        XCOPY /E ..\..\..\..\obj\windows\intern\blenkey\*.lib ..\..\..\..\lib\windows\blenkey\lib\*.a   ECHO Done
@@ -78,7 +78,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\intern\blenkey\debug\libblenkey.lib"
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PostBuild_Cmds=ECHO Copying header files       XCOPY /E ..\..\blenkey.h ..\..\..\..\lib\windows\blenkey\include\       ECHO Copying lib        XCOPY /E ..\..\..\..\obj\windows\intern\blenkey\debug\*.lib ..\..\..\..\lib\windows\blenkey\lib\debug\*.a

diff --git a/intern/string/make/msvc_6_0/string.dsp b/intern/string/make/msvc_6_0/string.dsp
index fdf0302b021f28c456ad76509369ee19bb24a6b6..6d1504dd12058cfc98a92eb1500df85153722413 100644 (file)
--- a/intern/string/make/msvc_6_0/string.dsp
+++ b/intern/string/make/msvc_6_0/string.dsp
@@ -50,7 +50,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\..\..\..\obj\windows\intern\string\libstring.lib"
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PostBuild_Cmds=ECHO Copying header files       XCOPY /E ..\..\*.h  ..\..\..\..\lib\windows\string\include\     ECHO Copying lib        XCOPY /E ..\..\..\..\obj\windows\intern\string\*.lib ..\..\..\..\lib\windows\string\lib\*.a     ECHO Done
@@ -78,7 +78,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
+# ADD LIB32 /nologo /out:"../../../../obj/windows/intern/string/debug\libstring.lib"
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PostBuild_Cmds=ECHO Copying header files       XCOPY /E ..\..\*.h  ..\..\..\..\lib\windows\string\include\     ECHO Copying lib        XCOPY /E ..\..\..\..\obj\windows\intern\string\debug\*.lib ..\..\..\..\lib\windows\string\lib\debug\*.a ECHO Done