diff options
author | RĂ¼diger Timm <rt@openoffice.org> | 2008-07-11 06:11:25 +0000 |
---|---|---|
committer | RĂ¼diger Timm <rt@openoffice.org> | 2008-07-11 06:11:25 +0000 |
commit | b7392dc58296652006493abf1c82649e5a1bfc31 (patch) | |
tree | 6d3558083bc17151de7af15465175b762e16367c /xpdf | |
parent | 318701538215592b58b16d100d8859ef7a82e52e (diff) |
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
Diffstat (limited to 'xpdf')
-rw-r--r-- | xpdf/makefile.mk | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/xpdf/makefile.mk b/xpdf/makefile.mk index c9a0ac9..1fb4b37 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" |