summaryrefslogtreecommitdiff
path: root/libwpg
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@suse.cz>2011-08-22 07:58:00 +0200
committerJan Holesovsky <kendy@suse.cz>2011-08-22 09:38:56 +0200
commita677e5a2a12069629129e81fb747744be802c7f2 (patch)
tree5442e3cd05631c241865d4ec9d26fc7d3d816a31 /libwpg
parent4c1a82aca5f747dd0a6ab4c76f1e6c207fd7c32f (diff)
Fix cross-build of libwpg.
Diffstat (limited to 'libwpg')
-rw-r--r--libwpg/libwpg-mingw.patch11
-rw-r--r--libwpg/makefile.mk2
2 files changed, 12 insertions, 1 deletions
diff --git a/libwpg/libwpg-mingw.patch b/libwpg/libwpg-mingw.patch
new file mode 100644
index 000000000000..45b8d688f3fc
--- /dev/null
+++ b/libwpg/libwpg-mingw.patch
@@ -0,0 +1,11 @@
+--- misc/build/libwpg-0.2.0/src/lib/makefile.mk.orig 2011-08-22 07:21:59.000000000 +0200
++++ misc/build/libwpg-0.2.0/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/libwpg/makefile.mk b/libwpg/makefile.mk
index 44ecccea2d20..76021023f59b 100644
--- a/libwpg/makefile.mk
+++ b/libwpg/makefile.mk
@@ -52,7 +52,7 @@ INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd-stream
TARFILE_NAME=libwpg-0.2.0
TARFILE_MD5=5ba6a61a2f66dfd5fee8cdd4cd262a37
-PATCH_FILES=$(TARFILE_NAME).patch
+PATCH_FILES=$(TARFILE_NAME).patch libwpg-mingw.patch
BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)