Created
February 9, 2018 08:31
-
-
Save JBlond/dbb2aebca834552ad4f3c5376c9f9360 to your computer and use it in GitHub Desktop.
aprutilx4h-win.patch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Index: Apache.dsw | |
| =================================================================== | |
| --- Apache.dsw (revision 1816075) | |
| +++ Apache.dsw (working copy) | |
| @@ -494,6 +494,9 @@ | |
| Begin Project Dependency | |
| Project_Dep_Name apriconv | |
| End Project Dependency | |
| + Begin Project Dependency | |
| + Project_Dep_Name xml | |
| + End Project Dependency | |
| }}} | |
| ############################################################################### | |
| @@ -863,6 +866,9 @@ | |
| Begin Project Dependency | |
| Project_Dep_Name libapriconv | |
| End Project Dependency | |
| + Begin Project Dependency | |
| + Project_Dep_Name xml | |
| + End Project Dependency | |
| }}} | |
| ############################################################################### | |
| @@ -3515,6 +3521,18 @@ | |
| ############################################################################### | |
| +Project: "xml"=".\srclib\apr-util\xml\xml.dsp" - Package Owner=<4> | |
| + | |
| +Package=<5> | |
| +{{{ | |
| +}}} | |
| + | |
| +Package=<4> | |
| +{{{ | |
| +}}} | |
| + | |
| +############################################################################### | |
| + | |
| Global: | |
| Package=<5> | |
| Index: srclib/apr-util/aprutil.dep | |
| =================================================================== | |
| --- srclib/apr-util/aprutil.dep (revision 1816098) | |
| +++ srclib/apr-util/aprutil.dep (working copy) | |
| @@ -377,6 +377,7 @@ | |
| ".\include\apr_xml.h"\ | |
| ".\include\apu.h"\ | |
| ".\include\private\apu_config.h"\ | |
| + ".\xml\expat\lib\expat.h"\ | |
| !IF "$(CFG)" == "aprutil - Win32 Release" | |
| Index: srclib/apr-util/aprutil.dsw | |
| =================================================================== | |
| --- srclib/apr-util/aprutil.dsw (revision 1816098) | |
| +++ srclib/apr-util/aprutil.dsw (working copy) | |
| @@ -51,6 +51,24 @@ | |
| ############################################################################### | |
| +Project: "apr_dbd_freetds"=".\dbd\apr_dbd_freetds.dsp" - Package Owner=<4> | |
| + | |
| +Package=<5> | |
| +{{{ | |
| +}}} | |
| + | |
| +Package=<4> | |
| +{{{ | |
| + Begin Project Dependency | |
| + Project_Dep_Name libapr | |
| + End Project Dependency | |
| + Begin Project Dependency | |
| + Project_Dep_Name libaprutil | |
| + End Project Dependency | |
| +}}} | |
| + | |
| +############################################################################### | |
| + | |
| Project: "apr_dbd_mysql"=".\dbd\apr_dbd_mysql.dsp" - Package Owner=<4> | |
| Package=<5> | |
| @@ -257,6 +275,9 @@ | |
| Begin Project Dependency | |
| Project_Dep_Name apriconv | |
| End Project Dependency | |
| + Begin Project Dependency | |
| + Project_Dep_Name xml | |
| + End Project Dependency | |
| }}} | |
| ############################################################################### | |
| @@ -362,6 +383,9 @@ | |
| Begin Project Dependency | |
| Project_Dep_Name libapriconv_ces_modules | |
| End Project Dependency | |
| + Begin Project Dependency | |
| + Project_Dep_Name xml | |
| + End Project Dependency | |
| }}} | |
| ############################################################################### | |
| @@ -429,6 +453,18 @@ | |
| ############################################################################### | |
| +Project: "xml"=".\xml\xml.dsp" - Package Owner=<4> | |
| + | |
| +Package=<5> | |
| +{{{ | |
| +}}} | |
| + | |
| +Package=<4> | |
| +{{{ | |
| +}}} | |
| + | |
| +############################################################################### | |
| + | |
| Global: | |
| Package=<5> | |
| Index: srclib/apr-util/aprutil.mak | |
| =================================================================== | |
| --- srclib/apr-util/aprutil.mak (revision 1816098) | |
| +++ srclib/apr-util/aprutil.mak (working copy) | |
| @@ -47,12 +47,12 @@ | |
| !ELSE | |
| -ALL : "apriconv - Win32 Release" "$(OUTDIR)\aprutil-1.lib" | |
| +ALL : "xml - Win32 Release" "apriconv - Win32 Release" "$(OUTDIR)\aprutil-1.lib" | |
| !ENDIF | |
| !IF "$(RECURSE)" == "1" | |
| -CLEAN :"apriconv - Win32 ReleaseCLEAN" | |
| +CLEAN :"apriconv - Win32 ReleaseCLEAN" "xml - Win32 ReleaseCLEAN" | |
| !ELSE | |
| CLEAN : | |
| !ENDIF | |
| @@ -218,7 +218,8 @@ | |
| "$(INTDIR)\apr_uri.obj" \ | |
| "$(INTDIR)\xlate.obj" \ | |
| "$(INTDIR)\apr_xml.obj" \ | |
| - "..\apr-iconv\LibR\apriconv-1.lib" | |
| + "..\apr-iconv\LibR\apriconv-1.lib" \ | |
| + ".\xml\LibR\xml.lib" | |
| "$(OUTDIR)\aprutil-1.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS) | |
| $(LIB32) @<< | |
| @@ -239,12 +240,12 @@ | |
| !ELSE | |
| -ALL : "apriconv - Win32 Debug" ".\include\private\apu_select_dbm.h" ".\include\private\apu_config.h" ".\include\apu_want.h" ".\include\apu.h" ".\include\apr_ldap.h" "$(OUTDIR)\aprutil-1.lib" | |
| +ALL : "xml - Win32 Debug" "apriconv - Win32 Debug" ".\include\private\apu_select_dbm.h" ".\include\private\apu_config.h" ".\include\apu_want.h" ".\include\apu.h" ".\include\apr_ldap.h" "$(OUTDIR)\aprutil-1.lib" | |
| !ENDIF | |
| !IF "$(RECURSE)" == "1" | |
| -CLEAN :"apriconv - Win32 DebugCLEAN" | |
| +CLEAN :"apriconv - Win32 DebugCLEAN" "xml - Win32 DebugCLEAN" | |
| !ELSE | |
| CLEAN : | |
| !ENDIF | |
| @@ -415,7 +416,8 @@ | |
| "$(INTDIR)\apr_uri.obj" \ | |
| "$(INTDIR)\xlate.obj" \ | |
| "$(INTDIR)\apr_xml.obj" \ | |
| - "..\apr-iconv\LibD\apriconv-1.lib" | |
| + "..\apr-iconv\LibD\apriconv-1.lib" \ | |
| + ".\xml\LibD\xml.lib" | |
| "$(OUTDIR)\aprutil-1.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS) | |
| $(LIB32) @<< | |
| @@ -436,12 +438,12 @@ | |
| !ELSE | |
| -ALL : "apriconv - x64 Release" ".\include\private\apu_select_dbm.h" ".\include\private\apu_config.h" ".\include\apu_want.h" ".\include\apu.h" ".\include\apr_ldap.h" "$(OUTDIR)\aprutil-1.lib" | |
| +ALL : "xml - x64 Release" "apriconv - x64 Release" ".\include\private\apu_select_dbm.h" ".\include\private\apu_config.h" ".\include\apu_want.h" ".\include\apu.h" ".\include\apr_ldap.h" "$(OUTDIR)\aprutil-1.lib" | |
| !ENDIF | |
| !IF "$(RECURSE)" == "1" | |
| -CLEAN :"apriconv - x64 ReleaseCLEAN" | |
| +CLEAN :"apriconv - x64 ReleaseCLEAN" "xml - x64 ReleaseCLEAN" | |
| !ELSE | |
| CLEAN : | |
| !ENDIF | |
| @@ -612,7 +614,8 @@ | |
| "$(INTDIR)\apr_uri.obj" \ | |
| "$(INTDIR)\xlate.obj" \ | |
| "$(INTDIR)\apr_xml.obj" \ | |
| - "..\apr-iconv\x64\LibR\apriconv-1.lib" | |
| + "..\apr-iconv\x64\LibR\apriconv-1.lib" \ | |
| + ".\xml\x64\LibR\xml.lib" | |
| "$(OUTDIR)\aprutil-1.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS) | |
| $(LIB32) @<< | |
| @@ -633,12 +636,12 @@ | |
| !ELSE | |
| -ALL : "apriconv - x64 Debug" ".\include\private\apu_select_dbm.h" ".\include\private\apu_config.h" ".\include\apu_want.h" ".\include\apu.h" ".\include\apr_ldap.h" "$(OUTDIR)\aprutil-1.lib" | |
| +ALL : "xml - x64 Debug" "apriconv - x64 Debug" ".\include\private\apu_select_dbm.h" ".\include\private\apu_config.h" ".\include\apu_want.h" ".\include\apu.h" ".\include\apr_ldap.h" "$(OUTDIR)\aprutil-1.lib" | |
| !ENDIF | |
| !IF "$(RECURSE)" == "1" | |
| -CLEAN :"apriconv - x64 DebugCLEAN" | |
| +CLEAN :"apriconv - x64 DebugCLEAN" "xml - x64 DebugCLEAN" | |
| !ELSE | |
| CLEAN : | |
| !ENDIF | |
| @@ -809,7 +812,8 @@ | |
| "$(INTDIR)\apr_uri.obj" \ | |
| "$(INTDIR)\xlate.obj" \ | |
| "$(INTDIR)\apr_xml.obj" \ | |
| - "..\apr-iconv\x64\LibD\apriconv-1.lib" | |
| + "..\apr-iconv\x64\LibD\apriconv-1.lib" \ | |
| + ".\xml\x64\LibD\xml.lib" | |
| "$(OUTDIR)\aprutil-1.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS) | |
| $(LIB32) @<< | |
| @@ -1461,6 +1465,56 @@ | |
| !ENDIF | |
| +!IF "$(CFG)" == "aprutil - Win32 Release" | |
| +"xml - Win32 Release" : | |
| + cd ".\xml\expat\lib" | |
| + $(MAKE) /$(MAKEFLAGS) /F ".\xml.mak" CFG="xml - Win32 Release" | |
| + cd "..\..\.." | |
| + | |
| +"xml - Win32 ReleaseCLEAN" : | |
| + cd ".\xml\expat\lib" | |
| + $(MAKE) /$(MAKEFLAGS) /F ".\xml.mak" CFG="xml - Win32 Release" RECURSE=1 CLEAN | |
| + cd "..\..\.." | |
| + | |
| +!ELSEIF "$(CFG)" == "aprutil - Win32 Debug" | |
| + | |
| +"xml - Win32 Debug" : | |
| + cd ".\xml\expat\lib" | |
| + $(MAKE) /$(MAKEFLAGS) /F ".\xml.mak" CFG="xml - Win32 Debug" | |
| + cd "..\..\.." | |
| + | |
| +"xml - Win32 DebugCLEAN" : | |
| + cd ".\xml\expat\lib" | |
| + $(MAKE) /$(MAKEFLAGS) /F ".\xml.mak" CFG="xml - Win32 Debug" RECURSE=1 CLEAN | |
| + cd "..\..\.." | |
| + | |
| +!ELSEIF "$(CFG)" == "aprutil - x64 Release" | |
| + | |
| +"xml - x64 Release" : | |
| + cd ".\xml\expat\lib" | |
| + $(MAKE) /$(MAKEFLAGS) /F ".\xml.mak" CFG="xml - x64 Release" | |
| + cd "..\..\.." | |
| + | |
| +"xml - x64 ReleaseCLEAN" : | |
| + cd ".\xml\expat\lib" | |
| + $(MAKE) /$(MAKEFLAGS) /F ".\xml.mak" CFG="xml - x64 Release" RECURSE=1 CLEAN | |
| + cd "..\..\.." | |
| + | |
| +!ELSEIF "$(CFG)" == "aprutil - x64 Debug" | |
| + | |
| +"xml - x64 Debug" : | |
| + cd ".\xml\expat\lib" | |
| + $(MAKE) /$(MAKEFLAGS) /F ".\xml.mak" CFG="xml - x64 Debug" | |
| + cd "..\..\.." | |
| + | |
| +"xml - x64 DebugCLEAN" : | |
| + cd ".\xml\expat\lib" | |
| + $(MAKE) /$(MAKEFLAGS) /F ".\xml.mak" CFG="xml - x64 Debug" RECURSE=1 CLEAN | |
| + cd "..\..\.." | |
| + | |
| !ENDIF | |
| + | |
| +!ENDIF | |
| + | |
| Index: srclib/apr-util/libaprutil.dep | |
| =================================================================== | |
| --- srclib/apr-util/libaprutil.dep (revision 1816098) | |
| +++ srclib/apr-util/libaprutil.dep (working copy) | |
| @@ -281,6 +281,7 @@ | |
| ".\include\apr_xml.h"\ | |
| ".\include\apu.h"\ | |
| ".\include\private\apu_config.h"\ | |
| + ".\xml\expat\lib\expat.h"\ | |
| !IF "$(CFG)" == "libaprutil - Win32 Release" | |
| Index: srclib/apr-util/libaprutil.dsp | |
| =================================================================== | |
| --- srclib/apr-util/libaprutil.dsp (revision 1816098) | |
| +++ srclib/apr-util/libaprutil.dsp (working copy) | |
| @@ -45,7 +45,7 @@ | |
| # PROP Ignore_Export_Lib 0 | |
| # PROP Target_Dir "" | |
| # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c | |
| -# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "../apr/include" /I "./include/private" /I "./xml/expat/lib" /I "../apr-iconv/include" /I "./dbm/sdbm" /D "NDEBUG" /D "APR_DECLARE_EXPORT" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM" $(XML_OPTIONS) /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(INTDIR)\libaprutil_src" /FD /c | |
| +# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "../apr/include" /I "./include/private" /I "./xml/expat/lib" /I "../apr-iconv/include" /I "./dbm/sdbm" /D "NDEBUG" /D "APR_DECLARE_EXPORT" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM" /D "XML_STATIC" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(INTDIR)\libaprutil_src" /FD /c | |
| # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" | |
| # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" | |
| # ADD BASE RSC /l 0x409 /d "NDEBUG" | |
| @@ -55,7 +55,7 @@ | |
| # ADD BSC32 /nologo | |
| LINK32=link.exe | |
| # ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /debug /opt:ref | |
| -# ADD LINK32 $(XML_PARSER).lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /debug /out:"Release\libaprutil-1.dll" /pdb:"Release\libaprutil-1.pdb" /implib:"Release\libaprutil-1.lib" /MACHINE:X86 /opt:ref | |
| +# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib xml.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /debug /out:"Release\libaprutil-1.dll" /pdb:"Release\libaprutil-1.pdb" /implib:"Release\libaprutil-1.lib" /libpath:"xml/LibR" /MACHINE:X86 /opt:ref | |
| # Begin Special Build Tool | |
| TargetPath=Release\libaprutil-1.dll | |
| SOURCE="$(InputPath)" | |
| @@ -77,7 +77,7 @@ | |
| # PROP Ignore_Export_Lib 0 | |
| # PROP Target_Dir "" | |
| # ADD BASE CPP /nologo /MDd /W3 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /EHsc /c | |
| -# ADD CPP /nologo /MDd /W3 /Zi /Od /I "./include" /I "../apr/include" /I "./include/private" /I "./xml/expat/lib" /I "../apr-iconv/include" /I "./dbm/sdbm" /D "_DEBUG" /D "APR_DECLARE_EXPORT" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM" $(XML_OPTIONS) /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(INTDIR)\libaprutil_src" /FD /EHsc /c | |
| +# ADD CPP /nologo /MDd /W3 /Zi /Od /I "./include" /I "../apr/include" /I "./include/private" /I "./xml/expat/lib" /I "../apr-iconv/include" /I "./dbm/sdbm" /D "_DEBUG" /D "APR_DECLARE_EXPORT" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM" /D "XML_STATIC" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(INTDIR)\libaprutil_src" /FD /EHsc /c | |
| # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" | |
| # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" | |
| # ADD BASE RSC /l 0x409 /d "_DEBUG" | |
| @@ -87,7 +87,7 @@ | |
| # ADD BSC32 /nologo | |
| LINK32=link.exe | |
| # ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /debug | |
| -# ADD LINK32 $(XML_PARSER).lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /debug /out:"Debug\libaprutil-1.dll" /pdb:"Debug\libaprutil-1.pdb" /implib:"Debug\libaprutil-1.lib" /MACHINE:X86 | |
| +# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib xml.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /debug /out:"Debug\libaprutil-1.dll" /pdb:"Debug\libaprutil-1.pdb" /implib:"Debug\libaprutil-1.lib" /libpath:"xml/LibD" /MACHINE:X86 | |
| # Begin Special Build Tool | |
| TargetPath=Debug\libaprutil-1.dll | |
| SOURCE="$(InputPath)" | |
| @@ -109,7 +109,7 @@ | |
| # PROP Ignore_Export_Lib 0 | |
| # PROP Target_Dir "" | |
| # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c | |
| -# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "../apr/include" /I "./include/private" /I "./xml/expat/lib" /I "../apr-iconv/include" /I "./dbm/sdbm" /D "NDEBUG" /D "APR_DECLARE_EXPORT" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM" $(XML_OPTIONS) /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(INTDIR)\libaprutil_src" /FD /c | |
| +# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "../apr/include" /I "./include/private" /I "./xml/expat/lib" /I "../apr-iconv/include" /I "./dbm/sdbm" /D "NDEBUG" /D "APR_DECLARE_EXPORT" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM" /D "XML_STATIC" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(INTDIR)\libaprutil_src" /FD /c | |
| # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" | |
| # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" | |
| # ADD BASE RSC /l 0x409 /d "NDEBUG" | |
| @@ -119,7 +119,7 @@ | |
| # ADD BSC32 /nologo | |
| LINK32=link.exe | |
| # ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /debug /opt:ref | |
| -# ADD LINK32 $(XML_PARSER).lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /debug /out:"x64\Release\libaprutil-1.dll" /pdb:"x64\Release\libaprutil-1.pdb" /implib:"x64\Release\libaprutil-1.lib" /MACHINE:X64 /opt:ref | |
| +# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib xml.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /debug /out:"x64\Release\libaprutil-1.dll" /pdb:"x64\Release\libaprutil-1.pdb" /implib:"x64\Release\libaprutil-1.lib" /libpath:"xml/x64/LibR" /MACHINE:X64 /opt:ref | |
| # Begin Special Build Tool | |
| TargetPath=x64\Release\libaprutil-1.dll | |
| SOURCE="$(InputPath)" | |
| @@ -141,7 +141,7 @@ | |
| # PROP Ignore_Export_Lib 0 | |
| # PROP Target_Dir "" | |
| # ADD BASE CPP /nologo /MDd /W3 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /EHsc /c | |
| -# ADD CPP /nologo /MDd /W3 /Zi /Od /I "./include" /I "../apr/include" /I "./include/private" /I "./xml/expat/lib" /I "../apr-iconv/include" /I "./dbm/sdbm" /D "_DEBUG" /D "APR_DECLARE_EXPORT" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM" $(XML_OPTIONS) /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(INTDIR)\libaprutil_src" /FD /EHsc /c | |
| +# ADD CPP /nologo /MDd /W3 /Zi /Od /I "./include" /I "../apr/include" /I "./include/private" /I "./xml/expat/lib" /I "../apr-iconv/include" /I "./dbm/sdbm" /D "_DEBUG" /D "APR_DECLARE_EXPORT" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM" /D "XML_STATIC" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(INTDIR)\libaprutil_src" /FD /EHsc /c | |
| # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" | |
| # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" | |
| # ADD BASE RSC /l 0x409 /d "_DEBUG" | |
| @@ -151,7 +151,7 @@ | |
| # ADD BSC32 /nologo | |
| LINK32=link.exe | |
| # ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /debug | |
| -# ADD LINK32 $(XML_PARSER).lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /debug /out:"x64\Debug\libaprutil-1.dll" /pdb:"x64\Debug\libaprutil-1.pdb" /implib:"x64\Debug\libaprutil-1.lib" /MACHINE:X64 | |
| +# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib xml.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /debug /out:"x64\Debug\libaprutil-1.dll" /pdb:"x64\Debug\libaprutil-1.pdb" /implib:"x64\Debug\libaprutil-1.lib" /libpath:"xml/LibD" /MACHINE:X64 | |
| # Begin Special Build Tool | |
| TargetPath=x64\Debug\libaprutil-1.dll | |
| SOURCE="$(InputPath)" | |
| Index: srclib/apr-util/libaprutil.mak | |
| =================================================================== | |
| --- srclib/apr-util/libaprutil.mak (revision 1816098) | |
| +++ srclib/apr-util/libaprutil.mak (working copy) | |
| @@ -116,7 +116,7 @@ | |
| if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" | |
| CPP=cl.exe | |
| -CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "../apr/include" /I "./include/private" /I "../apr-iconv/include" /I "./dbm/sdbm" /I "./xml/expat/lib" $(SSLINC) /D "NDEBUG" /D "APR_DECLARE_EXPORT" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM" $(XML_OPTIONS) /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\libaprutil_src" /FD /c | |
| +CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "../apr/include" /I "./include/private" /I "../apr-iconv/include" /I "./dbm/sdbm" /I "./xml/expat/lib" $(SSLINC) /D "NDEBUG" /D "APR_DECLARE_EXPORT" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM" /D "XML_STATIC" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\libaprutil_src" /FD /c | |
| .c{$(INTDIR)}.obj:: | |
| $(CPP) @<< | |
| @@ -157,7 +157,7 @@ | |
| BSC32_SBRS= \ | |
| LINK32=link.exe | |
| -LINK32_FLAGS=$(XML_PARSER).lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\libaprutil-1.pdb" /debug /out:"$(OUTDIR)\libaprutil-1.dll" /implib:"$(OUTDIR)\libaprutil-1.lib" /opt:ref | |
| +LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\libaprutil-1.pdb" /debug /out:"$(OUTDIR)\libaprutil-1.dll" /implib:"$(OUTDIR)\libaprutil-1.lib" /opt:ref | |
| LINK32_OBJS= \ | |
| "$(INTDIR)\apr_brigade.obj" \ | |
| "$(INTDIR)\apr_buckets.obj" \ | |
| @@ -207,7 +207,8 @@ | |
| "$(INTDIR)\apr_xml.obj" \ | |
| "$(INTDIR)\libaprutil.res" \ | |
| "..\apr\Release\libapr-1.lib" \ | |
| - "..\apr-iconv\Release\libapriconv-1.lib" | |
| + "..\apr-iconv\Release\libapriconv-1.lib" \ | |
| + ".\xml\LibR\xml.lib" | |
| "$(OUTDIR)\libaprutil-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) | |
| $(LINK32) @<< | |
| @@ -314,7 +315,7 @@ | |
| if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" | |
| CPP=cl.exe | |
| -CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "./include" /I "../apr/include" /I "./include/private" /I "../apr-iconv/include" /I "./dbm/sdbm" /I "./xml/expat/lib" $(SSLINC) /D "_DEBUG" /D "APR_DECLARE_EXPORT" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM" $(XML_OPTIONS) /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\libaprutil_src" /FD /EHsc /c | |
| +CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "./include" /I "../apr/include" /I "./include/private" /I "../apr-iconv/include" /I "./dbm/sdbm" /I "./xml/expat/lib" $(SSLINC) /D "_DEBUG" /D "APR_DECLARE_EXPORT" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM" /D "XML_STATIC" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\libaprutil_src" /FD /EHsc /c | |
| .c{$(INTDIR)}.obj:: | |
| $(CPP) @<< | |
| @@ -355,7 +356,7 @@ | |
| BSC32_SBRS= \ | |
| LINK32=link.exe | |
| -LINK32_FLAGS=$(XML_PARSER).lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\libaprutil-1.pdb" /debug /out:"$(OUTDIR)\libaprutil-1.dll" /implib:"$(OUTDIR)\libaprutil-1.lib" | |
| +LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\libaprutil-1.pdb" /debug /out:"$(OUTDIR)\libaprutil-1.dll" /implib:"$(OUTDIR)\libaprutil-1.lib" | |
| LINK32_OBJS= \ | |
| "$(INTDIR)\apr_brigade.obj" \ | |
| "$(INTDIR)\apr_buckets.obj" \ | |
| @@ -405,7 +406,8 @@ | |
| "$(INTDIR)\apr_xml.obj" \ | |
| "$(INTDIR)\libaprutil.res" \ | |
| "..\apr\Debug\libapr-1.lib" \ | |
| - "..\apr-iconv\Debug\libapriconv-1.lib" | |
| + "..\apr-iconv\Debug\libapriconv-1.lib" \ | |
| + ".\xml\LibD\xml.lib" | |
| "$(OUTDIR)\libaprutil-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) | |
| $(LINK32) @<< | |
| @@ -512,7 +514,7 @@ | |
| if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" | |
| CPP=cl.exe | |
| -CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "../apr/include" /I "./include/private" /I "../apr-iconv/include" /I "./dbm/sdbm" /I "./xml/expat/lib" $(SSLINC) /D "NDEBUG" /D "APR_DECLARE_EXPORT" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM" $(XML_OPTIONS) /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\libaprutil_src" /FD /c | |
| +CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "../apr/include" /I "./include/private" /I "../apr-iconv/include" /I "./dbm/sdbm" /I "./xml/expat/lib" $(SSLINC) /D "NDEBUG" /D "APR_DECLARE_EXPORT" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM" /D "XML_STATIC" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\libaprutil_src" /FD /c | |
| .c{$(INTDIR)}.obj:: | |
| $(CPP) @<< | |
| @@ -553,7 +555,7 @@ | |
| BSC32_SBRS= \ | |
| LINK32=link.exe | |
| -LINK32_FLAGS=$(XML_PARSER).lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\libaprutil-1.pdb" /debug /out:"$(OUTDIR)\libaprutil-1.dll" /implib:"$(OUTDIR)\libaprutil-1.lib" /opt:ref | |
| +LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\libaprutil-1.pdb" /debug /out:"$(OUTDIR)\libaprutil-1.dll" /implib:"$(OUTDIR)\libaprutil-1.lib" /opt:ref | |
| LINK32_OBJS= \ | |
| "$(INTDIR)\apr_brigade.obj" \ | |
| "$(INTDIR)\apr_buckets.obj" \ | |
| @@ -603,7 +605,8 @@ | |
| "$(INTDIR)\apr_xml.obj" \ | |
| "$(INTDIR)\libaprutil.res" \ | |
| "..\apr\x64\Release\libapr-1.lib" \ | |
| - "..\apr-iconv\x64\Release\libapriconv-1.lib" | |
| + "..\apr-iconv\x64\Release\libapriconv-1.lib" \ | |
| + ".\xml\x64\LibR\xml.lib" | |
| "$(OUTDIR)\libaprutil-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) | |
| $(LINK32) @<< | |
| @@ -710,7 +713,7 @@ | |
| if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" | |
| CPP=cl.exe | |
| -CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "./include" /I "../apr/include" /I "./include/private" /I "../apr-iconv/include" /I "./dbm/sdbm" /I "./xml/expat/lib" $(SSLINC) /D "_DEBUG" /D "APR_DECLARE_EXPORT" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM" $(XML_OPTIONS) /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\libaprutil_src" /FD /EHsc /c | |
| +CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "./include" /I "../apr/include" /I "./include/private" /I "../apr-iconv/include" /I "./dbm/sdbm" /I "./xml/expat/lib" $(SSLINC) /D "_DEBUG" /D "APR_DECLARE_EXPORT" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM" /D "XML_STATIC" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\libaprutil_src" /FD /EHsc /c | |
| .c{$(INTDIR)}.obj:: | |
| $(CPP) @<< | |
| @@ -751,7 +754,7 @@ | |
| BSC32_SBRS= \ | |
| LINK32=link.exe | |
| -LINK32_FLAGS=$(XML_PARSER).lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\libaprutil-1.pdb" /debug /out:"$(OUTDIR)\libaprutil-1.dll" /implib:"$(OUTDIR)\libaprutil-1.lib" | |
| +LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\libaprutil-1.pdb" /debug /out:"$(OUTDIR)\libaprutil-1.dll" /implib:"$(OUTDIR)\libaprutil-1.lib" | |
| LINK32_OBJS= \ | |
| "$(INTDIR)\apr_brigade.obj" \ | |
| "$(INTDIR)\apr_buckets.obj" \ | |
| @@ -801,7 +804,8 @@ | |
| "$(INTDIR)\apr_xml.obj" \ | |
| "$(INTDIR)\libaprutil.res" \ | |
| "..\apr\x64\Debug\libapr-1.lib" \ | |
| - "..\apr-iconv\x64\Debug\libapriconv-1.lib" | |
| + "..\apr-iconv\x64\Debug\libapriconv-1.lib" \ | |
| + ".\xml\x64\LibD\xml.lib" | |
| "$(OUTDIR)\libaprutil-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) | |
| $(LINK32) @<< | |
| @@ -1461,6 +1465,56 @@ | |
| !ENDIF | |
| +!IF "$(CFG)" == "libaprutil - Win32 Release" | |
| + | |
| +"xml - Win32 Release" : | |
| + cd ".\xml\expat\lib" | |
| + $(MAKE) /$(MAKEFLAGS) /F ".\xml.mak" CFG="xml - Win32 Release" | |
| + cd "..\..\.." | |
| + | |
| +"xml - Win32 ReleaseCLEAN" : | |
| + cd ".\xml\expat\lib" | |
| + $(MAKE) /$(MAKEFLAGS) /F ".\xml.mak" CFG="xml - Win32 Release" RECURSE=1 CLEAN | |
| + cd "..\..\.." | |
| + | |
| +!ELSEIF "$(CFG)" == "libaprutil - Win32 Debug" | |
| + | |
| +"xml - Win32 Debug" : | |
| + cd ".\xml\expat\lib" | |
| + $(MAKE) /$(MAKEFLAGS) /F ".\xml.mak" CFG="xml - Win32 Debug" | |
| + cd "..\..\.." | |
| + | |
| +"xml - Win32 DebugCLEAN" : | |
| + cd ".\xml\expat\lib" | |
| + $(MAKE) /$(MAKEFLAGS) /F ".\xml.mak" CFG="xml - Win32 Debug" RECURSE=1 CLEAN | |
| + cd "..\..\.." | |
| + | |
| +!ELSEIF "$(CFG)" == "libaprutil - x64 Release" | |
| + | |
| +"xml - x64 Release" : | |
| + cd ".\xml\expat\lib" | |
| + $(MAKE) /$(MAKEFLAGS) /F ".\xml.mak" CFG="xml - x64 Release" | |
| + cd "..\..\.." | |
| + | |
| +"xml - x64 ReleaseCLEAN" : | |
| + cd ".\xml\expat\lib" | |
| + $(MAKE) /$(MAKEFLAGS) /F ".\xml.mak" CFG="xml - x64 Release" RECURSE=1 CLEAN | |
| + cd "..\..\.." | |
| + | |
| +!ELSEIF "$(CFG)" == "libaprutil - x64 Debug" | |
| + | |
| +"xml - x64 Debug" : | |
| + cd ".\xml\expat\lib" | |
| + $(MAKE) /$(MAKEFLAGS) /F ".\xml.mak" CFG="xml - x64 Debug" | |
| + cd "..\..\.." | |
| + | |
| +"xml - x64 DebugCLEAN" : | |
| + cd ".\xml\expat\lib" | |
| + $(MAKE) /$(MAKEFLAGS) /F ".\xml.mak" CFG="xml - x64 Debug" RECURSE=1 CLEAN | |
| + cd "..\..\.." | |
| + | |
| +!ENDIF | |
| + | |
| SOURCE=.\libaprutil.rc | |
| "$(INTDIR)\libaprutil.res" : $(SOURCE) "$(INTDIR)" ".\include\apu.h" | |
| Index: srclib/apr-util/xml/xml.dep | |
| =================================================================== | |
| --- srclib/apr-util/xml/xml.dep (nonexistent) | |
| +++ srclib/apr-util/xml/xml.dep (working copy) | |
| @@ -0,0 +1,2 @@ | |
| +# Microsoft Developer Studio Generated Dependency File, included by xml.mak | |
| + | |
| Index: srclib/apr-util/xml/xml.dsp | |
| =================================================================== | |
| --- srclib/apr-util/xml/xml.dsp (nonexistent) | |
| +++ srclib/apr-util/xml/xml.dsp (working copy) | |
| @@ -0,0 +1,214 @@ | |
| +# Microsoft Developer Studio Project File - Name="xml" - Package Owner=<4> | |
| +# Microsoft Developer Studio Generated Build File, Format Version 6.00 | |
| +# ** DO NOT EDIT ** | |
| + | |
| +# TARGTYPE "Win32 (x86) Static Library" 0x0104 | |
| + | |
| +CFG=xml - Win32 Release | |
| +!MESSAGE This is not a valid makefile. To build this project using NMAKE, | |
| +!MESSAGE use the Export Makefile command and run | |
| +!MESSAGE | |
| +!MESSAGE NMAKE /f "xml.mak". | |
| +!MESSAGE | |
| +!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 "xml.mak" CFG="xml - Win32 Release" | |
| +!MESSAGE | |
| +!MESSAGE Possible choices for configuration are: | |
| +!MESSAGE | |
| +!MESSAGE "xml - Win32 Release" (based on "Win32 (x86) Static Library") | |
| +!MESSAGE "xml - Win32 Debug" (based on "Win32 (x86) Static Library") | |
| +!MESSAGE "xml - x64 Release" (based on "Win32 (x86) Static Library") | |
| +!MESSAGE "xml - x64 Debug" (based on "Win32 (x86) Static Library") | |
| +!MESSAGE | |
| + | |
| +# Begin Project | |
| +# PROP AllowPerConfigDependencies 0 | |
| +# PROP Scc_ProjName "" | |
| +# PROP Scc_LocalPath "" | |
| +CPP=cl.exe | |
| +RSC=rc.exe | |
| + | |
| +!IF "$(CFG)" == "xml - Win32 Release" | |
| + | |
| +# PROP BASE Use_MFC 0 | |
| +# PROP BASE Use_Debug_Libraries 0 | |
| +# PROP BASE Output_Dir "LibR" | |
| +# PROP BASE Intermediate_Dir "LibR" | |
| +# PROP BASE Target_Dir "" | |
| +# PROP Use_MFC 0 | |
| +# PROP Use_Debug_Libraries 0 | |
| +# PROP Output_Dir "LibR" | |
| +# PROP Intermediate_Dir "LibR" | |
| +# PROP Target_Dir "" | |
| +# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /FD /c | |
| +# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "COMPILED_FROM_DSP" /D "XML_STATIC" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\xml" /FD /c | |
| +# ADD BASE RSC /l 0x409 | |
| +# ADD RSC /l 0x409 | |
| +BSC32=bscmake.exe | |
| +# ADD BASE BSC32 /nologo | |
| +# ADD BSC32 /nologo | |
| +LIB32=link.exe -lib | |
| +# ADD BASE LIB32 /nologo | |
| +# ADD LIB32 /nologo /out:"LibR\xml.lib" | |
| + | |
| +!ELSEIF "$(CFG)" == "xml - Win32 Debug" | |
| + | |
| +# PROP BASE Use_MFC 0 | |
| +# PROP BASE Use_Debug_Libraries 1 | |
| +# PROP BASE Output_Dir "LibD" | |
| +# PROP BASE Intermediate_Dir "LibD" | |
| +# PROP BASE Target_Dir "" | |
| +# PROP Use_MFC 0 | |
| +# PROP Use_Debug_Libraries 1 | |
| +# PROP Output_Dir "LibD" | |
| +# PROP Intermediate_Dir "LibD" | |
| +# PROP Ignore_Export_Lib 0 | |
| +# PROP Target_Dir "" | |
| +# ADD BASE CPP /nologo /MDd /W3 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /FD /EHsc /c | |
| +# ADD CPP /nologo /MDd /W3 /Zi /Od /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "COMPILED_FROM_DSP" /D "XML_STATIC" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\xml" /FD /EHsc /c | |
| +# ADD BASE RSC /l 0x409 | |
| +# ADD RSC /l 0x409 | |
| +BSC32=bscmake.exe | |
| +# ADD BASE BSC32 /nologo | |
| +# ADD BSC32 /nologo | |
| +LIB32=link.exe -lib | |
| +# ADD BASE LIB32 /nologo | |
| +# ADD LIB32 /nologo /out:"LibD\xml.lib" | |
| + | |
| +!ELSEIF "$(CFG)" == "xml - x64 Release" | |
| + | |
| +# PROP BASE Use_MFC 0 | |
| +# PROP BASE Use_Debug_Libraries 0 | |
| +# PROP BASE Output_Dir "x64\LibR" | |
| +# PROP BASE Intermediate_Dir "x64\LibR" | |
| +# PROP BASE Target_Dir "" | |
| +# PROP Use_MFC 0 | |
| +# PROP Use_Debug_Libraries 0 | |
| +# PROP Output_Dir "x64\LibR" | |
| +# PROP Intermediate_Dir "x64\LibR" | |
| +# PROP Target_Dir "" | |
| +# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /FD /c | |
| +# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "COMPILED_FROM_DSP" /D "XML_STATIC" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\xml" /FD /c | |
| +# ADD BASE RSC /l 0x409 | |
| +# ADD RSC /l 0x409 | |
| +BSC32=bscmake.exe | |
| +# ADD BASE BSC32 /nologo | |
| +# ADD BSC32 /nologo | |
| +LIB32=link.exe -lib | |
| +# ADD BASE LIB32 /nologo | |
| +# ADD LIB32 /nologo /out:"x64\LibR\xml.lib" | |
| + | |
| +!ELSEIF "$(CFG)" == "xml - x64 Debug" | |
| + | |
| +# PROP BASE Use_MFC 0 | |
| +# PROP BASE Use_Debug_Libraries 1 | |
| +# PROP BASE Output_Dir "x64\LibD" | |
| +# PROP BASE Intermediate_Dir "x64\LibD" | |
| +# PROP BASE Target_Dir "" | |
| +# PROP Use_MFC 0 | |
| +# PROP Use_Debug_Libraries 1 | |
| +# PROP Output_Dir "x64\LibD" | |
| +# PROP Intermediate_Dir "x64\LibD" | |
| +# PROP Ignore_Export_Lib 0 | |
| +# PROP Target_Dir "" | |
| +# ADD BASE CPP /nologo /MDd /W3 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /FD /EHsc /c | |
| +# ADD CPP /nologo /MDd /W3 /Zi /Od /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "COMPILED_FROM_DSP" /D "XML_STATIC" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\xml" /FD /EHsc /c | |
| +# ADD BASE RSC /l 0x409 | |
| +# ADD RSC /l 0x409 | |
| +BSC32=bscmake.exe | |
| +# ADD BASE BSC32 /nologo | |
| +# ADD BSC32 /nologo | |
| +LIB32=link.exe -lib | |
| +# ADD BASE LIB32 /nologo | |
| +# ADD LIB32 /nologo /out:"x64\LibD\xml.lib" | |
| + | |
| +!ENDIF | |
| + | |
| +# Begin Target | |
| + | |
| +# Name "xml - Win32 Release" | |
| +# Name "xml - Win32 Debug" | |
| +# Name "xml - x64 Release" | |
| +# Name "xml - x64 Debug" | |
| +# Begin Group "Source Files" | |
| + | |
| +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" | |
| +# Begin Source File | |
| + | |
| +SOURCE=.\expat\lib\loadlibrary.c | |
| +# End Source File | |
| +# Begin Source File | |
| + | |
| +SOURCE=.\expat\lib\xmlparse.c | |
| +# End Source File | |
| +# Begin Source File | |
| + | |
| +SOURCE=.\expat\lib\xmlrole.c | |
| +# End Source File | |
| +# Begin Source File | |
| + | |
| +SOURCE=.\expat\lib\xmltok.c | |
| +# End Source File | |
| +# Begin Source File | |
| + | |
| +SOURCE=.\expat\lib\xmltok_impl.c | |
| +# PROP Exclude_From_Build 1 | |
| +# End Source File | |
| +# Begin Source File | |
| + | |
| +SOURCE=.\expat\lib\xmltok_ns.c | |
| +# PROP Exclude_From_Build 1 | |
| +# End Source File | |
| +# End Group | |
| +# Begin Group "Header Files" | |
| + | |
| +# PROP Default_Filter "h;hpp;hxx;hm;inl" | |
| +# Begin Source File | |
| + | |
| +SOURCE=.\expat\lib\ascii.h | |
| +# End Source File | |
| +# Begin Source File | |
| + | |
| +SOURCE=.\expat\lib\asciitab.h | |
| +# End Source File | |
| +# Begin Source File | |
| + | |
| +SOURCE=.\expat\lib\expat.h | |
| +# End Source File | |
| +# Begin Source File | |
| + | |
| +SOURCE=.\expat\lib\iasciitab.h | |
| +# End Source File | |
| +# Begin Source File | |
| + | |
| +SOURCE=.\expat\lib\latin1tab.h | |
| +# End Source File | |
| +# Begin Source File | |
| + | |
| +SOURCE=.\expat\lib\nametab.h | |
| +# End Source File | |
| +# Begin Source File | |
| + | |
| +SOURCE=.\expat\lib\utf8tab.h | |
| +# End Source File | |
| +# Begin Source File | |
| + | |
| +SOURCE=.\expat\lib\winconfig.h | |
| +# End Source File | |
| +# Begin Source File | |
| + | |
| +SOURCE=.\expat\lib\xmlrole.h | |
| +# End Source File | |
| +# Begin Source File | |
| + | |
| +SOURCE=.\expat\lib\xmltok.h | |
| +# End Source File | |
| +# Begin Source File | |
| + | |
| +SOURCE=.\expat\lib\xmltok_impl.h | |
| +# End Source File | |
| +# End Group | |
| +# End Target | |
| +# End Project | |
| Index: srclib/apr-util/xml/xml.mak | |
| =================================================================== | |
| --- srclib/apr-util/xml/xml.mak (nonexistent) | |
| +++ srclib/apr-util/xml/xml.mak (working copy) | |
| @@ -0,0 +1,367 @@ | |
| +# Microsoft Developer Studio Generated NMAKE File, Based on xml.dsp | |
| +!IF "$(CFG)" == "" | |
| +CFG=xml - Win32 Release | |
| +!MESSAGE No configuration specified. Defaulting to xml - Win32 Release. | |
| +!ENDIF | |
| + | |
| +!IF "$(CFG)" != "xml - Win32 Release" && "$(CFG)" != "xml - Win32 Debug" && "$(CFG)" != "xml - x64 Release" && "$(CFG)" != "xml - x64 Debug" | |
| +!MESSAGE Invalid configuration "$(CFG)" specified. | |
| +!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 "xml.mak" CFG="xml - Win32 Release" | |
| +!MESSAGE | |
| +!MESSAGE Possible choices for configuration are: | |
| +!MESSAGE | |
| +!MESSAGE "xml - Win32 Release" (based on "Win32 (x86) Static Library") | |
| +!MESSAGE "xml - Win32 Debug" (based on "Win32 (x86) Static Library") | |
| +!MESSAGE "xml - x64 Release" (based on "Win32 (x86) Static Library") | |
| +!MESSAGE "xml - x64 Debug" (based on "Win32 (x86) Static Library") | |
| +!MESSAGE | |
| +!ERROR An invalid configuration is specified. | |
| +!ENDIF | |
| + | |
| +!IF "$(OS)" == "Windows_NT" | |
| +NULL= | |
| +!ELSE | |
| +NULL=nul | |
| +!ENDIF | |
| + | |
| +!IF "$(CFG)" == "xml - Win32 Release" | |
| + | |
| +OUTDIR=.\LibR | |
| +INTDIR=.\LibR | |
| +# Begin Custom Macros | |
| +OutDir=.\LibR | |
| +# End Custom Macros | |
| + | |
| +ALL : "$(OUTDIR)\xml.lib" | |
| + | |
| + | |
| +CLEAN : | |
| + -@erase "$(INTDIR)\xml.idb" | |
| + -@erase "$(INTDIR)\xml.pdb" | |
| + -@erase "$(INTDIR)\loadlibrary.obj" | |
| + -@erase "$(INTDIR)\xmlparse.obj" | |
| + -@erase "$(INTDIR)\xmlrole.obj" | |
| + -@erase "$(INTDIR)\xmltok.obj" | |
| + -@erase "$(OUTDIR)\xml.lib" | |
| + | |
| +"$(OUTDIR)" : | |
| + if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" | |
| + | |
| +CPP=cl.exe | |
| +CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "COMPILED_FROM_DSP" /D "XML_STATIC" /Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\xml" /FD /c | |
| + | |
| +.c{$(INTDIR)}.obj:: | |
| + $(CPP) @<< | |
| + $(CPP_PROJ) $< | |
| +<< | |
| + | |
| +.cpp{$(INTDIR)}.obj:: | |
| + $(CPP) @<< | |
| + $(CPP_PROJ) $< | |
| +<< | |
| + | |
| +.cxx{$(INTDIR)}.obj:: | |
| + $(CPP) @<< | |
| + $(CPP_PROJ) $< | |
| +<< | |
| + | |
| +.c{$(INTDIR)}.sbr:: | |
| + $(CPP) @<< | |
| + $(CPP_PROJ) $< | |
| +<< | |
| + | |
| +.cpp{$(INTDIR)}.sbr:: | |
| + $(CPP) @<< | |
| + $(CPP_PROJ) $< | |
| +<< | |
| + | |
| +.cxx{$(INTDIR)}.sbr:: | |
| + $(CPP) @<< | |
| + $(CPP_PROJ) $< | |
| +<< | |
| + | |
| +RSC=rc.exe | |
| +BSC32=bscmake.exe | |
| +BSC32_FLAGS=/nologo /o"$(OUTDIR)\xml.bsc" | |
| +BSC32_SBRS= \ | |
| + | |
| +LIB32=link.exe -lib | |
| +LIB32_FLAGS=/nologo /out:"$(OUTDIR)\xml.lib" | |
| +LIB32_OBJS= \ | |
| + "$(INTDIR)\loadlibrary.obj" \ | |
| + "$(INTDIR)\xmlparse.obj" \ | |
| + "$(INTDIR)\xmlrole.obj" \ | |
| + "$(INTDIR)\xmltok.obj" | |
| + | |
| +"$(OUTDIR)\xml.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS) | |
| + $(LIB32) @<< | |
| + $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS) | |
| +<< | |
| + | |
| +!ELSEIF "$(CFG)" == "xml - Win32 Debug" | |
| + | |
| +OUTDIR=.\LibD | |
| +INTDIR=.\LibD | |
| +# Begin Custom Macros | |
| +OutDir=.\LibD | |
| +# End Custom Macros | |
| + | |
| +ALL : "$(OUTDIR)\xml.lib" | |
| + | |
| + | |
| +CLEAN : | |
| + -@erase "$(INTDIR)\xml.idb" | |
| + -@erase "$(INTDIR)\xml.pdb" | |
| + -@erase "$(INTDIR)\loadlibrary.obj" | |
| + -@erase "$(INTDIR)\xmlparse.obj" | |
| + -@erase "$(INTDIR)\xmlrole.obj" | |
| + -@erase "$(INTDIR)\xmltok.obj" | |
| + -@erase "$(OUTDIR)\xml.lib" | |
| + | |
| +"$(OUTDIR)" : | |
| + if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" | |
| + | |
| +CPP=cl.exe | |
| +CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "COMPILED_FROM_DSP" /D "XML_STATIC" /Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\xml" /FD /EHsc /c | |
| + | |
| +.c{$(INTDIR)}.obj:: | |
| + $(CPP) @<< | |
| + $(CPP_PROJ) $< | |
| +<< | |
| + | |
| +.cpp{$(INTDIR)}.obj:: | |
| + $(CPP) @<< | |
| + $(CPP_PROJ) $< | |
| +<< | |
| + | |
| +.cxx{$(INTDIR)}.obj:: | |
| + $(CPP) @<< | |
| + $(CPP_PROJ) $< | |
| +<< | |
| + | |
| +.c{$(INTDIR)}.sbr:: | |
| + $(CPP) @<< | |
| + $(CPP_PROJ) $< | |
| +<< | |
| + | |
| +.cpp{$(INTDIR)}.sbr:: | |
| + $(CPP) @<< | |
| + $(CPP_PROJ) $< | |
| +<< | |
| + | |
| +.cxx{$(INTDIR)}.sbr:: | |
| + $(CPP) @<< | |
| + $(CPP_PROJ) $< | |
| +<< | |
| + | |
| +RSC=rc.exe | |
| +BSC32=bscmake.exe | |
| +BSC32_FLAGS=/nologo /o"$(OUTDIR)\xml.bsc" | |
| +BSC32_SBRS= \ | |
| + | |
| +LIB32=link.exe -lib | |
| +LIB32_FLAGS=/nologo /out:"$(OUTDIR)\xml.lib" | |
| +LIB32_OBJS= \ | |
| + "$(INTDIR)\loadlibrary.obj" \ | |
| + "$(INTDIR)\xmlparse.obj" \ | |
| + "$(INTDIR)\xmlrole.obj" \ | |
| + "$(INTDIR)\xmltok.obj" | |
| + | |
| +"$(OUTDIR)\xml.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS) | |
| + $(LIB32) @<< | |
| + $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS) | |
| +<< | |
| + | |
| +!ELSEIF "$(CFG)" == "xml - x64 Release" | |
| + | |
| +OUTDIR=.\x64\LibR | |
| +INTDIR=.\x64\LibR | |
| +# Begin Custom Macros | |
| +OutDir=.\x64\LibR | |
| +# End Custom Macros | |
| + | |
| +ALL : "$(OUTDIR)\xml.lib" | |
| + | |
| + | |
| +CLEAN : | |
| + -@erase "$(INTDIR)\xml.idb" | |
| + -@erase "$(INTDIR)\xml.pdb" | |
| + -@erase "$(INTDIR)\loadlibrary.obj" | |
| + -@erase "$(INTDIR)\xmlparse.obj" | |
| + -@erase "$(INTDIR)\xmlrole.obj" | |
| + -@erase "$(INTDIR)\xmltok.obj" | |
| + -@erase "$(OUTDIR)\xml.lib" | |
| + | |
| +"$(OUTDIR)" : | |
| + if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" | |
| + | |
| +CPP=cl.exe | |
| +CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "COMPILED_FROM_DSP" /D "XML_STATIC" /Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\xml" /FD /c | |
| + | |
| +.c{$(INTDIR)}.obj:: | |
| + $(CPP) @<< | |
| + $(CPP_PROJ) $< | |
| +<< | |
| + | |
| +.cpp{$(INTDIR)}.obj:: | |
| + $(CPP) @<< | |
| + $(CPP_PROJ) $< | |
| +<< | |
| + | |
| +.cxx{$(INTDIR)}.obj:: | |
| + $(CPP) @<< | |
| + $(CPP_PROJ) $< | |
| +<< | |
| + | |
| +.c{$(INTDIR)}.sbr:: | |
| + $(CPP) @<< | |
| + $(CPP_PROJ) $< | |
| +<< | |
| + | |
| +.cpp{$(INTDIR)}.sbr:: | |
| + $(CPP) @<< | |
| + $(CPP_PROJ) $< | |
| +<< | |
| + | |
| +.cxx{$(INTDIR)}.sbr:: | |
| + $(CPP) @<< | |
| + $(CPP_PROJ) $< | |
| +<< | |
| + | |
| +RSC=rc.exe | |
| +BSC32=bscmake.exe | |
| +BSC32_FLAGS=/nologo /o"$(OUTDIR)\xml.bsc" | |
| +BSC32_SBRS= \ | |
| + | |
| +LIB32=link.exe -lib | |
| +LIB32_FLAGS=/nologo /out:"$(OUTDIR)\xml.lib" | |
| +LIB32_OBJS= \ | |
| + "$(INTDIR)\loadlibrary.obj" \ | |
| + "$(INTDIR)\xmlparse.obj" \ | |
| + "$(INTDIR)\xmlrole.obj" \ | |
| + "$(INTDIR)\xmltok.obj" | |
| + | |
| +"$(OUTDIR)\xml.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS) | |
| + $(LIB32) @<< | |
| + $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS) | |
| +<< | |
| + | |
| +!ELSEIF "$(CFG)" == "xml - x64 Debug" | |
| + | |
| +OUTDIR=.\x64\LibD | |
| +INTDIR=.\x64\LibD | |
| +# Begin Custom Macros | |
| +OutDir=.\x64\LibD | |
| +# End Custom Macros | |
| + | |
| +ALL : "$(OUTDIR)\xml.lib" | |
| + | |
| + | |
| +CLEAN : | |
| + -@erase "$(INTDIR)\xml.idb" | |
| + -@erase "$(INTDIR)\xml.pdb" | |
| + -@erase "$(INTDIR)\loadlibrary.obj" | |
| + -@erase "$(INTDIR)\xmlparse.obj" | |
| + -@erase "$(INTDIR)\xmlrole.obj" | |
| + -@erase "$(INTDIR)\xmltok.obj" | |
| + -@erase "$(OUTDIR)\xml.lib" | |
| + | |
| +"$(OUTDIR)" : | |
| + if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" | |
| + | |
| +CPP=cl.exe | |
| +CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "COMPILED_FROM_DSP" /D "XML_STATIC" /Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\xml" /FD /EHsc /c | |
| + | |
| +.c{$(INTDIR)}.obj:: | |
| + $(CPP) @<< | |
| + $(CPP_PROJ) $< | |
| +<< | |
| + | |
| +.cpp{$(INTDIR)}.obj:: | |
| + $(CPP) @<< | |
| + $(CPP_PROJ) $< | |
| +<< | |
| + | |
| +.cxx{$(INTDIR)}.obj:: | |
| + $(CPP) @<< | |
| + $(CPP_PROJ) $< | |
| +<< | |
| + | |
| +.c{$(INTDIR)}.sbr:: | |
| + $(CPP) @<< | |
| + $(CPP_PROJ) $< | |
| +<< | |
| + | |
| +.cpp{$(INTDIR)}.sbr:: | |
| + $(CPP) @<< | |
| + $(CPP_PROJ) $< | |
| +<< | |
| + | |
| +.cxx{$(INTDIR)}.sbr:: | |
| + $(CPP) @<< | |
| + $(CPP_PROJ) $< | |
| +<< | |
| + | |
| +RSC=rc.exe | |
| +BSC32=bscmake.exe | |
| +BSC32_FLAGS=/nologo /o"$(OUTDIR)\xml.bsc" | |
| +BSC32_SBRS= \ | |
| + | |
| +LIB32=link.exe -lib | |
| +LIB32_FLAGS=/nologo /out:"$(OUTDIR)\xml.lib" | |
| +LIB32_OBJS= \ | |
| + "$(INTDIR)\loadlibrary.obj" \ | |
| + "$(INTDIR)\xmlparse.obj" \ | |
| + "$(INTDIR)\xmlrole.obj" \ | |
| + "$(INTDIR)\xmltok.obj" | |
| + | |
| +"$(OUTDIR)\xml.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS) | |
| + $(LIB32) @<< | |
| + $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS) | |
| +<< | |
| + | |
| +!ENDIF | |
| + | |
| + | |
| +!IF "$(NO_EXTERNAL_DEPS)" != "1" | |
| +!IF EXISTS("xml.dep") | |
| +!INCLUDE "xml.dep" | |
| +!ELSE | |
| +!MESSAGE Warning: cannot find "xml.dep" | |
| +!ENDIF | |
| +!ENDIF | |
| + | |
| + | |
| +!IF "$(CFG)" == "xml - Win32 Release" || "$(CFG)" == "xml - Win32 Debug" || "$(CFG)" == "xml - x64 Release" || "$(CFG)" == "xml - x64 Debug" | |
| +SOURCE=.\expat\lib\loadlibrary.c | |
| + | |
| +"$(INTDIR)\loadlibrary.obj" : $(SOURCE) "$(INTDIR)" | |
| + $(CPP) $(CPP_PROJ) $(SOURCE) | |
| + | |
| + | |
| +SOURCE=.\expat\lib\xmlparse.c | |
| + | |
| +"$(INTDIR)\xmlparse.obj" : $(SOURCE) "$(INTDIR)" | |
| + $(CPP) $(CPP_PROJ) $(SOURCE) | |
| + | |
| + | |
| +SOURCE=.\expat\lib\xmlrole.c | |
| + | |
| +"$(INTDIR)\xmlrole.obj" : $(SOURCE) "$(INTDIR)" | |
| + $(CPP) $(CPP_PROJ) $(SOURCE) | |
| + | |
| + | |
| +SOURCE=.\expat\lib\xmltok.c | |
| + | |
| +"$(INTDIR)\xmltok.obj" : $(SOURCE) "$(INTDIR)" | |
| + $(CPP) $(CPP_PROJ) $(SOURCE) | |
| + | |
| + | |
| +SOURCE=.\expat\lib\xmltok_impl.c | |
| +SOURCE=.\expat\lib\xmltok_ns.c | |
| + | |
| +!ENDIF | |
| + |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment