X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/12f003edba4cabbc7685b0848317d4e4338a8f5c..be7c2a2033f57f92c23f0db8220cb53ad47eabde:/build/bakefiles/tiff.bkl?ds=inline

diff --git a/build/bakefiles/tiff.bkl b/build/bakefiles/tiff.bkl
index 189ae5dcdc..f2198e2f5f 100644
--- a/build/bakefiles/tiff.bkl
+++ b/build/bakefiles/tiff.bkl
@@ -3,6 +3,11 @@
 
     <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">
@@ -10,12 +15,12 @@
             <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' 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>
@@ -25,6 +30,7 @@
         <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"
@@ -39,6 +45,7 @@
 		    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