diff options
| author | Kurt Zenker <kz@openoffice.org> | 2009-05-28 16:03:55 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2009-05-28 16:03:55 +0000 |
| commit | 8dab1c109ddf26138a3603c6869fd891aa9a6913 (patch) | |
| tree | 5399482dc59f6c29da39a3dcb803e3b05d72559f | |
| parent | 554c270738a6ce1d418918c47a5728137cfa718a (diff) | |
CWS-TOOLING: integrate CWS ause101
2009-05-11 14:39:16 +0200 hjs r271770 : #i101204# more selective copy
2009-05-07 19:16:08 +0200 hjs r271693 : #i101651# embed windows manifest
2009-05-07 18:43:17 +0200 hjs r271692 : #i101650# fix CHECKZIPRESULT for bash
2009-05-07 18:25:43 +0200 hjs r271690 : #i101649# workaround warnings in generated code
| -rw-r--r-- | libxslt/libxslt-1.1.24_win_manifest.patch | 11 | ||||
| -rw-r--r-- | libxslt/makefile.mk | 4 |
2 files changed, 13 insertions, 2 deletions
diff --git a/libxslt/libxslt-1.1.24_win_manifest.patch b/libxslt/libxslt-1.1.24_win_manifest.patch new file mode 100644 index 000000000000..40f07324ccff --- /dev/null +++ b/libxslt/libxslt-1.1.24_win_manifest.patch @@ -0,0 +1,11 @@ +--- misc/libxslt-1.1.24/win32/configure.js 2007-08-03 15:41:02.000000000 +0200 ++++ misc/build/libxslt-1.1.24/win32/configure.js 2009-05-07 13:09:42.294993200 +0200 +@@ -51,7 +51,7 @@ + var dirSep = "\\"; + var compiler = "msvc"; + var cruntime = "/MD"; +-var vcmanifest = false; ++var vcmanifest = true; + var buildDebug = 0; + var buildStatic = 0; + var buildPrefix = "."; diff --git a/libxslt/makefile.mk b/libxslt/makefile.mk index 291a161c69dc..76cbcd39be39 100644 --- a/libxslt/makefile.mk +++ b/libxslt/makefile.mk @@ -51,7 +51,7 @@ all: LIBXSLTVERSION=$(LIBXSLT_MAJOR).$(LIBXSLT_MINOR).$(LIBXSLT_MICRO) TARFILE_NAME=$(PRJNAME)-$(LIBXSLTVERSION) -PATCH_FILES=$(TARFILE_NAME).patch +PATCH_FILES=$(TARFILE_NAME).patch $(TARFILE_NAME)_win_manifest.patch # This is only for UNX environment now @@ -126,7 +126,7 @@ OUT2BIN+=xslt-config .ELSE OUT2LIB+=win32$/bin.msvc$/*.lib OUT2BIN+=win32$/bin.msvc$/*.dll -OUT2BIN+=win32$/bin.msvc$/*.exe* +OUT2BIN+=win32$/bin.msvc$/*.exe .ENDIF .ELSE OUT2LIB+=libxslt$/.libs$/libxslt.so* |