From b98e2d9af27740552ca8093fc86bd0d24028f3e3 Mon Sep 17 00:00:00 2001
From: Vladimir Glazounov <vg@openoffice.org>
Date: Fri, 6 Jun 2008 15:48:22 +0000
Subject: INTEGRATION: CWS mingwport13 (1.3.6); FILE MERGED 2008/06/02 10:40:31
 vg 1.3.6.2: RESYNC: (1.3-1.4); FILE MERGED 2008/05/05 13:15:30 vg 1.3.6.1:
 #i88772# MinGW fixes for DEV300

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

(limited to 'xpdf')

diff --git a/xpdf/makefile.mk b/xpdf/makefile.mk
index fc808ff62d5f..706cd398117b 100644
--- a/xpdf/makefile.mk
+++ b/xpdf/makefile.mk
@@ -8,7 +8,7 @@
 #
 # $RCSfile: makefile.mk,v $
 #
-# $Revision: 1.4 $
+# $Revision: 1.5 $
 #
 # This file is part of OpenOffice.org.
 #
@@ -64,9 +64,14 @@ CXXFLAGS:=$(EXTRA_CFLAGS)
 CONFIGURE_ACTION=./configure --without-x --enable-multithreaded --enable-exceptions
 BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS)
 .ELSE
+.IF "$(COM)"=="GCC"
+CONFIGURE_ACTION=./configure --without-x --enable-multithreaded --enable-exceptions LIBS=-lgdi32
+BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS)
+.ELSE
 CONFIGURE_ACTION=
 BUILD_ACTION= cmd.exe /c ms_make.bat
 .ENDIF
+.ENDIF
 
 CONVERTFILES=ms_make.bat
 BUILD_FLAGS=
@@ -84,11 +89,18 @@ OUT2LIB= \
     goo$/lib*.a \
     xpdf$/lib*.a
 .ELSE
+.IF "$(COM)"=="GCC"
+OUT2LIB= \
+    fofi$/lib*.a \
+    goo$/lib*.a \
+    xpdf$/lib*.a
+.ELSE
 OUT2LIB= \
     fofi$/*.lib \
     goo$/*.lib \
     xpdf$/*.lib
 .ENDIF
+.ENDIF
 
 # --- Targets ------------------------------------------------------
 
-- 
cgit v1.2.3