diff options
| author | Joilnen Leite <joilnen.leite@gmail.com> | 2009-08-14 04:14:20 +0400 |
|---|---|---|
| committer | Joilnen Leite <joilnen.leite@gmail.com> | 2009-08-14 04:14:20 +0400 |
| commit | f04da8e7f5d1c15a205a9e26afdb711dfc306c2a (patch) | |
| tree | cf6120cbc5f9b67c020bbaf61e0df768210f193e /source | |
| parent | ec00cec3e852991b429c70bd459502a0dd089881 (diff) | |
Changed to able compile libsamplerate properly
Diffstat (limited to 'source')
| -rw-r--r-- | source/Makefile | 2 | ||||
| -rw-r--r-- | source/nan_definitions.mk | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/source/Makefile b/source/Makefile index aa226d27668..588ffe0bbb6 100644 --- a/source/Makefile +++ b/source/Makefile @@ -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 diff --git a/source/nan_definitions.mk b/source/nan_definitions.mk index 5c6f444ab0c..259796cf6fb 100644 --- a/source/nan_definitions.mk +++ b/source/nan_definitions.mk @@ -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 |