From 9202aaa2dc4b4bf70621c06bc82a5d836a4afc14 Mon Sep 17 00:00:00 2001 From: Diego Borghetti Date: Fri, 21 Aug 2009 22:56:26 +0000 Subject: Update Makefiles for audaspace. This add support for: sdl, ffmpeg, openal, jack and sndfile. We have new options: WITH_OPENAL, default false WITH_JACK, default false WITH_SNDFILE, default false and with this: NAN_OPENAL, default /usr NAN_JACK, default /usr NAN_JACKCFLAGS, default -I$(NAN_JACK)/include/jack NAN_JACKLIBS, default $(NAN_JACK)/lib/libjack.a NAN_SNDFILE, default /usr NAN_SNDFILECFLAGS, default -I$(NAN_SNDFILE)/include NAN_SNDFILELIBS, default $(NAN_SNDFILE)/lib/libsndfile. Also add two new option on source/Makefile for jack and sndfile libs, but only for linux, so let me know for other OS. --- intern/audaspace/Makefile | 48 +++++++++++++++++++++++++++++++++++++-- intern/audaspace/OpenAL/Makefile | 39 +++++++++++++++++++++++++++++++ intern/audaspace/SDL/Makefile | 2 +- intern/audaspace/ffmpeg/Makefile | 2 +- intern/audaspace/intern/Makefile | 25 ++++++++++++++++++++ intern/audaspace/jack/Makefile | 4 ++++ intern/audaspace/sndfile/Makefile | 40 ++++++++++++++++++++++++++++++++ 7 files changed, 156 insertions(+), 4 deletions(-) create mode 100644 intern/audaspace/OpenAL/Makefile create mode 100644 intern/audaspace/sndfile/Makefile (limited to 'intern/audaspace') diff --git a/intern/audaspace/Makefile b/intern/audaspace/Makefile index 2d66dcf67fa..474f53f0e0f 100644 --- a/intern/audaspace/Makefile +++ b/intern/audaspace/Makefile @@ -44,19 +44,63 @@ ifeq ($(WITH_FFMPEG),true) DIRS += ffmpeg endif +ifeq ($(WITH_OPENAL),true) + DIRS += OpenAL +endif + +ifeq ($(WITH_JACK),true) + DIRS += jack +endif + +ifeq ($(WITH_SNDFILE),true) + DIRS += sndfile +endif + include nan_subdirs.mk install: $(ALL_OR_DEBUG) @[ -d $(NAN_AUDASPACE) ] || mkdir $(NAN_AUDASPACE) @[ -d $(NAN_AUDASPACE)/include ] || mkdir $(NAN_AUDASPACE)/include @[ -d $(NAN_AUDASPACE)/lib/$(DEBUG_DIR) ] || mkdir $(NAN_AUDASPACE)/lib/$(DEBUG_DIR) - @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libaudaspace.a $(DIR)/$(DEBUG_DIR)libaud_fx.a $(DIR)/$(DEBUG_DIR)libaud_src.a $(NAN_AUDASPACE)/lib/$(DEBUG_DIR) + @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libaudaspace.a $(DIR)/$(DEBUG_DIR)libaud_sdl.a $(DIR)/$(DEBUG_DIR)libaud_fx.a $(DIR)/$(DEBUG_DIR)libaud_src.a $(NAN_AUDASPACE)/lib/$(DEBUG_DIR) + +ifeq ($(WITH_FFMPEG),true) + @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libaud_ffmpeg.a $(NAN_AUDASPACE)/lib/$(DEBUG_DIR) +endif + +ifeq ($(WITH_OPENAL),true) + @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libaud_openal.a $(NAN_AUDASPACE)/lib/$(DEBUG_DIR) +endif + +ifeq ($(WITH_JACK),true) + @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libaud_jack.a $(NAN_AUDASPACE)/lib/$(DEBUG_DIR) +endif + +ifeq ($(WITH_SNDFILE),true) + @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libaud_sndfile.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 ranlib $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_fx.a + ranlib $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_sdl.a + +ifeq ($(WITH_FFMPEG),true) + ranlib $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_ffmpeg.a +endif + +ifeq ($(WITH_OPENAL),true) + ranlib $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_openal.a +endif + +ifeq ($(WITH_JACK),true) + ranlib $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_jack.a endif - @../tools/cpifdiff.sh intern/*.h $(NAN_AUDASPACE)/include/ +ifeq ($(WITH_SNDFILE),true) + ranlib $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_sndfile.a +endif +endif + @../tools/cpifdiff.sh intern/*.h $(NAN_AUDASPACE)/include/ diff --git a/intern/audaspace/OpenAL/Makefile b/intern/audaspace/OpenAL/Makefile new file mode 100644 index 00000000000..4cf9f66b06c --- /dev/null +++ b/intern/audaspace/OpenAL/Makefile @@ -0,0 +1,39 @@ +# +# $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_openal +DIR = $(OCGDIR)/intern/audaspace + +include nan_compile.mk + +CCFLAGS += $(LEVEL_1_CPP_WARNINGS) + +CPPFLAGS += -I../intern +CPPFLAGS += -I. diff --git a/intern/audaspace/SDL/Makefile b/intern/audaspace/SDL/Makefile index e36b2de41fe..02a4068f3dc 100644 --- a/intern/audaspace/SDL/Makefile +++ b/intern/audaspace/SDL/Makefile @@ -29,7 +29,7 @@ # LIBNAME = aud_sdl -DIR = $(OCGDIR)/intern/$(LIBNAME) +DIR = $(OCGDIR)/intern/audaspace include nan_compile.mk diff --git a/intern/audaspace/ffmpeg/Makefile b/intern/audaspace/ffmpeg/Makefile index 0bfe6494559..492ac83f532 100644 --- a/intern/audaspace/ffmpeg/Makefile +++ b/intern/audaspace/ffmpeg/Makefile @@ -29,7 +29,7 @@ # LIBNAME = aud_ffmpeg -DIR = $(OCGDIR)/intern/$(LIBNAME) +DIR = $(OCGDIR)/intern/audaspace include nan_compile.mk diff --git a/intern/audaspace/intern/Makefile b/intern/audaspace/intern/Makefile index 2dcc7798f1c..a99f44c54d7 100644 --- a/intern/audaspace/intern/Makefile +++ b/intern/audaspace/intern/Makefile @@ -35,6 +35,31 @@ include nan_compile.mk CCFLAGS += $(LEVEL_1_CPP_WARNINGS) +ifeq ($(WITH_SDL),true) + CPPFLAGS += -DWITH_SDL + CPPFLAGS += $(NAN_SDLCFLAGS) +endif + +ifeq ($(WITH_OPENAL),true) + CPPFLAGS += -DWITH_OPENAL + CPPFLAGS += -I../OpenAL +endif + +ifeq ($(WITH_JACK),true) + CPPFLAGS += -DWITH_JACK + CPPFLAGS += -I$(NAN_JACKCFLAGS) + CPPFLAGS += -I../jack +endif + +ifeq ($(WITH_FFMPEG),true) + CPPFLAGS += -DWITH_FFMPEG + CPPFLAGS += $(NAN_FFMPEGCFLAGS) +endif + +ifeq ($(WITH_SNDFILE),true) + CPPFLAGS += -DWITH_SNDFILE +endif + CPPFLAGS += -I$(LCGDIR)/samplerate/include/ CPPFLAGS += -I../ffmpeg CPPFLAGS += -I../FX diff --git a/intern/audaspace/jack/Makefile b/intern/audaspace/jack/Makefile index a6cc9119c6d..23cadf559c0 100644 --- a/intern/audaspace/jack/Makefile +++ b/intern/audaspace/jack/Makefile @@ -35,6 +35,10 @@ include nan_compile.mk CCFLAGS += $(LEVEL_1_CPP_WARNINGS) +# If we are here, jack is enable. +CPPFLAGS += -DWITH_JACK +CPPFLAGS += $(NAN_JACKCFLAGS) + CPPFLAGS += -I../intern CPPFLAGS += -I.. CPPFLAGS += -I. diff --git a/intern/audaspace/sndfile/Makefile b/intern/audaspace/sndfile/Makefile new file mode 100644 index 00000000000..1cf0b2683fb --- /dev/null +++ b/intern/audaspace/sndfile/Makefile @@ -0,0 +1,40 @@ +# +# $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): +# +# ***** END GPL LICENSE BLOCK ***** +# +# + +LIBNAME = aud_sndfile +DIR = $(OCGDIR)/intern/audaspace + +include nan_compile.mk + +CCFLAGS += $(LEVEL_1_CPP_WARNINGS) + +CPPFLAGS += -I../intern +CPPFLAGS += -I.. +CPPFLAGS += -I. -- cgit v1.2.3