diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-11-09 15:47:34 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-11-09 15:47:34 +0000 |
| commit | 6c169fb0f492caf88167fcb42688c8c3647c4546 (patch) | |
| tree | 9403b625f2080cd6ade2dc533f9bb6da48b45611 /vcl | |
| parent | 64287f9f07a7289d00b113e5991ebcd4f7569f52 (diff) | |
INTEGRATION: CWS vcl28 (1.15.14); FILE MERGED
2004/10/13 10:21:53 pl 1.15.14.3: #i35057# use ENABLE_PASF
2004/10/11 09:09:01 pl 1.15.14.2: RESYNC: (1.15-1.16); FILE MERGED
2004/10/06 16:01:49 pl 1.15.14.1: #i35057# add: sndfile, portaudio
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/source/app/makefile.mk | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/vcl/unx/source/app/makefile.mk b/vcl/unx/source/app/makefile.mk index a05ee1e3ed18..b3cc0d433c83 100644 --- a/vcl/unx/source/app/makefile.mk +++ b/vcl/unx/source/app/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.16 $ +# $Revision: 1.17 $ # -# last change: $Author: rt $ $Date: 2004-09-20 08:41:50 $ +# last change: $Author: hr $ $Date: 2004-11-09 16:47:34 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -93,18 +93,25 @@ SLOFILES=\ $(SLO)$/saltimer.obj \ $(SLO)$/saldisp.obj \ $(SLO)$/salinst.obj \ - $(SLO)$/salsound2.obj \ - $(SLO)$/audioconvert.obj \ - $(SLO)$/osssound.obj \ - $(SLO)$/devaudiosound.obj \ - $(SLO)$/rptpsound.obj \ - $(SLO)$/nassound.obj \ $(SLO)$/salsys.obj \ $(SLO)$/soicon.obj \ $(SLO)$/sm.obj \ $(SLO)$/keysymnames.obj \ $(SLO)$/wmadaptor.obj \ +SLOFILES+=\ + $(SLO)$/salsound2.obj \ + $(SLO)$/osssound.obj \ + $(SLO)$/devaudiosound.obj \ + $(SLO)$/audioconvert.obj \ + $(SLO)$/rptpsound.obj \ + $(SLO)$/nassound.obj + +.IF "$(ENABLE_PASF)" != "" +CFLAGS+=-DUSE_PASF +SLOFILES+=$(SLO)$/pasfsound.obj +.ENDIF + .IF "$(WITH_LIBSN)"=="YES" CDEFS+=-DHAVE_LIBSN CFLAGS+=$(LIBSN_CFLAGS) |