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
This commit is contained in:
parent
e66942508e
commit
8a9351ac85
1 changed files with 9 additions and 3 deletions
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue