forked from bartvdbraak/blender
Add initial support in Makefiles for audaspace.
Note: removed hardcoded path in include directive. Check other build systems.
This commit is contained in:
parent
7440fee85c
commit
5fddab3fd8
@ -30,7 +30,7 @@
|
|||||||
extern "C" {
|
extern "C" {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "intern/AUD_Space.h"
|
#include "AUD_Space.h"
|
||||||
|
|
||||||
typedef enum
|
typedef enum
|
||||||
{
|
{
|
||||||
|
43
intern/audaspace/FX/Makefile
Normal file
43
intern/audaspace/FX/Makefile
Normal file
@ -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.
|
@ -36,7 +36,9 @@ LIBNAME = audaspace
|
|||||||
SOURCEDIR = intern/audaspace
|
SOURCEDIR = intern/audaspace
|
||||||
DIR = $(OCGDIR)/$(SOURCEDIR)
|
DIR = $(OCGDIR)/$(SOURCEDIR)
|
||||||
DIRS = intern
|
DIRS = intern
|
||||||
|
DIRS += FX
|
||||||
DIRS += SDL
|
DIRS += SDL
|
||||||
|
DIRS += SRC
|
||||||
|
|
||||||
ifeq ($(WITH_FFMPEG),true)
|
ifeq ($(WITH_FFMPEG),true)
|
||||||
DIRS += ffmpeg
|
DIRS += ffmpeg
|
||||||
@ -48,10 +50,10 @@ install: $(ALL_OR_DEBUG)
|
|||||||
@[ -d $(NAN_AUDASPACE) ] || mkdir $(NAN_AUDASPACE)
|
@[ -d $(NAN_AUDASPACE) ] || mkdir $(NAN_AUDASPACE)
|
||||||
@[ -d $(NAN_AUDASPACE)/include ] || mkdir $(NAN_AUDASPACE)/include
|
@[ -d $(NAN_AUDASPACE)/include ] || mkdir $(NAN_AUDASPACE)/include
|
||||||
@[ -d $(NAN_AUDASPACE)/lib/$(DEBUG_DIR) ] || mkdir $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)
|
@[ -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)
|
ifeq ($(OS),darwin)
|
||||||
ranlib $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaudaspace.a
|
ranlib $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaudaspace.a
|
||||||
endif
|
endif
|
||||||
@../tools/cpifdiff.sh *.h $(NAN_AUDASPACE)/include/
|
@../tools/cpifdiff.sh *.h intern/AUD_Space.h $(NAN_AUDASPACE)/include/
|
||||||
|
|
||||||
|
|
||||||
|
43
intern/audaspace/SRC/Makefile
Normal file
43
intern/audaspace/SRC/Makefile
Normal file
@ -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.
|
@ -106,6 +106,9 @@ COMLIB += $(NAN_JPEG)/lib/libjpeg.a
|
|||||||
COMLIB += $(OCGDIR)/blender/gpu/$(DEBUG_DIR)libgpu.a
|
COMLIB += $(OCGDIR)/blender/gpu/$(DEBUG_DIR)libgpu.a
|
||||||
COMLIB += $(NAN_GLEW)/lib/$(DEBUG_DIR)libglew.a
|
COMLIB += $(NAN_GLEW)/lib/$(DEBUG_DIR)libglew.a
|
||||||
COMLIB += $(OCGDIR)/blender/blenfont/$(DEBUG_DIR)libblenfont.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)
|
ifneq ($(NAN_NO_KETSJI),true)
|
||||||
COMLIB += $(OCGDIR)/gameengine/bloutines/$(DEBUG_DIR)libbloutines.a
|
COMLIB += $(OCGDIR)/gameengine/bloutines/$(DEBUG_DIR)libbloutines.a
|
||||||
|
@ -42,6 +42,7 @@ CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION)
|
|||||||
|
|
||||||
CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include
|
CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include
|
||||||
CPPFLAGS += -I../../../../intern/memutil
|
CPPFLAGS += -I../../../../intern/memutil
|
||||||
|
CPPFLAGS += -I$(NAN_AUDASPACE)/include
|
||||||
# Reference to the types in makesdna and imbuf
|
# Reference to the types in makesdna and imbuf
|
||||||
CPPFLAGS += -I../../makesdna
|
CPPFLAGS += -I../../makesdna
|
||||||
CPPFLAGS += -I../../makesrna
|
CPPFLAGS += -I../../makesrna
|
||||||
|
@ -50,6 +50,7 @@ CPPFLAGS += -I../../imbuf
|
|||||||
CPPFLAGS += -I../../python
|
CPPFLAGS += -I../../python
|
||||||
CPPFLAGS += -I../../blenfont
|
CPPFLAGS += -I../../blenfont
|
||||||
CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include
|
CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include
|
||||||
|
CPPFLAGS += -I$(NAN_AUDASPACE)/include
|
||||||
|
|
||||||
# own include
|
# own include
|
||||||
|
|
||||||
|
@ -97,6 +97,7 @@ ifeq ($(OS),linux)
|
|||||||
COMMENT = "MESA 3.1"
|
COMMENT = "MESA 3.1"
|
||||||
LLIBS = -L$(NAN_MESA)/lib -L/usr/X11R6/lib -lXmu -lXext -lX11 -lXi
|
LLIBS = -L$(NAN_MESA)/lib -L/usr/X11R6/lib -lXmu -lXext -lX11 -lXi
|
||||||
LLIBS += -lutil -lc -lm -ldl -lpthread
|
LLIBS += -lutil -lc -lm -ldl -lpthread
|
||||||
|
LLIBS += -lsamplerate
|
||||||
LOPTS = -export-dynamic
|
LOPTS = -export-dynamic
|
||||||
DADD = -lGL -lGLU
|
DADD = -lGL -lGLU
|
||||||
SADD = $(NAN_MESA)/lib/libGL.a $(NAN_MESA)/lib/libGLU.a
|
SADD = $(NAN_MESA)/lib/libGL.a $(NAN_MESA)/lib/libGLU.a
|
||||||
|
Loading…
Reference in New Issue
Block a user