Changed to able compile libsamplerate properly
authorJoilnen Leite <joilnen.leite@gmail.com>
Fri, 14 Aug 2009 00:14:20 +0000 (00:14 +0000)
committerJoilnen Leite <joilnen.leite@gmail.com>
Fri, 14 Aug 2009 00:14:20 +0000 (00:14 +0000)
source/Makefile
source/nan_definitions.mk

index aa226d2766864e1862358b9dcf79bdedf3271a56..588ffe0bbb6b8746800f71f89787f680cdb7ecab 100644 (file)
@@ -109,7 +109,7 @@ 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 += $(LCGDIR)/samplerate/lib/libsamplerate.a
+COMLIB += $(NAN_SAMPLERATE)/lib/libsamplerate.a
 
 ifneq ($(NAN_NO_KETSJI),true)
     COMLIB += $(OCGDIR)/gameengine/bloutines/$(DEBUG_DIR)libbloutines.a
index 5c6f444ab0c6c0570744830b5436a9fe834d4c74..259796cf6fb8bc54c766c7406f1cd6eb138d3f8f 100644 (file)
@@ -191,6 +191,9 @@ ifndef CONFIG_GUESS
     # enable l10n
     export INTERNATIONAL ?= true
 
+    export NAN_SAMPLERATE ?= $(LCGDIR)/samplerate
+               export NAN_SAMPLERATE_LIBS ?= $(NAN_SAMPLERATE)/lib/libsamplerate.a 
+
   else
   ifeq ($(OS),freebsd)
 
@@ -309,6 +312,7 @@ ifndef CONFIG_GUESS
     export NAN_SDL ?= $(shell sdl-config --prefix)
     export NAN_SDLLIBS ?= $(shell sdl-config --libs)
     export NAN_SDLCFLAGS ?= $(shell sdl-config --cflags)
+    export NAN_SAMPLERATE ?= /usr
 
 ifneq ($(NAN_USE_FFMPEG_CONFIG), true)
     export NAN_FFMPEG ?= /usr