Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Audaspace: Disabling FFTW building as this stuff is unused atm anyway.

Browse Source
This commit is contained in:
Joerg Mueller
2010-08-16 12:27:51 +00:00
parent 78d96324ae
commit 77e286fee9
3 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
intern/audaspace/CMakeLists.txt
View File

@@ -54,11 +54,11 @@ IF(WITH_SNDFILE)
ADD_DEFINITIONS(-DWITH_SNDFILE) ADD_DEFINITIONS(-DWITH_SNDFILE)
ENDIF(WITH_SNDFILE) ENDIF(WITH_SNDFILE)
IF(WITH_FFTW3) #IF(WITH_FFTW3)
SET(INC ${INC} fftw ${FFTW3_INC}) # SET(INC ${INC} fftw ${FFTW3_INC})
FILE(GLOB FFTW3SRC fftw/*.cpp) # FILE(GLOB FFTW3SRC fftw/*.cpp)
ADD_DEFINITIONS(-DWITH_FFTW3) # ADD_DEFINITIONS(-DWITH_FFTW3)
ENDIF(WITH_FFTW3) #ENDIF(WITH_FFTW3)
IF(WITH_PYTHON) IF(WITH_PYTHON)
SET(INC ${INC} Python ${PYTHON_INC}) SET(INC ${INC} Python ${PYTHON_INC})

18
intern/audaspace/Makefile
View File

@@ -56,9 +56,9 @@ ifeq ($(WITH_SNDFILE),true)
DIRS += sndfile DIRS += sndfile
endif endif
ifeq ($(WITH_FFTW3),true) #ifeq ($(WITH_FFTW3),true)
DIRS += fftw # DIRS += fftw
endif #endif
include nan_subdirs.mk 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) @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libaud_sndfile.a $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)
endif endif
ifeq ($(WITH_FFTW3),true) #ifeq ($(WITH_FFTW3),true)
@../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libaud_fftw.a $(NAN_AUDASPACE)/lib/$(DEBUG_DIR) # @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libaud_fftw.a $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)
endif #endif
ifeq ($(OS),darwin) ifeq ($(OS),darwin)
ranlib $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaudaspace.a 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 ranlib $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_sndfile.a
endif endif
ifeq ($(WITH_FFTW3),true) #ifeq ($(WITH_FFTW3),true)
ranlib $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_fftw.a # ranlib $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_fftw.a
endif #endif
endif endif
@../tools/cpifdiff.sh intern/*.h $(NAN_AUDASPACE)/include/ @../tools/cpifdiff.sh intern/*.h $(NAN_AUDASPACE)/include/

8
intern/audaspace/SConscript
View File

@@ -31,10 +31,10 @@ if env['WITH_BF_SNDFILE']:
incs += ' sndfile ' + env['BF_SNDFILE_INC'] incs += ' sndfile ' + env['BF_SNDFILE_INC']
defs.append('WITH_SNDFILE') defs.append('WITH_SNDFILE')
if env['WITH_BF_FFTW3']: #if env['WITH_BF_FFTW3']:
sources += env.Glob('fftw/*.cpp') # sources += env.Glob('fftw/*.cpp')
incs += ' fftw ' + env['BF_FFTW3_INC'] # incs += ' fftw ' + env['BF_FFTW3_INC']
defs.append('WITH_FFTW3') # defs.append('WITH_FFTW3')
if env['WITH_BF_PYTHON']: if env['WITH_BF_PYTHON']:
sources += env.Glob('Python/*.cpp') sources += env.Glob('Python/*.cpp')