diff options
| author | Joerg Mueller <nexyon@gmail.com> | 2010-08-16 16:27:51 +0400 |
|---|---|---|
| committer | Joerg Mueller <nexyon@gmail.com> | 2010-08-16 16:27:51 +0400 |
| commit | 77e286fee9f453ee4f26b3050a2258442a3a456c (patch) | |
| tree | 709d039c90fcf25249e0144cf6b13a64a1984a71 /intern | |
| parent | 78d96324ae7dd82dbf76399b863820d2a04fc0af (diff) | |
Audaspace: Disabling FFTW building as this stuff is unused atm anyway.
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/audaspace/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | intern/audaspace/Makefile | 18 | ||||
| -rw-r--r-- | intern/audaspace/SConscript | 8 |
3 files changed, 18 insertions, 18 deletions
diff --git a/intern/audaspace/CMakeLists.txt b/intern/audaspace/CMakeLists.txt index c1d59dcd3e9..2a757646e07 100644 --- a/intern/audaspace/CMakeLists.txt +++ b/intern/audaspace/CMakeLists.txt @@ -54,11 +54,11 @@ IF(WITH_SNDFILE) ADD_DEFINITIONS(-DWITH_SNDFILE) ENDIF(WITH_SNDFILE) -IF(WITH_FFTW3) - SET(INC ${INC} fftw ${FFTW3_INC}) - FILE(GLOB FFTW3SRC fftw/*.cpp) - ADD_DEFINITIONS(-DWITH_FFTW3) -ENDIF(WITH_FFTW3) +#IF(WITH_FFTW3) +# SET(INC ${INC} fftw ${FFTW3_INC}) +# FILE(GLOB FFTW3SRC fftw/*.cpp) +# ADD_DEFINITIONS(-DWITH_FFTW3) +#ENDIF(WITH_FFTW3) IF(WITH_PYTHON) SET(INC ${INC} Python ${PYTHON_INC}) diff --git a/intern/audaspace/Makefile b/intern/audaspace/Makefile index 4cd15e5d9fb..759bd16bb2f 100644 --- a/intern/audaspace/Makefile +++ b/intern/audaspace/Makefile @@ -56,9 +56,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 @@ -84,9 +84,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 +110,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/ diff --git a/intern/audaspace/SConscript b/intern/audaspace/SConscript index 35c457aad4e..02156169b0d 100644 --- a/intern/audaspace/SConscript +++ b/intern/audaspace/SConscript @@ -31,10 +31,10 @@ if env['WITH_BF_SNDFILE']: incs += ' sndfile ' + env['BF_SNDFILE_INC'] defs.append('WITH_SNDFILE') -if env['WITH_BF_FFTW3']: - sources += env.Glob('fftw/*.cpp') - incs += ' fftw ' + env['BF_FFTW3_INC'] - defs.append('WITH_FFTW3') +#if env['WITH_BF_FFTW3']: +# sources += env.Glob('fftw/*.cpp') +# incs += ' fftw ' + env['BF_FFTW3_INC'] +# defs.append('WITH_FFTW3') if env['WITH_BF_PYTHON']: sources += env.Glob('Python/*.cpp') |