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:
Diffstat (limited to 'source/nan_definitions.mk')
-rw-r--r--source/nan_definitions.mk8
1 files changed, 6 insertions, 2 deletions
diff --git a/source/nan_definitions.mk b/source/nan_definitions.mk
index 5c6f444ab0c..b3f36dd3b5c 100644
--- a/source/nan_definitions.mk
+++ b/source/nan_definitions.mk
@@ -131,7 +131,7 @@ ifndef CONFIG_GUESS
ifeq ($(NAN_PYTHON_VERSION),3.1)
export PY_FRAMEWORK ?= 0
- export NAN_PYTHON ?= $(LCGDIR)/python
+ export NAN_PYTHON ?= $(LCGDIR)/python
export NAN_PYTHON_LIB ?= $(NAN_PYTHON)/lib/python$(NAN_PYTHON_VERSION)/libpython$(NAN_PYTHON_VERSION).a
else
export PY_FRAMEWORK ?= 1
@@ -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
@@ -323,7 +327,7 @@ endif
endif
# Uncomment the following line to use Mozilla inplace of netscape
-
+
# Location of MOZILLA/Netscape header files...
export NAN_MOZILLA_INC ?= /usr/include/mozilla
export NAN_MOZILLA_LIB ?= $(LCGDIR)/mozilla/lib/