diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-03-07 15:47:02 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-03-07 15:47:02 +0000 |
| commit | 6fbe6e35de6609b2a5b2e4a4d27055137791de84 (patch) | |
| tree | fb97aed26ae20beb6bc980ac71cb381c490db817 /vcl/util | |
| parent | 37d2491aa6f39cecc6f34c4c6a9c5a46ce6ed7bc (diff) | |
INTEGRATION: CWS unifysound01_DEV300 (1.98.10); FILE MERGED
2008/01/15 16:17:34 cmc 1.98.10.4: RESYNC: (1.100-1.103); FILE MERGED
2007/10/23 09:05:48 cmc 1.98.10.3: RESYNC: (1.99-1.100); FILE MERGED
2007/10/04 22:03:31 cmc 1.98.10.2: RESYNC: (1.98-1.99); FILE MERGED
2007/08/31 10:02:06 cmc 1.98.10.1: #i81172# death to vcl sound
Diffstat (limited to 'vcl/util')
| -rw-r--r-- | vcl/util/makefile.mk | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/vcl/util/makefile.mk b/vcl/util/makefile.mk index fcb8f32f3ca0..235900922097 100644 --- a/vcl/util/makefile.mk +++ b/vcl/util/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.105 $ +# $Revision: 1.106 $ # -# last change: $Author: obo $ $Date: 2008-02-25 16:55:25 $ +# last change: $Author: kz $ $Date: 2008-03-07 16:47:02 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -301,25 +301,6 @@ SHL2STDLIBS += $(XINERAMALIBS) SHL2STDLIBS+=`pkg-config --libs xrender` .ENDIF - -.IF "$(ENABLE_PASF)" != "" -SHL2STDLIBS += $(SNDFILELIB) -lportaudio -.IF "$(OS)"=="MACOSX" -SHL2STDLIBS += -framework CoreAudio -framework AudioToolbox -.ENDIF # "$(OS)"=="MACOSX" -.ENDIF # "$(ENABLE_PASF)"!="" - -.IF "$(ENABLE_NAS)" != "" -SHL2STDLIBS += -laudio -.IF "$(XAU_LIBS)" != "" -SHL2STDLIBS += $(XAU_LIBS) -.ENDIF -.IF "$(OS)"=="SOLARIS" -# needed by libaudio.a -SHL2STDLIBS += -ldl -lnsl -lsocket -.ENDIF # SOLARIS -.ENDIF - .IF "$(GUIBASE)"=="unx" SHL2STDLIBS += -lXext -lSM -lICE -lX11 |