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:06:00 +0400
committerStefan Gartner <stefang@aon.at>2010-05-22 01:06:00 +0400
commitbb852842283f4a42db0e3214a697b98e779d0a00 (patch)
tree38344ab2891cb36b62d6b36f82a00dfe7c731b7d /source/nan_definitions.mk
parent9f7c04944a6146c7ca2e8083595a6e9eb6fea47d (diff)
Makefiles: statically link tiff libs when WITH_TIFF is set to true, which is the default for all platforms
Diffstat (limited to 'source/nan_definitions.mk')
-rw-r--r--source/nan_definitions.mk5
1 files changed, 5 insertions, 0 deletions
diff --git a/source/nan_definitions.mk b/source/nan_definitions.mk
index 5bd3c7aaafa..d10a2353a94 100644
--- a/source/nan_definitions.mk
+++ b/source/nan_definitions.mk
@@ -158,6 +158,8 @@ ifndef CONFIG_GUESS
export BF_PCRE_LIBS ?= $(BF_PCRE)/lib/libpcre.a
endif
+ export WITH_TIFF ?= true
+
# Compare recreated .mo files with committed ones
export BF_VERIFY_MO_FILES ?= true
@@ -618,6 +620,9 @@ ifndef CONFIG_GUESS
endif # freebsd
endif # darwin
+ # default tiff libs
+ export NAN_TIFF_LIBS ?= $(NAN_TIFF)/lib/libtiff.a
+
endif # CONFIG_GUESS
# Don't want to build the gameengine?