diff options
| author | Berke Viktor <bviktor@hexchat.org> | 2013-04-01 05:05:33 +0200 |
|---|---|---|
| committer | Berke Viktor <bviktor@hexchat.org> | 2013-04-01 05:05:33 +0200 |
| commit | 110a2625fe7dcee78b96ca8589b6e0d5f2f76983 (patch) | |
| tree | bd1c3adbc2b23a55cfb5b02f18a533e1aeaa7900 /win32/ext/libxml-wdk/libxml-wdk.patch | |
| parent | b70062d6d257be8bf0d9f1260c519e5de129b580 (diff) | |
Remove another bunch of obsolete junk
Diffstat (limited to 'win32/ext/libxml-wdk/libxml-wdk.patch')
| -rw-r--r-- | win32/ext/libxml-wdk/libxml-wdk.patch | 57 |
1 files changed, 0 insertions, 57 deletions
diff --git a/win32/ext/libxml-wdk/libxml-wdk.patch b/win32/ext/libxml-wdk/libxml-wdk.patch deleted file mode 100644 index fa8979b2..00000000 --- a/win32/ext/libxml-wdk/libxml-wdk.patch +++ /dev/null @@ -1,57 +0,0 @@ -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. |