Updated output directory settings, so that they all point to win32/bin/Debug

or win32/bin/Release. This ensures that executables can find the libraries
they depend on. Intermediate files will go into a subdirectory of win32/tmp.

diff --git a/expat/lib/expat.dsp b/expat/lib/expat.dsp
index 66374f30faa3bf9f350b5d6f98c9edc059fb508b..b303253be20c571fb4b6564118ee38bcbfb4ddab 100644 (file)
--- a/expat/lib/expat.dsp
+++ b/expat/lib/expat.dsp
@@ -38,8 +38,8 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "Release"\r
-# PROP Intermediate_Dir "Release"\r
+# PROP Output_Dir "..\win32\bin\Release"\r
+# PROP Intermediate_Dir "..\win32\tmp\Release"\r
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "EXPAT_EXPORTS" /Yu"stdafx.h" /FD /c\r
@@ -54,7 +54,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # 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 /nologo /dll /machine:I386\r
-# ADD 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 /nologo /dll /pdb:none /machine:I386 /out:"Release\libexpat.dll"\r
+# ADD 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 /nologo /dll /pdb:none /machine:I386 /out:"..\win32\bin\Release/libexpat.dll"\r
 \r
 !ELSEIF  "$(CFG)" == "expat - Win32 Debug"\r
 \r
@@ -65,8 +65,9 @@ LINK32=link.exe
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "Debug"\r
-# PROP Intermediate_Dir "Debug"\r
+# PROP Output_Dir "..\win32\bin\Debug"\r
+# PROP Intermediate_Dir "..\win32\tmp\Debug"\r
+# PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "EXPAT_EXPORTS" /Yu"stdafx.h" /FD /GZ /c\r
 # ADD CPP /nologo /MTd /W3 /GX /ZI /Od /D "_DEBUG" /D "COMPILED_FROM_DSP" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /FR /FD /GZ /c\r
@@ -79,7 +80,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # 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 /nologo /dll /debug /machine:I386 /pdbtype:sept\r
-# ADD 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 /nologo /dll /pdb:none /debug /machine:I386 /out:"Debug\libexpat.dll"\r
+# ADD 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 /nologo /dll /pdb:none /debug /machine:I386 /out:"..\win32\bin\Debug/libexpat.dll"\r
 \r
 !ENDIF \r
 \r

diff --git a/expat/lib/expat_static.dsp b/expat/lib/expat_static.dsp
index aa552f529434b75145f1f5aee67d9ffa632f95e0..1d68fcefb66e6564fd32fdad23d22a138effd00e 100644 (file)
--- a/expat/lib/expat_static.dsp
+++ b/expat/lib/expat_static.dsp
@@ -37,8 +37,8 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "Release_static"\r
-# PROP Intermediate_Dir "Release_static"\r
+# PROP Output_Dir "..\win32\bin\Release"\r
+# PROP Intermediate_Dir "..\win32\tmp\Release_static"\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c\r
 # ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "_WINDOWS" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "COMPILED_FROM_DSP" /FD /c\r
@@ -50,7 +50,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LIB32=link.exe -lib\r
 # ADD BASE LIB32 /nologo\r
-# ADD LIB32 /nologo /out:"Release_static\libexpatMT.lib"\r
+# ADD LIB32 /nologo /out:"..\win32\bin\Release/libexpatMT.lib"\r
 \r
 !ELSEIF  "$(CFG)" == "expat_static - Win32 Debug"\r
 \r
@@ -61,8 +61,8 @@ LIB32=link.exe -lib
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "Debug_static"\r
-# PROP Intermediate_Dir "Debug_static"\r
+# PROP Output_Dir "..\win32\bin\Debug"\r
+# PROP Intermediate_Dir "..\win32\tmp\Debug_static"\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c\r
 # 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\r
@@ -74,7 +74,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LIB32=link.exe -lib\r
 # ADD BASE LIB32 /nologo\r
-# ADD LIB32 /nologo /out:"Debug_static\libexpatMT.lib"\r
+# ADD LIB32 /nologo /out:"..\win32\bin\Debug\libexpatMT.lib"\r
 \r
 !ENDIF \r
 \r

diff --git a/expat/lib/expatw.dsp b/expat/lib/expatw.dsp
index fbc00d7899e4f011adfeb76e78471bc896090939..fa40dc55d5899303f59f66378976c9f424c0fdac 100644 (file)
--- a/expat/lib/expatw.dsp
+++ b/expat/lib/expatw.dsp
@@ -38,8 +38,8 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "Release-w"\r
-# PROP Intermediate_Dir "Release-w"\r
+# PROP Output_Dir "..\win32\bin\Release"\r
+# PROP Intermediate_Dir "..\win32\tmp\Release-w"\r
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "EXPAT_EXPORTS" /Yu"stdafx.h" /FD /c\r
@@ -54,7 +54,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # 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 /nologo /dll /machine:I386\r
-# ADD 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 /nologo /dll /pdb:none /machine:I386 /out:"Release-w\libexpatw.dll"\r
+# ADD 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 /nologo /dll /pdb:none /machine:I386 /out:"..\win32\bin\Release/libexpatw.dll"\r
 \r
 !ELSEIF  "$(CFG)" == "expatw - Win32 Debug"\r
 \r
@@ -65,8 +65,8 @@ LINK32=link.exe
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "Debug-w"\r
-# PROP Intermediate_Dir "Debug-w"\r
+# PROP Output_Dir "..\win32\bin\Debug"\r
+# PROP Intermediate_Dir "..\win32\tmp\Debug-w"\r
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "EXPAT_EXPORTS" /Yu"stdafx.h" /FD /GZ /c\r
@@ -80,7 +80,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # 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 /nologo /dll /debug /machine:I386 /pdbtype:sept\r
-# ADD 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 /nologo /dll /pdb:none /debug /machine:I386 /out:"Debug-w\libexpatw.dll"\r
+# ADD 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 /nologo /dll /pdb:none /debug /machine:I386 /out:"..\win32\bin\Debug/libexpatw.dll"\r
 \r
 !ENDIF \r
 \r

diff --git a/expat/lib/expatw_static.dsp b/expat/lib/expatw_static.dsp
index c5b2ecf1fe05e69461aa912815a62809cc0c5b6b..f13dd72978a65df4123dbe90a828a11b887a97fd 100644 (file)
--- a/expat/lib/expatw_static.dsp
+++ b/expat/lib/expatw_static.dsp
@@ -37,8 +37,8 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "Release-w_static"\r
-# PROP Intermediate_Dir "Release-w_static"\r
+# PROP Output_Dir "..\win32\bin\Release"\r
+# PROP Intermediate_Dir "..\win32\tmp\Release-w_static"\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c\r
 # ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "_WINDOWS" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "COMPILED_FROM_DSP" /D "XML_UNICODE_WCHAR_T" /FD /c\r
@@ -50,7 +50,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LIB32=link.exe -lib\r
 # ADD BASE LIB32 /nologo\r
-# ADD LIB32 /nologo /out:"Release-w_static\libexpatwMT.lib"\r
+# ADD LIB32 /nologo /out:"..\win32\bin\Release\libexpatwMT.lib"\r
 \r
 !ELSEIF  "$(CFG)" == "expatw_static - Win32 Debug"\r
 \r
@@ -61,8 +61,8 @@ LIB32=link.exe -lib
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "Debug-w_static"\r
-# PROP Intermediate_Dir "Debug-w_static"\r
+# PROP Output_Dir "..\win32\bin\Debug"\r
+# PROP Intermediate_Dir "..\win32\tmp\Debug-w_static"\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c\r
 # ADD CPP /nologo /MTd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_LIB" /D "COMPILED_FROM_DSP" /D "XML_UNICODE_WCHAR_T" /FR /FD /GZ /c\r
@@ -74,7 +74,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LIB32=link.exe -lib\r
 # ADD BASE LIB32 /nologo\r
-# ADD LIB32 /nologo /out:"Debug-w_static\libexpatwMT.lib"\r
+# ADD LIB32 /nologo /out:"..\win32\bin\Debug\libexpatwMT.lib"\r
 \r
 !ENDIF \r
 \r