[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28909] trunk/blender/source: Makefiles: statically link tiff libs when WITH_TIFF is set to true, which is the default for all platforms

[Stefan Gartner]

Revision: 28909
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28909
Author:   sgefant
Date:     2010-05-21 23:06:00 +0200 (Fri, 21 May 2010)

Log Message:
-----------
Makefiles: statically link tiff libs when WITH_TIFF is set to true, which is the default for all platforms

Modified Paths:
--------------
    trunk/blender/source/blender/imbuf/intern/Makefile
    trunk/blender/source/nan_definitions.mk
    trunk/blender/source/nan_link.mk

Modified: trunk/blender/source/blender/imbuf/intern/Makefile
===================================================================
--- trunk/blender/source/blender/imbuf/intern/Makefile	2010-05-21 17:03:43 UTC (rev 28908)
+++ trunk/blender/source/blender/imbuf/intern/Makefile	2010-05-21 21:06:00 UTC (rev 28909)
@@ -61,7 +61,6 @@
 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 @@
    CPPFLAGS += -DWITH_FFMPEG
    CPPFLAGS += $(NAN_FFMPEGCFLAGS)
 endif
+
+ifeq ($(WITH_TIFF), true)
+   CPPFLAGS += -DWITH_TIFF
+   CPPFLAGS += -I$(NAN_TIFF)/include
+endif

Modified: trunk/blender/source/nan_definitions.mk
===================================================================
--- trunk/blender/source/nan_definitions.mk	2010-05-21 17:03:43 UTC (rev 28908)
+++ trunk/blender/source/nan_definitions.mk	2010-05-21 21:06:00 UTC (rev 28909)
@@ -158,7 +158,9 @@
     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 @@
   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?

Modified: trunk/blender/source/nan_link.mk
===================================================================
--- trunk/blender/source/nan_link.mk	2010-05-21 17:03:43 UTC (rev 28908)
+++ trunk/blender/source/nan_link.mk	2010-05-21 21:06:00 UTC (rev 28909)
@@ -191,4 +191,8 @@
     LLIBS += $(BF_OPENCOLLADA_LIBS)
 endif
 
+ifeq ($(WITH_TIFF),true)
+   LLIBS += $(NAN_TIFF_LIBS)
+endif
+
 LLIBS += $(NAN_PYTHON_LIB)