Fix two common case of hybrid build:

[wxWidgets.git] / build / bakefiles / tiff.bkl

diff --git a/build/bakefiles/tiff.bkl b/build/bakefiles/tiff.bkl
index 815b2b8edc4430599a2f5cced7662c4a2e38a31c..540313aa4c72e5357be13020b571f33d94e312eb 100644 (file)
--- a/build/bakefiles/tiff.bkl
+++ b/build/bakefiles/tiff.bkl
@@ -8,12 +8,26 @@
         <set var="wxUSE_LIBTIFF">builtin</set>
     </if>
     <set var="LIB_TIFF">
-        <if cond="wxUSE_LIBTIFF=='builtin'">wxtiff</if>
+        <if cond="wxUSE_LIBTIFF=='builtin' and USE_GUI=='1'">
+            wxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX)
+        </if>
+    </set>
+    <set var="INC_TIFF">
+        <if cond="wxUSE_LIBTIFF=='builtin'">$(TOP_SRCDIR)src/tiff</if>
     </set>
 
-    <lib id="wxtiff" cond="wxUSE_LIBTIFF=='builtin' and BUILDING_LIB=='1'">
+    <set var="TIFF_PLATFORM_SRC">
+        <if cond="PLATFORM_UNIX=='1'">src/tiff/tif_unix.c</if>
+        <if cond="PLATFORM_MACOSX=='1'">src/tiff/tif_unix.c</if>
+        <if cond="PLATFORM_WIN32=='1'">src/tiff/tif_win32.c</if>
+    </set>
+    
+    <lib id="wxtiff" template="3rdparty_lib"
+         cond="wxUSE_LIBTIFF=='builtin' and USE_GUI=='1' and BUILDING_LIB=='1'">
         <dirname>$(LIBDIRNAME)</dirname>
+        <cflags-borland>-w-8004 -w-8012 -w-8057 -w-8060 -w-8066</cflags-borland>
         <sources>
+            $(TIFF_PLATFORM_SRC)
                    src/tiff/tif_aux.c
                    src/tiff/tif_close.c
                    src/tiff/tif_codec.c
@@ -42,7 +56,6 @@
                    src/tiff/tif_strip.c
                    src/tiff/tif_thunder.c
                    src/tiff/tif_tile.c
-                   src/tiff/tif_unix.c
                    src/tiff/tif_version.c
                    src/tiff/tif_warning.c
                    src/tiff/tif_write.c