From d75f3e6f3085b3f8fd6b8ab277ef04b9d9b9045c Mon Sep 17 00:00:00 2001 From: Vladimir Glazounov Date: Fri, 6 Jun 2008 15:49:07 +0000 Subject: INTEGRATION: CWS mingwport13 (1.2.6); FILE MERGED 2008/05/14 09:35:54 vg 1.2.6.2: RESYNC: (1.2-1.3); FILE MERGED 2008/05/05 13:15:31 vg 1.2.6.1: #i88772# MinGW fixes for DEV300 --- xpdf/wrapper/makefile.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'xpdf') diff --git a/xpdf/wrapper/makefile.mk b/xpdf/wrapper/makefile.mk index c3a4a4d71c42..5d40212e2ad6 100644 --- a/xpdf/wrapper/makefile.mk +++ b/xpdf/wrapper/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.3 $ +# $Revision: 1.4 $ # # This file is part of OpenOffice.org. # @@ -48,7 +48,11 @@ APP1LIBSALCPPRT= APP1OBJS= \ $(OBJ)$/wrapper_gpl.obj $(OBJ)/pdfioutdev_gpl.obj .IF "$(GUI)" == "WNT" +.IF "$(COM)"=="GCC" +APP1STDLIBS+=-lxpdf -lfofi -lGoo -lgdi32 -ladvapi32 +.ELSE APP1STDLIBS+=xpdf.lib fofi.lib Goo.lib gdi32.lib advapi32.lib +.ENDIF .ELSE APP1STDLIBS+=-lxpdf -lfofi -lGoo .ENDIF -- cgit