[Libreoffice-commits] .: xpdf/makefile.mk

Jan Holesovsky kendy at kemper.freedesktop.org
Thu Sep 22 08:34:16 PDT 2011


 xpdf/makefile.mk |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit b1ecadbda1c5f5abde1be2ade8ab288051a4b207
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Thu Sep 22 17:13:22 2011 +0200

    Fix MinGW build of xpdf.

diff --git a/xpdf/makefile.mk b/xpdf/makefile.mk
index 3205582..85c2a88 100644
--- a/xpdf/makefile.mk
+++ b/xpdf/makefile.mk
@@ -93,7 +93,14 @@ BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS)
 .IF "$(COM)"=="GCC"
 LDFLAGS=-Wl,--enable-runtime-pseudo-reloc-v2
 .EXPORT : LDFLAGS
-CONFIGURE_ACTION=./configure --without-x --enable-multithreaded --enable-exceptions LIBS=-lgdi32
+
+CONFIGURE_ACTION=./configure
+CONFIGURE_FLAGS+=--without-x --enable-multithreaded --enable-exceptions LIBS=-lgdi32
+
+.IF "$(CROSS_COMPILING)"=="YES"
+CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
+.ENDIF
+
 BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS)
 .ELSE
 CONFIGURE_ACTION=


More information about the Libreoffice-commits mailing list