diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2007-07-05 07:44:46 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2007-07-05 07:44:46 +0000 |
| commit | c248e70a320f73394db265d370faa1cfa2758bd6 (patch) | |
| tree | 1610b7b08dc5c58f1b8a29b73d5e1147c7f1c25f /vcl/util | |
| parent | 56d2a75dda8bd01a1f74943d5bb76f669673cbac (diff) | |
INTEGRATION: CWS aquavcl01 (1.75.14); FILE MERGED
2007/06/25 11:10:02 pjanik 1.75.14.23: RESYNC: (1.91-1.92); FILE MERGED
2007/06/21 15:18:20 pl 1.75.14.22: #i78704# implement XOR rendering with basebmp
2007/06/12 08:42:15 pjanik 1.75.14.21: Remove FIXME comments, revert original tabbing to prevent useless changes.
2007/06/11 10:56:19 hdu 1.75.14.20: aquaport: link PSPLIB statically
2007/06/06 16:40:32 ericb 1.75.14.19: RESYNC: (1.89-1.91); FILE MERGED
2007/06/01 14:06:25 pl 1.75.14.18: don't build useless libraries
2007/05/03 17:43:40 pjanik 1.75.14.17: RESYNC: (1.87-1.89); FILE MERGED
2007/04/11 07:57:39 pjanik 1.75.14.16: RESYNC: (1.85-1.87); FILE MERGED
2007/02/02 11:10:23 pjanik 1.75.14.15: RESYNC: (1.84-1.85); FILE MERGED
2006/11/26 18:10:13 pjanik 1.75.14.14: RESYNC: (1.82-1.84); FILE MERGED
2006/10/13 22:43:43 tra 1.75.14.13: RESYNC: (1.81-1.82); FILE MERGED
2006/09/05 21:25:07 pjanik 1.75.14.12: The framework is named AppKit, not Appkit!
2006/08/25 10:38:28 pjanik 1.75.14.11: Remove extraneous changes.
2006/08/24 20:33:10 ericb 1.75.14.10: aquvcl01 fix pasf bug in aqua build
2006/08/16 12:35:34 cl 1.75.14.9: RESYNC: (1.80-1.81); FILE MERGED
2006/08/05 20:09:51 ebischoff 1.75.14.8: Necessary to build with XCode 1.5 + Mac OS X 10.3.9
2006/07/19 08:51:01 pjanik 1.75.14.7: RESYNC: (1.79-1.80); FILE MERGED
2006/06/17 13:21:07 fheckl 1.75.14.6: RESYNC: (1.78-1.79); FILE MERGED
2006/04/18 07:02:29 tra 1.75.14.5: RESYNC: (1.77-1.78); FILE MERGED
2006/02/21 18:23:29 fheckl 1.75.14.4: Adding -framework Carbon to adapt to MacOSX aqua build
2006/01/21 13:58:59 pjanik 1.75.14.3: RESYNC: (1.76-1.77); FILE MERGED
2005/12/15 21:22:11 fheckl 1.75.14.2: RESYNC: (1.75-1.76); FILE MERGED
2005/11/27 11:14:22 fheckl 1.75.14.1: Changes for aqua
Diffstat (limited to 'vcl/util')
| -rw-r--r-- | vcl/util/makefile.mk | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/vcl/util/makefile.mk b/vcl/util/makefile.mk index 0152a6708c6c..4687c8e2f773 100644 --- a/vcl/util/makefile.mk +++ b/vcl/util/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.93 $ +# $Revision: 1.94 $ # -# last change: $Author: rt $ $Date: 2007-07-03 14:08:50 $ +# last change: $Author: rt $ $Date: 2007-07-05 08:44:46 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -151,8 +151,7 @@ LIB1FILES= $(SLB)$/app.lib \ $(SLB)$/helper.lib \ $(SLB)$/components.lib - -.IF "$(GUI)" == "UNX" +.IF "$(GUI)" == "UNX" && "$(GUIBASE)"!="aqua" LIB1FILES+=$(SLB)$/salplug.lib SHL1STDLIBS+=\ -lpsp$(VERSION)$(DLLPOSTFIX) @@ -182,6 +181,10 @@ SHL1STDLIBS+=\ $(JVMACCESSLIB) SHL1USE_EXPORTS=ordinal +.IF "$(GUIBASE)"=="aqua" +SHL1STDLIBS+=$(BASEBMPLIB) +.ENDIF + .IF "$(USE_BUILTIN_RASTERIZER)"!="" LIB1FILES += $(SLB)$/glyphs.lib SHL1STDLIBS+= $(FREETYPELIB) @@ -237,8 +240,10 @@ LINKFLAGSSHL += /ENTRY:LibMain@12 # --- UNX ---------------------------------------------------------------- +SHL1STDLIBS += $(PSPLIB) + # UNX sal plugins -.IF "$(GUI)" == "UNX" +.IF "$(GUI)" == "UNX" && "$(GUIBASE)" != "aqua" # basic pure X11 plugin LIB2TARGET=$(SLB)$/ipure_x @@ -289,11 +294,11 @@ SHL2STDLIBS+=`pkg-config --libs xrender` .IF "$(ENABLE_PASF)" != "" +SHL2STDLIBS += -lsndfile -lportaudio .IF "$(OS)"=="MACOSX" SHL2STDLIBS += -framework CoreAudio -framework AudioToolbox -.ENDIF -SHL2STDLIBS += -lsndfile -lportaudio -.ENDIF # ENABLE_PASF +.ENDIF # "$(OS)"=="MACOSX" +.ENDIF # "$(ENABLE_PASF)"!="" .IF "$(ENABLE_NAS)" != "" SHL2STDLIBS += -laudio |