summaryrefslogtreecommitdiff
path: root/libwpd
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@suse.cz>2011-08-22 07:25:24 +0200
committerJan Holesovsky <kendy@suse.cz>2011-08-22 09:38:56 +0200
commitf9da6a5b76a6e499256a875fdf74f69eefd2a837 (patch)
treee486ddc3c83519ec94bdb6f1d623baf461ce4d6a /libwpd
parentd6fa91761f4b67be50e01ecc5fd42e2a6d215eb4 (diff)
Make internal libwpd build when cross-compiling.
Diffstat (limited to 'libwpd')
-rw-r--r--libwpd/libwpd-mingw.patch11
-rw-r--r--libwpd/makefile.mk2
2 files changed, 12 insertions, 1 deletions
diff --git a/libwpd/libwpd-mingw.patch b/libwpd/libwpd-mingw.patch
new file mode 100644
index 000000000000..60c7fa5515b1
--- /dev/null
+++ b/libwpd/libwpd-mingw.patch
@@ -0,0 +1,11 @@
+--- misc/build/libwpd-0.9.2/src/lib/makefile.mk.orig 2011-08-22 07:21:59.000000000 +0200
++++ misc/build/libwpd-0.9.2/src/lib/makefile.mk 2011-08-22 07:22:08.000000000 +0200
+@@ -9,7 +9,7 @@ LIBTARGET=NO
+
+ .INCLUDE : settings.mk
+
+-.IF "$(GUI)"=="WNT"
++.IF "$(GUI)$(COM)"=="WNTMSC"
+ CFLAGS+=-GR
+ .ENDIF
+ .IF "$(COM)"=="GCC"
diff --git a/libwpd/makefile.mk b/libwpd/makefile.mk
index 8761bbb53e84..73ef7a21830d 100644
--- a/libwpd/makefile.mk
+++ b/libwpd/makefile.mk
@@ -44,7 +44,7 @@ TARGET=wpd
TARFILE_NAME=libwpd-0.9.2
TARFILE_MD5=8d265a592619166f29c4672ea54812b7
-PATCH_FILES=$(TARFILE_NAME).patch
+PATCH_FILES=$(TARFILE_NAME).patch libwpd-mingw.patch
BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
BUILD_DIR=src$/lib