changed to behave in same way as native win32 control and generic wxListCtrl when...

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

diff --git a/build/bakefiles/tiff.bkl b/build/bakefiles/tiff.bkl
index 0ca1fde0ba3d5a81a623e4404d05d1a6d163122f..189ae5dcdc520a1f73e6dfd52510884c764b1d4c 100644 (file)
--- a/build/bakefiles/tiff.bkl
+++ b/build/bakefiles/tiff.bkl
@@ -5,24 +5,35 @@
         <option name="wxUSE_LIBTIFF"/>
     </if>
     <if cond="FORMAT!='autoconf'">
         <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>
     <set var="LIB_TIFF">

-        <if cond="wxUSE_LIBTIFF=='builtin'">wxtiff$(WXDEBUGFLAG)</if>
+        <if cond="wxUSE_LIBTIFF=='builtin' and USE_GUI=='1'">
+            wxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX)
+        </if>

     </set>
     <set var="INC_TIFF">
     </set>
     <set var="INC_TIFF">

-        <if cond="wxUSE_LIBTIFF=='builtin'">$(SRCDIR)/src/tiff</if>
+        <if cond="wxUSE_LIBTIFF=='builtin'">$(TOP_SRCDIR)src/tiff</if>

     </set>
 
     <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>
     </set>
 
     <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>
     </set>
     
     <lib id="wxtiff" template="3rdparty_lib"
         <if cond="PLATFORM_WIN32=='1'">src/tiff/tif_win32.c</if>
     </set>
     
     <lib id="wxtiff" template="3rdparty_lib"

-         cond="wxUSE_LIBTIFF=='builtin' and BUILDING_LIB=='1'">
+         cond="wxUSE_LIBTIFF=='builtin' and USE_GUI=='1' and BUILDING_LIB=='1'">

         <dirname>$(LIBDIRNAME)</dirname>
         <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
         <sources>
             $(TIFF_PLATFORM_SRC)
                    src/tiff/tif_aux.c