From 5fddab3fd8d6ff183f0a322b19231840b73c1239 Mon Sep 17 00:00:00 2001 From: "Guillermo S. Romero" Date: Mon, 10 Aug 2009 01:56:54 +0000 Subject: Add initial support in Makefiles for audaspace. Note: removed hardcoded path in include directive. Check other build systems. --- intern/audaspace/AUD_C-API.h | 2 +- intern/audaspace/FX/Makefile | 43 +++++++++++++++++++++++++ intern/audaspace/Makefile | 6 ++-- intern/audaspace/SRC/Makefile | 43 +++++++++++++++++++++++++ source/Makefile | 3 ++ source/blender/blenkernel/intern/Makefile | 1 + source/blender/editors/space_sequencer/Makefile | 1 + source/nan_link.mk | 1 + 8 files changed, 97 insertions(+), 3 deletions(-) create mode 100644 intern/audaspace/FX/Makefile create mode 100644 intern/audaspace/SRC/Makefile diff --git a/intern/audaspace/AUD_C-API.h b/intern/audaspace/AUD_C-API.h index 1ee4b33e9fe..b08f05db1ca 100644 --- a/intern/audaspace/AUD_C-API.h +++ b/intern/audaspace/AUD_C-API.h @@ -30,7 +30,7 @@ extern "C" { #endif -#include "intern/AUD_Space.h" +#include "AUD_Space.h" typedef enum { diff --git a/intern/audaspace/FX/Makefile b/intern/audaspace/FX/Makefile new file mode 100644 index 00000000000..bda0e2bdab6 --- /dev/null +++ b/intern/audaspace/FX/Makefile @@ -0,0 +1,43 @@ +# +# $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_fx +DIR = $(OCGDIR)/intern/audaspace + +include nan_compile.mk + +CCFLAGS += $(LEVEL_1_CPP_WARNINGS) + +CPPFLAGS += -I../ffmpeg +CPPFLAGS += -I../intern +CPPFLAGS += -I../SDL +CPPFLAGS += -I../SRC +CPPFLAGS += -I.. +CPPFLAGS += -I. diff --git a/intern/audaspace/Makefile b/intern/audaspace/Makefile index b8832529d22..8ede55800a5 100644 --- a/intern/audaspace/Makefile +++ b/intern/audaspace/Makefile @@ -36,7 +36,9 @@ LIBNAME = audaspace SOURCEDIR = intern/audaspace DIR = $(OCGDIR)/$(SOURCEDIR) DIRS = intern +DIRS += FX DIRS += SDL +DIRS += SRC ifeq ($(WITH_FFMPEG),true) DIRS += ffmpeg @@ -48,10 +50,10 @@ 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 $(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) ifeq ($(OS),darwin) ranlib $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaudaspace.a endif - @../tools/cpifdiff.sh *.h $(NAN_AUDASPACE)/include/ + @../tools/cpifdiff.sh *.h intern/AUD_Space.h $(NAN_AUDASPACE)/include/ diff --git a/intern/audaspace/SRC/Makefile b/intern/audaspace/SRC/Makefile new file mode 100644 index 00000000000..07804d3b37b --- /dev/null +++ b/intern/audaspace/SRC/Makefile @@ -0,0 +1,43 @@ +# +# $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_src +DIR = $(OCGDIR)/intern/audaspace + +include nan_compile.mk + +CCFLAGS += $(LEVEL_1_CPP_WARNINGS) + +CPPFLAGS += -I../ffmpeg +CPPFLAGS += -I../FX +CPPFLAGS += -I../SDL +CPPFLAGS += -I../intern +CPPFLAGS += -I.. +CPPFLAGS += -I. diff --git a/source/Makefile b/source/Makefile index abb0f311174..e5efd87fb6e 100644 --- a/source/Makefile +++ b/source/Makefile @@ -106,6 +106,9 @@ COMLIB += $(NAN_JPEG)/lib/libjpeg.a COMLIB += $(OCGDIR)/blender/gpu/$(DEBUG_DIR)libgpu.a COMLIB += $(NAN_GLEW)/lib/$(DEBUG_DIR)libglew.a COMLIB += $(OCGDIR)/blender/blenfont/$(DEBUG_DIR)libblenfont.a +COMLIB += $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaudaspace.a +COMLIB += $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_src.a +COMLIB += $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_fx.a ifneq ($(NAN_NO_KETSJI),true) COMLIB += $(OCGDIR)/gameengine/bloutines/$(DEBUG_DIR)libbloutines.a diff --git a/source/blender/blenkernel/intern/Makefile b/source/blender/blenkernel/intern/Makefile index f60bdffa282..60ffdc78726 100644 --- a/source/blender/blenkernel/intern/Makefile +++ b/source/blender/blenkernel/intern/Makefile @@ -42,6 +42,7 @@ CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include CPPFLAGS += -I../../../../intern/memutil +CPPFLAGS += -I$(NAN_AUDASPACE)/include # Reference to the types in makesdna and imbuf CPPFLAGS += -I../../makesdna CPPFLAGS += -I../../makesrna diff --git a/source/blender/editors/space_sequencer/Makefile b/source/blender/editors/space_sequencer/Makefile index 7be0bc9cfef..2fb3de516b4 100644 --- a/source/blender/editors/space_sequencer/Makefile +++ b/source/blender/editors/space_sequencer/Makefile @@ -50,6 +50,7 @@ CPPFLAGS += -I../../imbuf CPPFLAGS += -I../../python CPPFLAGS += -I../../blenfont CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include +CPPFLAGS += -I$(NAN_AUDASPACE)/include # own include diff --git a/source/nan_link.mk b/source/nan_link.mk index 4e32366956a..3c84e62049b 100644 --- a/source/nan_link.mk +++ b/source/nan_link.mk @@ -97,6 +97,7 @@ ifeq ($(OS),linux) COMMENT = "MESA 3.1" LLIBS = -L$(NAN_MESA)/lib -L/usr/X11R6/lib -lXmu -lXext -lX11 -lXi LLIBS += -lutil -lc -lm -ldl -lpthread + LLIBS += -lsamplerate LOPTS = -export-dynamic DADD = -lGL -lGLU SADD = $(NAN_MESA)/lib/libGL.a $(NAN_MESA)/lib/libGLU.a -- cgit v1.2.3