diff options
| author | Arystanbek Dyussenov <arystan.d@gmail.com> | 2010-09-04 22:49:07 +0400 |
|---|---|---|
| committer | Arystanbek Dyussenov <arystan.d@gmail.com> | 2010-09-04 22:49:07 +0400 |
| commit | 90b464d3728d9ed8ec26fdf59058d236b99dbcd9 (patch) | |
| tree | e88cab4fb1358e962b19f658064ca8c9f8d29f5b /intern/audaspace/Makefile | |
| parent | 08d02dd04d836976b25793bb1d4c6a86b3f924c7 (diff) | |
| parent | b0b787ef38f9947b3176642556f5282eb3518f69 (diff) | |
COLLADA branch: merge from trunk -r 28015:31610.soc-2009-chingachgook
Diffstat (limited to 'intern/audaspace/Makefile')
| -rw-r--r-- | intern/audaspace/Makefile | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/intern/audaspace/Makefile b/intern/audaspace/Makefile index 4cd15e5d9fb..c1a613af1ae 100644 --- a/intern/audaspace/Makefile +++ b/intern/audaspace/Makefile @@ -39,6 +39,7 @@ DIRS = intern DIRS += FX DIRS += SDL DIRS += SRC +DIRS += Python ifeq ($(WITH_FFMPEG),true) DIRS += ffmpeg @@ -56,9 +57,9 @@ ifeq ($(WITH_SNDFILE),true) DIRS += sndfile endif -ifeq ($(WITH_FFTW3),true) - DIRS += fftw -endif +#ifeq ($(WITH_FFTW3),true) +# DIRS += fftw +#endif include nan_subdirs.mk @@ -66,7 +67,7 @@ install: $(ALL_OR_DEBUG) @[ -d $(NAN_AUDASPACE) ] || mkdir $(NAN_AUDASPACE) @[ -d $(NAN_AUDASPACE)/include ] || mkdir $(NAN_AUDASPACE)/include @[ -d $(NAN_AUDASPACE)/lib/$(DEBUG_DIR) ] || mkdir $(NAN_AUDASPACE)/lib/$(DEBUG_DIR) - @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libaudaspace.a $(DIR)/$(DEBUG_DIR)libaud_sdl.a $(DIR)/$(DEBUG_DIR)libaud_fx.a $(DIR)/$(DEBUG_DIR)libaud_src.a $(NAN_AUDASPACE)/lib/$(DEBUG_DIR) + @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libaudaspace.a $(DIR)/$(DEBUG_DIR)libaud_sdl.a $(DIR)/$(DEBUG_DIR)libaud_python.a $(DIR)/$(DEBUG_DIR)libaud_fx.a $(DIR)/$(DEBUG_DIR)libaud_src.a $(NAN_AUDASPACE)/lib/$(DEBUG_DIR) ifeq ($(WITH_FFMPEG),true) @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libaud_ffmpeg.a $(NAN_AUDASPACE)/lib/$(DEBUG_DIR) @@ -84,9 +85,9 @@ ifeq ($(WITH_SNDFILE),true) @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libaud_sndfile.a $(NAN_AUDASPACE)/lib/$(DEBUG_DIR) endif -ifeq ($(WITH_FFTW3),true) - @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libaud_fftw.a $(NAN_AUDASPACE)/lib/$(DEBUG_DIR) -endif +#ifeq ($(WITH_FFTW3),true) +# @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libaud_fftw.a $(NAN_AUDASPACE)/lib/$(DEBUG_DIR) +#endif ifeq ($(OS),darwin) ranlib $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaudaspace.a @@ -110,9 +111,9 @@ ifeq ($(WITH_SNDFILE),true) ranlib $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_sndfile.a endif -ifeq ($(WITH_FFTW3),true) - ranlib $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_fftw.a -endif +#ifeq ($(WITH_FFTW3),true) +# ranlib $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_fftw.a +#endif endif @../tools/cpifdiff.sh intern/*.h $(NAN_AUDASPACE)/include/ |