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. --- source/nan_definitions.mk | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) (limited to 'source/nan_definitions.mk') diff --git a/source/nan_definitions.mk b/source/nan_definitions.mk index 7fab61d5247..50a606496f5 100644 --- a/source/nan_definitions.mk +++ b/source/nan_definitions.mk @@ -117,6 +117,25 @@ ifndef CONFIG_GUESS export WITH_LZMA ?= true export NAN_LZO ?= $(LCGDIR)/lzo export NAN_LZMA ?= $(LCGDIR)/lzma + export WITH_OPENAL ?= false + export WITH_JACK ?= false + export WITH_SNDFILE ?= false + + ifeq ($(WITH_OPENAL), true) + export NAN_OPENAL ?= /usr + endif + + ifeq ($(WITH_JACK), true) + export NAN_JACK ?= /usr + export NAN_JACKCFLAGS ?= -I$(NAN_JACK)/include/jack + export NAN_JACKLIBS ?= $(NAN_JACK)/lib/libjack.a + endif + + ifeq ($(WITH_SNDFILE),true) + export NAN_SNDFILE ?= /usr + export NAN_SNDFILECFLAGS ?= -I$(NAN_SNDFILE)/include + export NAN_SNDFILELIBS ?= $(NAN_SNDFILE)/lib/libsndfile.a + endif ifeq ($(NAN_USE_FFMPEG_CONFIG), true) export NAN_FFMPEG ?= $(shell ffmpeg-config --prefix) @@ -175,7 +194,7 @@ ifndef CONFIG_GUESS export NAN_NO_KETSJI=false ifeq ($(CPU), i386) - export NAN_NO_OPENAL=true + export WITH_OPENAL=false endif # Location of MOZILLA/Netscape header files... @@ -535,5 +554,4 @@ endif # CONFIG_GUESS # Don't want to build the gameengine? ifeq ($(NAN_NO_KETSJI), true) export NAN_JUST_BLENDERDYNAMIC=true - export NAN_NO_OPENAL=true endif -- cgit v1.2.3