diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2013-10-18 22:25:22 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-10-19 07:40:52 +0000 |
| commit | f2b51cdfd6fee45ff2062fa6fb46893eba56c02c (patch) | |
| tree | 5cbcaa583dc98e965ae83d2b68bc5c17212a5b1f /external/libxml2/libxml2-vc10.patch | |
| parent | 27d0ddf6b4526ffdf2e166e20a03a4c40a0f9936 (diff) | |
fdo#70393: move libxml2 to a subdir of external
Change-Id: Ifea928fc56239043f976ed1e0d2c986bc5cfb934
Reviewed-on: https://gerrit.libreoffice.org/6339
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'external/libxml2/libxml2-vc10.patch')
| -rw-r--r-- | external/libxml2/libxml2-vc10.patch | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/external/libxml2/libxml2-vc10.patch b/external/libxml2/libxml2-vc10.patch new file mode 100644 index 000000000000..f29858029b27 --- /dev/null +++ b/external/libxml2/libxml2-vc10.patch @@ -0,0 +1,23 @@ +--- build/libxml2-2.7.6/win32/Makefile.msvc.old 2010-09-20 20:22:41.500000000 +0200 ++++ build/libxml2-2.7.6/win32/Makefile.msvc 2010-09-20 20:23:00.250000000 +0200 +@@ -59,6 +59,7 @@ + CFLAGS = $(CFLAGS) /D "HAVE_ZLIB_H" + !endif + CFLAGS = $(CFLAGS) /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE ++CFLAGS = $(CFLAGS) $(SOLARINC) + + # The linker and its options. + LD = link.exe +@@ -91,8 +91,12 @@ + LDFLAGS = $(LDFLAGS) /DEBUG + !else + CFLAGS = $(CFLAGS) /D "NDEBUG" /O2 ++!if "$(_NMAKE_VER)" >= "10.00.30319.01" ++LDFLAGS = $(LDFLAGS) ++!else + LDFLAGS = $(LDFLAGS) /OPT:NOWIN98 + !endif ++!endif + + # Libxml object files. + XML_OBJS = $(XML_INTDIR)\c14n.obj\ |