New SWIG runtime files and api updates for the move to SWIG 1.3.22

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

diff --git a/build/bakefiles/tiff.bkl b/build/bakefiles/tiff.bkl
index a7edeedb1b1c6600658b59136c02a1d78c9ee075..189ae5dcdc520a1f73e6dfd52510884c764b1d4c 100644 (file)
--- a/build/bakefiles/tiff.bkl
+++ b/build/bakefiles/tiff.bkl
@@ -5,7 +5,11 @@
         <option name="wxUSE_LIBTIFF"/>
     </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>
     </if>
     <set var="LIB_TIFF">
         <if cond="wxUSE_LIBTIFF=='builtin' and USE_GUI=='1'">
@@ -26,7 +30,10 @@
     <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