diff options
| author | Oliver Bolte <obo@openoffice.org> | 2008-01-04 14:02:02 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2008-01-04 14:02:02 +0000 |
| commit | 1c674cb128912fef393a36503fae60b77a287fcd (patch) | |
| tree | 311f74d37c91bdf27f7eafb0f2f11646b1112df0 /solenv/inc/unxmacx.mk | |
| parent | 0a1499089af7c1b41c3cb20564efa682d980a921 (diff) | |
INTEGRATION: CWS obo19 (1.22.12); FILE MERGED
2007/11/29 11:01:47 obo 1.22.12.1: #i83979# MacOSX: Build environment adjustments for Leopard/Tiger
Diffstat (limited to 'solenv/inc/unxmacx.mk')
| -rw-r--r-- | solenv/inc/unxmacx.mk | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/solenv/inc/unxmacx.mk b/solenv/inc/unxmacx.mk index d9c4b85c8..934f00890 100644 --- a/solenv/inc/unxmacx.mk +++ b/solenv/inc/unxmacx.mk @@ -4,9 +4,9 @@ # # $RCSfile: unxmacx.mk,v $ # -# $Revision: 1.23 $ +# $Revision: 1.24 $ # -# last change: $Author: kz $ $Date: 2007-12-12 13:21:33 $ +# last change: $Author: obo $ $Date: 2008-01-04 15:02:02 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -88,7 +88,7 @@ CXX*=g++ CC*=gcc objc=cc -CFLAGS=-fsigned-char -fmessage-length=0 -malign-natural -c +CFLAGS=-fsigned-char -fmessage-length=0 -malign-natural -c $(EXTRA_CFLAGS) # --------------------------------- # Compilation flags @@ -156,6 +156,9 @@ MODULES_WITH_WARNINGS := \ # Currently, there is no nas support for OS X... CDEFS+= -DNO_AUDIO +#special settings form environment +CDEFS+=$(EXTRA_CDEFS) + STDLIBCPP=-lstdc++ # --------------------------------- @@ -201,6 +204,9 @@ LINKFLAGS=$(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH) INCGUI+= -I$(PRJ)$/unx/inc .ENDIF +#special settings form environment +LINKFLAGS+=$(EXTRA_LINKFLAGS) + # Random link flags dealing with different cases of linking LINKFLAGSAPPGUI=-bind_at_load |