diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-11-09 15:50:00 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-11-09 15:50:00 +0000 |
| commit | 0c4881433044f0e20dcb32e4cb20919d7a21dc0c (patch) | |
| tree | ea6117d9ceb5cdf5a643763070eb0da4103219b9 /vcl | |
| parent | 19effb6668248e2797d657787c5192b84439ea4f (diff) | |
INTEGRATION: CWS vcl28 (1.61.16); FILE MERGED
2004/10/13 10:33:33 pl 1.61.16.5: #i35057# use ENABLE_PASF
2004/10/13 09:47:18 pl 1.61.16.4: #i35430# add kde plugin
2004/10/11 09:09:11 pl 1.61.16.3: RESYNC: (1.61-1.62); FILE MERGED
2004/10/06 16:01:51 pl 1.61.16.2: #i35057# add: sndfile, portaudio
2004/09/22 08:38:16 pl 1.61.16.1: #i34161# removed -lXt since it breaks running java in process
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/util/makefile.mk | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/vcl/util/makefile.mk b/vcl/util/makefile.mk index 13cc746e3328..ecc46b249e22 100644 --- a/vcl/util/makefile.mk +++ b/vcl/util/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.62 $ +# $Revision: 1.63 $ # -# last change: $Author: rt $ $Date: 2004-09-20 11:52:29 $ +# last change: $Author: hr $ $Date: 2004-11-09 16:50:00 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -310,10 +310,15 @@ SHL2STDLIBS += $(XINERAMALIBS) .ENDIF # USE_XINERAMA != no +.IF "$(ENABLE_PASF)" != "" +.IF "$(OS)"=="MACOSX" +SHL2STDLIBS += -framework CoreAudio -framework AudioToolbox +.ENDIF +SHL2STDLIBS += -lsndfile -lportaudio +.ENDIF # ENABLE_PASF + .IF "$(OS)"=="LINUX" || "$(OS)"=="SOLARIS" || "$(OS)"=="FREEBSD" SHL2STDLIBS += -laudio -# some nas versions need -lXt, too -SHL2STDLIBS += -lXt .IF "$(OS)"=="SOLARIS" # needed by libaudio.a SHL2STDLIBS += -ldl -lnsl -lsocket @@ -378,6 +383,19 @@ SHL4STDLIBS+=-l$(SHL2TARGET) SHL4STDLIBS+=$(SHL3STDLIBS) -lX11 -ldl .ENDIF # "$(ENABLE_GTK)" != "" +# KDE plugin +.IF "$(ENABLE_KDE)" != "" +LIB5TARGET=$(SLB)$/ikde_plug_ +LIB5FILES=$(SLB)$/kdeplug.lib +SHL5TARGET=vclplug_kde$(UPD)$(DLLPOSTFIX) +SHL5IMPLIB=ikde_plug_ +SHL5LIBS=$(LIB5TARGET) +# libs for KDE plugin +SHL5STDLIBS=$(WIDGETSET_KDE_LIBS) +SHL5STDLIBS+=-l$(SHL2TARGET) +SHL5STDLIBS+=$(SHL3STDLIBS) -lX11 -ldl +.ENDIF # "$(ENABLE_KDE)" != "" + .ENDIF # UNX # --- Allgemein ---------------------------------------------------------- |