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:
authorStefan Gartner <stefang@aon.at>2010-05-22 01:58:37 +0400
committerStefan Gartner <stefang@aon.at>2010-05-22 01:58:37 +0400
commitdb6a7280ce2a5bc02fadbd4437632df0c248ca2b (patch)
tree299b98e82b6dda37fdbf1ae9539d949444cec760 /source/nan_definitions.mk
parentc0a0f2c43e934e2054eefe5bf90889cf67b736f9 (diff)
Makefiles: fix building on linux/ppc
Diffstat (limited to 'source/nan_definitions.mk')
-rw-r--r--source/nan_definitions.mk16
1 files changed, 10 insertions, 6 deletions
diff --git a/source/nan_definitions.mk b/source/nan_definitions.mk
index d10a2353a94..84ccc395753 100644
--- a/source/nan_definitions.mk
+++ b/source/nan_definitions.mk
@@ -133,13 +133,13 @@ ifndef CONFIG_GUESS
endif
ifeq ($(WITH_JACK), true)
- export NAN_JACK ?= /usr
+ export NAN_JACK ?= $(LCGDIR)/jack
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_SNDFILE ?= $(LCGDIR)/sndfile
export NAN_SNDFILECFLAGS ?= -I$(NAN_SNDFILE)/include
export NAN_SNDFILELIBS ?= $(NAN_SNDFILE)/lib/libsndfile.a $(NAN_SNDFILE)/lib/libFLAC.a $(NAN_SNDFILE)/lib/libogg.a
endif
@@ -158,9 +158,8 @@ ifndef CONFIG_GUESS
export BF_PCRE_LIBS ?= $(BF_PCRE)/lib/libpcre.a
endif
- export WITH_TIFF ?= true
-
-
+ export WITH_TIFF =? true
+
# Compare recreated .mo files with committed ones
export BF_VERIFY_MO_FILES ?= true
@@ -371,7 +370,7 @@ ifndef CONFIG_GUESS
# enable l10n
export INTERNATIONAL ?= true
- # Different endianess will make it fail, rely on other plataforms for checks
+ # Different endianess will make it fail, rely on other platforms for checks
export BF_VERIFY_MO_FILES = false
else
@@ -441,6 +440,11 @@ ifndef CONFIG_GUESS
export WITH_FFMPEG ?= true
endif
+ ifeq ($(CPU), powerpc)
+ # Different endianess will make it fail, rely on other platforms for checks
+ export BF_VERIFY_MO_FILES = false
+ endif
+
else
ifeq ($(OS),openbsd)