diff options
author | berkeviktor@aol.com <berkeviktor@aol.com> | 2011-08-07 09:34:18 +0200 |
---|---|---|
committer | berkeviktor@aol.com <berkeviktor@aol.com> | 2011-08-07 09:34:18 +0200 |
commit | 518271bd4cb92dcd4d760317395729806ac38e77 (patch) | |
tree | c3397165e23bdde819017437a8d2d07a45920b38 /ext | |
parent | 08ce6280df217b0a9673c2b91b5400bea45387c9 (diff) |
add libxml-wdk support files
Diffstat (limited to 'ext')
-rw-r--r-- | ext/libxml-wdk/libxml-wdk.patch | 57 | ||||
-rw-r--r-- | ext/libxml-wdk/win32/build-x64.bat | 17 | ||||
-rw-r--r-- | ext/libxml-wdk/win32/build-x86.bat | 16 |
3 files changed, 90 insertions, 0 deletions
diff --git a/ext/libxml-wdk/libxml-wdk.patch b/ext/libxml-wdk/libxml-wdk.patch new file mode 100644 index 00000000..fa8979b2 --- /dev/null +++ b/ext/libxml-wdk/libxml-wdk.patch @@ -0,0 +1,57 @@ +diff -ruN --strip-trailing-cr libxml2-2.7.8.orig/libxml.h libxml2-2.7.8/libxml.h +--- libxml2-2.7.8.orig/libxml.h 2010-10-12 08:25:32 +0200 ++++ libxml2-2.7.8/libxml.h 2011-08-07 09:12:07 +0200 +@@ -94,3 +94,7 @@ + # define LIBXML_STATIC + #endif + #endif /* ! __XML_LIBXML_H__ */ ++ ++#ifndef vsnprintf ++#define vsnprintf _vsnprintf ++#endif +diff -ruN --strip-trailing-cr libxml2-2.7.8.orig/win32/Makefile.msvc libxml2-2.7.8/win32/Makefile.msvc +--- libxml2-2.7.8.orig/win32/Makefile.msvc 2010-11-04 14:58:44 +0100 ++++ libxml2-2.7.8/win32/Makefile.msvc 2011-08-07 09:23:47 +0200 +@@ -58,12 +58,20 @@ + !if "$(WITH_ZLIB)" == "1" + CFLAGS = $(CFLAGS) /D "HAVE_ZLIB_H" + !endif +-CFLAGS = $(CFLAGS) /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE ++CFLAGS = $(CFLAGS) + + # The linker and its options. + LD = link.exe + LDFLAGS = /nologo /VERSION:$(LIBXML_MAJOR_VERSION).$(LIBXML_MINOR_VERSION) + LDFLAGS = $(LDFLAGS) /LIBPATH:$(BINDIR) /LIBPATH:$(LIBPREFIX) ++ ++!ifdef X64 ++CFLAGS = $(CFLAGS) /favor:AMD64 ++LDFLAGS = $(LDFLAGS) msvcrt_win2003.obj ++!else ++LDFLAGS = $(LDFLAGS) msvcrt_winxp.obj ++!endif ++ + LIBS = + !if "$(WITH_FTP)" == "1" || "$(WITH_HTTP)" == "1" + LIBS = $(LIBS) wsock32.lib ws2_32.lib +@@ -71,9 +79,9 @@ + !if "$(WITH_ICONV)" == "1" + LIBS = $(LIBS) iconv.lib + !endif +-+!if "$(WITH_ICU)" == "1" ++!if "$(WITH_ICU)" == "1" + +LIBS = $(LIBS) icu.lib +-+!endif ++!endif + !if "$(WITH_ZLIB)" == "1" + LIBS = $(LIBS) zdll.lib + !endif +@@ -94,7 +102,7 @@ + LDFLAGS = $(LDFLAGS) /DEBUG + !else + CFLAGS = $(CFLAGS) /D "NDEBUG" /O2 +-LDFLAGS = $(LDFLAGS) /OPT:NOWIN98 ++LDFLAGS = $(LDFLAGS) + !endif + + # Libxml object files. diff --git a/ext/libxml-wdk/win32/build-x64.bat b/ext/libxml-wdk/win32/build-x64.bat new file mode 100644 index 00000000..1e579259 --- /dev/null +++ b/ext/libxml-wdk/win32/build-x64.bat @@ -0,0 +1,17 @@ +@echo off +set WDK_ROOT=c:\WinDDK\7600.16385.1 +set INCLUDE=%WDK_ROOT%\inc\api;%WDK_ROOT%\inc\crt +set LIB=%WDK_ROOT%\lib\wnet\amd64;%WDK_ROOT%\lib\Crt\amd64 +set PATH=%PROGRAMFILES(X86)%\Microsoft Visual Studio 10.0\VC\bin\amd64;%PROGRAMFILES(X86)%\Microsoft SDKs\Windows\v7.0A\Bin\x64;%SystemRoot%\SysWOW64 +set X64=1 +cscript configure.js compiler=msvc iconv=no iso8859x=yes +nmake /nologo /f Makefile.msvc clean +nmake /nologo /f Makefile.msvc +rmdir /q /s bin +rmdir /q /s include +rmdir /q /s lib +nmake /nologo /f Makefile.msvc install +mv lib\libxml2.dll bin +set PATH=%PATH%;%PROGRAMW6432%\7-Zip +7z a "LibXML-WDK 2.7.8-x64.7z" bin include lib +pause diff --git a/ext/libxml-wdk/win32/build-x86.bat b/ext/libxml-wdk/win32/build-x86.bat new file mode 100644 index 00000000..e9f243d8 --- /dev/null +++ b/ext/libxml-wdk/win32/build-x86.bat @@ -0,0 +1,16 @@ +@echo off +set WDK_ROOT=c:\WinDDK\7600.16385.1 +set INCLUDE=%WDK_ROOT%\inc\api;%WDK_ROOT%\inc\crt +set LIB=%WDK_ROOT%\lib\wxp\i386;%WDK_ROOT%\lib\Crt\i386 +set PATH=%PROGRAMFILES(X86)%\Microsoft Visual Studio 10.0\VC\bin;%PROGRAMFILES(X86)%\Microsoft Visual Studio 10.0\Common7\IDE;%PROGRAMFILES(X86)%\Microsoft SDKs\Windows\v7.0A\Bin;%SystemRoot%\system32 +cscript configure.js compiler=msvc iconv=no iso8859x=yes +nmake /nologo /f Makefile.msvc clean +nmake /nologo /f Makefile.msvc +rmdir /q /s bin +rmdir /q /s include +rmdir /q /s lib +nmake /nologo /f Makefile.msvc install +mv lib\libxml2.dll bin +set PATH=%PATH%;%PROGRAMW6432%\7-Zip +7z a "LibXML-WDK 2.7.8 x86.7z" bin include lib +pause |