diff options
author | Guillermo S. Romero <gsr.b3d@infernal-iceberg.com> | 2009-12-29 02:40:20 +0300 |
---|---|---|
committer | Guillermo S. Romero <gsr.b3d@infernal-iceberg.com> | 2009-12-29 02:40:20 +0300 |
commit | 42154ad226d7f5be0bb5ca80250b0dcc395db9cc (patch) | |
tree | 764bb46eb9269b3c038d23002cf408d48a61b0f1 | |
parent | d741b3723633f68c960d5fb1ff677f7a72e652ac (diff) |
Add audaspace/fftw to Makefile system.
-rw-r--r-- | intern/audaspace/Makefile | 12 | ||||
-rw-r--r-- | intern/audaspace/fftw/Makefile | 41 | ||||
-rw-r--r-- | source/Makefile | 4 |
3 files changed, 57 insertions, 0 deletions
diff --git a/intern/audaspace/Makefile b/intern/audaspace/Makefile index 474f53f0e0f..4cd15e5d9fb 100644 --- a/intern/audaspace/Makefile +++ b/intern/audaspace/Makefile @@ -56,6 +56,10 @@ ifeq ($(WITH_SNDFILE),true) DIRS += sndfile endif +ifeq ($(WITH_FFTW3),true) + DIRS += fftw +endif + include nan_subdirs.mk install: $(ALL_OR_DEBUG) @@ -80,6 +84,10 @@ 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 ($(OS),darwin) ranlib $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaudaspace.a ranlib $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_src.a @@ -102,5 +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 + endif @../tools/cpifdiff.sh intern/*.h $(NAN_AUDASPACE)/include/ diff --git a/intern/audaspace/fftw/Makefile b/intern/audaspace/fftw/Makefile new file mode 100644 index 00000000000..e8e47537bce --- /dev/null +++ b/intern/audaspace/fftw/Makefile @@ -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. diff --git a/source/Makefile b/source/Makefile index 37b528f4aed..e08def0f9e2 100644 --- a/source/Makefile +++ b/source/Makefile @@ -137,6 +137,10 @@ ifeq ($(WITH_SNDFILE),true) 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 |