X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ddf9896893fd4908556916fcb05fecca440cdfb5..c0b49f7fffbd1cecb9c67b578db62d84bd8c8ff8:/build/bakefiles/tiff.bkl

diff --git a/build/bakefiles/tiff.bkl b/build/bakefiles/tiff.bkl
index 815b2b8edc..311a3878a1 100644
--- a/build/bakefiles/tiff.bkl
+++ b/build/bakefiles/tiff.bkl
@@ -3,20 +3,49 @@
 
     <if cond="FORMAT=='autoconf'">
         <option name="wxUSE_LIBTIFF"/>
+        <set var="LIB_TIFF">
+            <if cond="wxUSE_LIBTIFF=='builtin' and USE_GUI=='1'">
+                wxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+            </if>
+        </set>
     </if>
     <if cond="FORMAT!='autoconf'">
-        <set var="wxUSE_LIBTIFF">builtin</set>
+        <set var="wxUSE_LIBTIFF">
+            <!-- NB: libtiff doesn't compile on WinCE -->
+            <if cond="FORMAT=='msevc4prj'">no</if>
+            <if cond="FORMAT!='msevc4prj'">builtin</if>
+        </set>
+        <set var="LIB_TIFF">
+            <if cond="wxUSE_LIBTIFF=='builtin' and USE_GUI=='1'">
+                wxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX)
+            </if>
+        </set>
     </if>
-    <set var="LIB_TIFF">
-        <if cond="wxUSE_LIBTIFF=='builtin'">wxtiff</if>
+    <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_OS2=='1'">src/tiff/tif_unix.c</if>
+        <if cond="PLATFORM_WIN32=='1'">src/tiff/tif_win32.c</if>
+        <if cond="PLATFORM_MACOS=='1'">src/tiff/tif_apple.c</if>
+    </set>
+
+    <lib id="wxtiff" template="3rdparty_lib"
+         cond="wxUSE_LIBTIFF=='builtin' and USE_GUI=='1' and BUILDING_LIB=='1'">
         <dirname>$(LIBDIRNAME)</dirname>
+        <include>$(INC_ZLIB)</include>
+        <include>$(INC_JPEG)</include>
+        <cflags-borland>-w-8004 -w-8012 -w-8057 -w-8060 -w-8066</cflags-borland>
+        <cflags-dmars>-w2</cflags-dmars>
         <sources>
+            $(TIFF_PLATFORM_SRC)
 		    src/tiff/tif_aux.c
 		    src/tiff/tif_close.c
 		    src/tiff/tif_codec.c
+		    src/tiff/tif_color.c
 		    src/tiff/tif_compress.c
 		    src/tiff/tif_dir.c
 		    src/tiff/tif_dirinfo.c
@@ -24,6 +53,7 @@
 		    src/tiff/tif_dirwrite.c
 		    src/tiff/tif_dumpmode.c
 		    src/tiff/tif_error.c
+		    src/tiff/tif_extension.c
 		    src/tiff/tif_fax3.c
 		    src/tiff/tif_fax3sm.c
 		    src/tiff/tif_getimage.c
@@ -42,7 +72,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