PATCH: [ 1379227 ] Fix ExpatLibs BuildTmp paths

  Src/ExpatLib: expat_static.dsp
  Src/ExpatMapLib: expat_maps_static.dsp

diff --git a/Src/Changes.txt b/Src/Changes.txt
index 624e05d..08a57fd 100644 (file)
--- a/Src/Changes.txt
+++ b/Src/Changes.txt
@@ -3,6 +3,9 @@
   Src/Languages/Bulgarian: MergeBulgarian.rc
  PATCH: [ 1382131 ] English rc file has numbers instead of symbols for language
   Src: Merge.rc
+ PATCH: [ 1379227 ] Fix ExpatLibs BuildTmp paths
+  Src/ExpatLib: expat_static.dsp
+  Src/ExpatMapLib: expat_maps_static.dsp
 
 2005-12-16 Kimmo
  PATCH: [ 1381935 ] Simplify DirView icon loading

diff --git a/Src/ExpatLib/expat_static.dsp b/Src/ExpatLib/expat_static.dsp
index fe6be80..036c750 100644 (file)
--- a/Src/ExpatLib/expat_static.dsp
+++ b/Src/ExpatLib/expat_static.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_static"
-# PROP Intermediate_Dir "Release_static"
+# PROP Output_Dir "..\..\BuildTmp\expat_static\Release_static"
+# PROP Intermediate_Dir "..\..\BuildTmp\expat_static\Release_static"
 # PROP Target_Dir ""
 # 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 /D "WIN32" /D "_WINDOWS" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "COMPILED_FROM_DSP" /FD /c
@@ -50,7 +50,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"Release_static\libexpatMT.lib"
+# ADD LIB32 /nologo /out:"..\..\Build\MergeReleaseStatic\libexpatMT.lib"
 
 !ELSEIF  "$(CFG)" == "expat_static - 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_static"
-# PROP Intermediate_Dir "Debug_static"
+# PROP Output_Dir "..\..\BuildTmp\expat_static\Debug_static"
+# PROP Intermediate_Dir "..\..\BuildTmp\expat_static\Debug_static"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
 # ADD CPP /nologo /MTd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "COMPILED_FROM_DSP" /D "_MBCS" /D "_LIB" /FR /FD /GZ /c
@@ -74,7 +74,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"Debug_static\libexpatMT.lib"
+# ADD LIB32 /nologo /out:"..\..\Build\MergeDebugStatic\libexpatMT.lib"
 
 !ENDIF 
 

diff --git a/Src/ExpatMapLib/expat_maps_static.dsp b/Src/ExpatMapLib/expat_maps_static.dsp
index cc97f34..63486bb 100644 (file)
--- a/Src/ExpatMapLib/expat_maps_static.dsp
+++ b/Src/ExpatMapLib/expat_maps_static.dsp
@@ -37,8 +37,8 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 2
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release_static"
-# PROP Intermediate_Dir "Release_static"
+# PROP Output_Dir "..\..\BuildTmp\expat_maps_static\Release_static"
+# PROP Intermediate_Dir "..\..\BuildTmp\expat_maps_static\Release_static"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /YX /FD /c
 # ADD CPP /nologo /MT /W3 /GX /O2 /I "..\ExpatLib" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /YX /FD /c
@@ -49,7 +49,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"Release_static\libexpatMapsMT.lib"
+# ADD LIB32 /nologo /out:"..\..\Build\MergeReleaseStatic\libexpatMapsMT.lib"
 
 !ELSEIF  "$(CFG)" == "expat_maps_static - Win32 Debug"
 
@@ -60,8 +60,8 @@ LIB32=link.exe -lib
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 2
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug_static"
-# PROP Intermediate_Dir "Debug_static"
+# PROP Output_Dir "..\..\BuildTmp\expat_maps_static\Debug_static"
+# PROP Intermediate_Dir "..\..\BuildTmp\expat_maps_static\Debug_static"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /YX /FD /GZ /c
 # ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\ExpatLib" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /YX /FD /GZ /c
@@ -72,7 +72,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"Debug_static\libexpatMapsMT.lib"
+# ADD LIB32 /nologo /out:"..\..\Build\MergeDebugStatic\libexpatMapsMT.lib"
 
 !ENDIF