strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS aquavcl01 (1.2.2); FILE MERGED

Browse source 
2007/06/27 07:42:50 hdu 1.2.2.15: Aqua only: link to font subsetter library
2007/06/25 11:15:29 pjanik 1.2.2.14: RESYNC: (1.16-1.17); FILE MERGED
2007/06/15 18:23:17 pjanik 1.2.2.13: vcl is now WaE clean, remove the workaround introduced in the past.
2007/06/11 10:53:37 hdu 1.2.2.12: add PSPLIB for static linking
2007/06/06 16:50:01 ericb 1.2.2.11: RESYNC: (1.14-1.16); FILE MERGED
2007/05/03 21:11:50 pjanik 1.2.2.10: Do not turn WaE on for vcl in aquavcl01.
2007/05/03 17:57:48 pjanik 1.2.2.9: RESYNC: (1.13-1.14); FILE MERGED
2007/04/11 08:20:44 pjanik 1.2.2.8: RESYNC: (1.11-1.13); FILE MERGED
2007/02/02 11:20:28 pjanik 1.2.2.7: RESYNC: (1.9-1.11); FILE MERGED
2007/01/25 13:24:10 pjanik 1.2.2.6: RESYNC: (1.7-1.9); FILE MERGED
2006/12/07 14:31:05 pjanik 1.2.2.5: RESYNC: (1.6-1.7); FILE MERGED
2006/11/26 18:15:48 pjanik 1.2.2.4: RESYNC: (1.4-1.6); FILE MERGED
2006/11/07 19:18:51 pjanik 1.2.2.3: RESYNC: (1.3-1.4); FILE MERGED
2006/07/19 08:10:41 pjanik 1.2.2.2: RESYNC: (1.2-1.3); FILE MERGED
2006/03/11 17:20:54 pjanik 1.2.2.1: Bring back changes lost during re-sync because of renamed files.
This commit is contained in:
Rüdiger Timm 2007-07-05 08:04:21 +00:00
parent bb3f323fb4
commit b3939c710f
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
solenv/inc/unxmacx.mk
View file

@ -4,9 +4,9 @@
#
# $RCSfile: unxmacx.mk,v $
#
# $Revision: 1.17 $
# $Revision: 1.18 $
#
# last change: $Author: kz $ $Date: 2007-06-18 16:34:34 $
# last change: $Author: rt $ $Date: 2007-07-05 09:04:21 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@ -97,7 +97,9 @@ CFLAGS=-fsigned-char -fmessage-length=0 -malign-natural -c
CFLAGSCC=-pipe -fsigned-char -malign-natural $(ARCH_FLAGS)
# Normal Objective C compilation flags
OBJCFLAGS=-no-precomp
#OBJCFLAGS=-no-precomp
OBJCFLAGS=-fobjc-exceptions
OBJCXXFLAGS=-x objective-c++ -fobjc-exceptions
# Comp Flags for files that need exceptions enabled (C and C++)
CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
@ -231,9 +233,15 @@ STDSLOGUI=
STDOBJCUI=
STDSLOCUI=
.IF "$(GUIBASE)" == "aqua"
STDLIBCUIMT=CPPRUNTIME -lm
STDSHLGUIMT=-lpthread CPPRUNTIME -lm -framework CoreFoundation -framework Carbon
PSPLIB=-lpsp
.ELSE
STDLIBCUIMT=-lX11 CPPRUNTIME -lm
STDSHLGUIMT=-lX11 -lXext -lpthread CPPRUNTIME -lm -framework CoreFoundation
.ENDIF
STDLIBGUIMT=-lpthread CPPRUNTIME -lm
STDLIBCUIMT=-lX11 CPPRUNTIME -lm
STDSHLGUIMT=-lX11 -lXext -lpthread CPPRUNTIME -lm -framework CoreFoundation
STDSHLCUIMT=-lpthread CPPRUNTIME -lm
LIBMGR=ar