diff options
author | Stefan Gartner <stefang@aon.at> | 2010-05-22 01:06:00 +0400 |
---|---|---|
committer | Stefan Gartner <stefang@aon.at> | 2010-05-22 01:06:00 +0400 |
commit | bb852842283f4a42db0e3214a697b98e779d0a00 (patch) | |
tree | 38344ab2891cb36b62d6b36f82a00dfe7c731b7d /source | |
parent | 9f7c04944a6146c7ca2e8083595a6e9eb6fea47d (diff) |
Makefiles: statically link tiff libs when WITH_TIFF is set to true, which is the default for all platforms
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenkernel/intern/Makefile | 4 | ||||
-rw-r--r-- | source/blender/editors/space_file/Makefile | 4 | ||||
-rw-r--r-- | source/blender/editors/space_image/Makefile | 4 | ||||
-rw-r--r-- | source/blender/imbuf/intern/Makefile | 6 | ||||
-rw-r--r-- | source/blender/makesrna/intern/Makefile | 4 | ||||
-rw-r--r-- | source/nan_definitions.mk | 5 | ||||
-rw-r--r-- | source/nan_link.mk | 4 |
7 files changed, 30 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/Makefile b/source/blender/blenkernel/intern/Makefile index 4e365f363c3..ea06cb79781 100644 --- a/source/blender/blenkernel/intern/Makefile +++ b/source/blender/blenkernel/intern/Makefile @@ -132,6 +132,10 @@ ifeq ($(WITH_QUICKTIME), true) CPPFLAGS += -DWITH_QUICKTIME endif +ifeq ($(WITH_TIFF), true + CPPFLAGS += -DWITH_TIFF +endif + ifeq ($(OS), darwin) ifeq ($(WITH_BF_OPENMP), true) CPPFLAGS += -DPARALLEL=1 diff --git a/source/blender/editors/space_file/Makefile b/source/blender/editors/space_file/Makefile index 43b2f09ed2d..29548b51222 100644 --- a/source/blender/editors/space_file/Makefile +++ b/source/blender/editors/space_file/Makefile @@ -63,3 +63,7 @@ ifeq ($(WITH_OPENEXR), true) CPPFLAGS += -DWITH_OPENEXR endif +ifeq ($(WITH_TIFF), true) + CPPFLAGS += -DWITH_TIFF +endif + diff --git a/source/blender/editors/space_image/Makefile b/source/blender/editors/space_image/Makefile index af15b1d9724..4f532166bc7 100644 --- a/source/blender/editors/space_image/Makefile +++ b/source/blender/editors/space_image/Makefile @@ -57,3 +57,7 @@ ifeq ($(WITH_OPENEXR), true) CPPFLAGS += -DWITH_OPENEXR endif +ifeq ($(WHITH_TIFF), true) + CPPFLAGS += -DWITH_TIFF +endif + 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 diff --git a/source/blender/makesrna/intern/Makefile b/source/blender/makesrna/intern/Makefile index c26593100f8..8aef06e762d 100644 --- a/source/blender/makesrna/intern/Makefile +++ b/source/blender/makesrna/intern/Makefile @@ -92,6 +92,10 @@ ifeq ($(WITH_OPENAL),true) CPPFLAGS += -DWITH_OPENAL endif +ifeq ($(WITH_TIFF),true) + CPPFLAGS += -DWITH_TIFF +endif + ifeq ($(OS),windows) # Windows needs these extra libs because of winstuff... It is not # _really_ needed, but it is the easiest fix for now. If you have 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? diff --git a/source/nan_link.mk b/source/nan_link.mk index b88e835c54a..5337e75c6c1 100644 --- a/source/nan_link.mk +++ b/source/nan_link.mk @@ -191,4 +191,8 @@ ifeq ($(WITH_OPENCOLLADA),true) LLIBS += $(BF_OPENCOLLADA_LIBS) endif +ifeq ($(WITH_TIFF),true) + LLIBS += $(NAN_TIFF_LIBS) +endif + LLIBS += $(NAN_PYTHON_LIB) |