[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25601] trunk/blender: Add audaspace/ fftw to Makefile system.

[gsr b3d]

Revision: 25601
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25601
Author:   gsrb3d
Date:     2009-12-29 00:40:20 +0100 (Tue, 29 Dec 2009)

Log Message:
-----------
Add audaspace/fftw to Makefile system.

Modified Paths:
--------------
    trunk/blender/intern/audaspace/Makefile
    trunk/blender/source/Makefile

Added Paths:
-----------
    trunk/blender/intern/audaspace/fftw/Makefile

Modified: trunk/blender/intern/audaspace/Makefile
===================================================================
--- trunk/blender/intern/audaspace/Makefile	2009-12-28 22:59:09 UTC (rev 25600)
+++ trunk/blender/intern/audaspace/Makefile	2009-12-28 23:40:20 UTC (rev 25601)
@@ -56,6 +56,10 @@
   DIRS += sndfile
 endif
 
+ifeq ($(WITH_FFTW3),true)
+  DIRS += fftw
+endif
+
 include nan_subdirs.mk
 
 install: $(ALL_OR_DEBUG)
@@ -80,6 +84,10 @@
 	@../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 ($(OS),darwin)
 	ranlib $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaudaspace.a
 	ranlib $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_src.a
@@ -102,5 +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
+
+endif
 	@../tools/cpifdiff.sh intern/*.h $(NAN_AUDASPACE)/include/

Added: trunk/blender/intern/audaspace/fftw/Makefile
===================================================================
--- trunk/blender/intern/audaspace/fftw/Makefile	                        (rev 0)
+++ trunk/blender/intern/audaspace/fftw/Makefile	2009-12-28 23:40:20 UTC (rev 25601)
@@ -0,0 +1,41 @@
+#
+# $Id$
+#
+# ***** BEGIN GPL LICENSE BLOCK *****
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
+# All rights reserved.
+#
+# The Original Code is: all of this file.
+#
+# Contributor(s): none yet.
+#
+# ***** END GPL LICENSE BLOCK *****
+#
+#
+
+LIBNAME = aud_fftw
+DIR = $(OCGDIR)/intern/audaspace
+
+include nan_compile.mk
+
+CCFLAGS += $(LEVEL_1_CPP_WARNINGS)
+
+CPPFLAGS += -I../intern
+CPPFLAGS += -I../FX
+CPPFLAGS += -I..
+CPPFLAGS += -I.


Property changes on: trunk/blender/intern/audaspace/fftw/Makefile
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: trunk/blender/source/Makefile
===================================================================
--- trunk/blender/source/Makefile	2009-12-28 22:59:09 UTC (rev 25600)
+++ trunk/blender/source/Makefile	2009-12-28 23:40:20 UTC (rev 25601)
@@ -137,6 +137,10 @@
     COMLIB += $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_sndfile.a
 endif
 
+ifeq ($(WITH_FFTW3),true)
+    COMLIB += $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_fftw.a
+endif
+
 ifneq ($(NAN_NO_KETSJI),true)
     COMLIB += $(OCGDIR)/gameengine/bloutines/$(DEBUG_DIR)libbloutines.a
     COMLIB += $(OCGDIR)/gameengine/blconverter/$(DEBUG_DIR)libblconverter.a