diff options
author | Kurt Zenker <kz@openoffice.org> | 2005-08-25 15:15:32 +0000 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2005-08-25 15:15:32 +0000 |
commit | dddd126691980d0b831219e2c20c9d6d10af647f (patch) | |
tree | c2ec95eecd3ecc1cba7c023299daf10e514ee8fb /vcl | |
parent | 455c8cae250361bf41e6b6cea3516338793399ca (diff) |
INTEGRATION: CWS gslpatches4 (1.20.136); FILE MERGED
2005/07/11 10:44:01 pl 1.20.136.1: #i51735# make NAS optional
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/unx/source/app/makefile.mk | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/vcl/unx/source/app/makefile.mk b/vcl/unx/source/app/makefile.mk index e9a362e18f4f..5393f0729a5f 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.20 $ +# $Revision: 1.21 $ # -# last change: $Author: obo $ $Date: 2005-03-18 10:31:27 $ +# last change: $Author: kz $ $Date: 2005-08-25 16:15:32 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -108,14 +108,20 @@ SLOFILES+=\ $(SLO)$/rptpsound.obj \ $(SLO)$/nassound.obj + + +.IF "$(ENABLE_NAS)" != "" +CDEFS+=-DUSE_NAS +.ENDIF + .IF "$(ENABLE_PASF)" != "" -CFLAGS+=-DUSE_PASF +CDEFS+=-DUSE_PASF SLOFILES+=$(SLO)$/pasfsound.obj .IF "$(SYSTEM_SNDFILE)" == "YES" -CFLAGS+=-DSYSTEM_SNDFILE +CDEFS+=-DSYSTEM_SNDFILE .ENDIF .IF "$(SYSTEM_PORTAUDIO)" == "YES" -CFLAGS+=-DSYSTEM_PORTAUDIO +CDEFS+=-DSYSTEM_PORTAUDIO .ENDIF .ENDIF |