[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31375] trunk/blender/intern/audaspace: Audaspace: Disabling FFTW building as this stuff is unused atm anyway.

Joerg Mueller nexyon at gmail.com
Mon Aug 16 14:27:51 CEST 2010


Revision: 31375
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31375
Author:   nexyon
Date:     2010-08-16 14:27:51 +0200 (Mon, 16 Aug 2010)

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

Modified Paths:
--------------
    trunk/blender/intern/audaspace/CMakeLists.txt
    trunk/blender/intern/audaspace/Makefile
    trunk/blender/intern/audaspace/SConscript

Modified: trunk/blender/intern/audaspace/CMakeLists.txt
===================================================================
--- trunk/blender/intern/audaspace/CMakeLists.txt	2010-08-16 12:22:19 UTC (rev 31374)
+++ trunk/blender/intern/audaspace/CMakeLists.txt	2010-08-16 12:27:51 UTC (rev 31375)
@@ -54,11 +54,11 @@
 	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})

Modified: trunk/blender/intern/audaspace/Makefile
===================================================================
--- trunk/blender/intern/audaspace/Makefile	2010-08-16 12:22:19 UTC (rev 31374)
+++ trunk/blender/intern/audaspace/Makefile	2010-08-16 12:27:51 UTC (rev 31375)
@@ -56,9 +56,9 @@
   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 @@
 	@../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 @@
 	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/

Modified: trunk/blender/intern/audaspace/SConscript
===================================================================
--- trunk/blender/intern/audaspace/SConscript	2010-08-16 12:22:19 UTC (rev 31374)
+++ trunk/blender/intern/audaspace/SConscript	2010-08-16 12:27:51 UTC (rev 31375)
@@ -31,10 +31,10 @@
 	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')





More information about the Bf-blender-cvs mailing list