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/blender/imbuf
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/blender/imbuf')
-rw-r--r--source/blender/imbuf/intern/Makefile6
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/imbuf/intern/Makefile b/source/blender/imbuf/intern/Makefile
index 0f2020c799a..5f8029ddf72 100644
--- a/source/blender/imbuf/intern/Makefile
+++ b/source/blender/imbuf/intern/Makefile
@@ -61,7 +61,6 @@ CFLAGS += $(LEVEL_1_C_WARNINGS)
CPPFLAGS += -I$(NAN_JPEG)/include
CPPFLAGS += -I$(NAN_PNG)/include
CPPFLAGS += -I$(NAN_ZLIB)/include
-CPPFLAGS += -I$(NAN_TIFF)/include
CPPFLAGS += -I../../include
CPPFLAGS += -I../../blenkernel
CPPFLAGS += -I../../blenlib
@@ -85,3 +84,8 @@ ifeq ($(WITH_FFMPEG), true)
CPPFLAGS += -DWITH_FFMPEG
CPPFLAGS += $(NAN_FFMPEGCFLAGS)
endif
+
+ifeq ($(WITH_TIFF), true)
+ CPPFLAGS += -DWITH_TIFF
+ CPPFLAGS += -I$(NAN_TIFF)/include
+endif