From 118b41bd41e7559fe90d49294b9647a9142ad45d Mon Sep 17 00:00:00 2001 From: Rüdiger Timm Date: Fri, 11 Jul 2008 06:11:25 +0000 Subject: INTEGRATION: CWS thb30fixes (1.6.2); FILE MERGED 2008/06/23 09:25:08 thb 1.6.2.1: #i88228# Making sure xpdf lib is built with similar alignment under MacOS PPC --- xpdf/makefile.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/xpdf/makefile.mk b/xpdf/makefile.mk index c9a0ac97d462..1fb4b374e249 100644 --- a/xpdf/makefile.mk +++ b/xpdf/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.6 $ +# $Revision: 1.7 $ # # This file is part of OpenOffice.org. # @@ -65,9 +65,15 @@ CXXFLAGS:=-O $(ARCH_FLAGS) LDFLAGS:=$(ARCH_FLAGS) .EXPORT : CFLAGS CXXFLAGS LDFLAGS .ENDIF + +.IF "$(COM)$(OS)$(CPU)" == "GCCMACOSXP" +CONFIGURE_ACTION=./configure --without-x --enable-multithreaded --enable-exceptions CXXFLAGS="-malign-natural" +.ELSE #CONFIGURE_ACTION=./configure #CONFIGURE_ACTION=./configure --without-x --enable-multithreaded --enable-exceptions CFLAGS="-g -O0" CXXFLAGS="-g -O0" CONFIGURE_ACTION=./configure --without-x --enable-multithreaded --enable-exceptions +.ENDIF + BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS) .ELSE .IF "$(COM)"=="GCC" -- cgit