Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Borghetti <bdiego@gmail.com>2009-08-22 02:56:26 +0400
committerDiego Borghetti <bdiego@gmail.com>2009-08-22 02:56:26 +0400
commit9202aaa2dc4b4bf70621c06bc82a5d836a4afc14 (patch)
tree51f59357f526cc682642560b94a938d9b4782d90 /source/Makefile
parentd82935a327203e41da7913b75ab9981d61cdc927 (diff)
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.
Diffstat (limited to 'source/Makefile')
-rw-r--r--source/Makefile36
1 files changed, 30 insertions, 6 deletions
diff --git a/source/Makefile b/source/Makefile
index 8e9f66bbe42..93bd2e23903 100644
--- a/source/Makefile
+++ b/source/Makefile
@@ -109,11 +109,28 @@ 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
+COMLIB += $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_sdl.a
COMLIB += $(NAN_SAMPLERATE)/lib/$(DEBUG_DIR)libsamplerate.a
COMLIB += $(NAN_LZO)/lib/$(DEBUG_DIR)libminilzo.a
COMLIB += $(NAN_LZMA)/lib/$(DEBUG_DIR)liblzma.a
COMLIB += $(NAN_SMOKE)/lib/$(DEBUG_DIR)/libsmoke.a
+ifeq ($(WITH_FFMPEG),true)
+ COMLIB += $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_ffmpeg.a
+endif
+
+ifeq ($(WITH_OPENAL),true)
+ COMLIB += $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_openal.a
+endif
+
+ifeq ($(WITH_JACK),true)
+ COMLIB += $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_jack.a
+endif
+
+ifeq ($(WITH_SNDFILE),true)
+ COMLIB += $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_sndfile.a
+endif
+
ifneq ($(NAN_NO_KETSJI),true)
COMLIB += $(OCGDIR)/gameengine/bloutines/$(DEBUG_DIR)libbloutines.a
COMLIB += $(OCGDIR)/gameengine/blconverter/$(DEBUG_DIR)libblconverter.a
@@ -356,12 +373,7 @@ ifeq ($(OS),solaris)
SPLIB += $(NAN_ZLIB)/lib/libz.a
endif
-# OpenAL libs are already compiled as shared code!
-
-# Some kooky logic going on here ...
-ifeq ($(NAN_NO_OPENAL), true)
-# NAN_SND_LIBS =
-else
+ifeq ($(WITH_OPENAL),true)
ifeq ($(OS),$(findstring $(OS), "freebsd linux windows"))
ifeq ($(CPU),$(findstring $(CPU), "i386 powerpc x86_64 parisc64"))
NAN_SND_LIBS += $(NAN_OPENAL)/lib/libopenal.a
@@ -381,6 +393,18 @@ else
endif
endif
+ifeq ($(WITH_JACK),true)
+ ifeq ($(OS),$(findstring $(OS), "linux"))
+ NAN_SND_LIBS += $(NAN_JACKLIBS)
+ endif
+endif
+
+ifeq ($(WITH_SNDFILE),true)
+ ifeq ($(OS),$(findstring $(OS), "linux"))
+ NAN_SND_LIBS += $(NAN_SNDFILELIBS)
+ endif
+endif
+
ifeq ($(OS),windows)
# Might need to change this to $(NAN_MOZILLA_LIB)/nspr4.lib