Allow building wxGTK under Windows with MSVC.

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

diff --git a/build/bakefiles/tiff.bkl b/build/bakefiles/tiff.bkl
index 8b7356a8aadeaebfac4d3aafb5496beefc95bead..0364c70a095e3f014cc5088416f324a602ac75d6 100644 (file)
--- a/build/bakefiles/tiff.bkl
+++ b/build/bakefiles/tiff.bkl
@@ -37,11 +37,8 @@
     <set var="TIFF_PLATFORM_SRC">
         <if cond="PLATFORM_UNIX=='1'">src/tiff/libtiff/tif_unix.c</if>
         <if cond="PLATFORM_MACOSX=='1'">src/tiff/libtiff/tif_unix.c</if>
-        <if cond="PLATFORM_OS2=='1' and FORMAT!='watcom'">src/tiff/libtiff/tif_unix.c</if>
-        <if cond="PLATFORM_OS2=='1' and FORMAT=='watcom'">src/tiff/libtiff/tif_os2.c</if>
+        <if cond="PLATFORM_OS2=='1'">src/tiff/libtiff/tif_unix.c</if>
         <if cond="PLATFORM_WIN32=='1'">src/tiff/libtiff/tif_win32.c</if>
-        <if cond="PLATFORM_MACOS=='1'">src/tiff/libtiff/tif_apple.c</if>
-        <if cond="PLATFORM_MSDOS=='1'">src/tiff/libtiff/tif_msdos.c</if>
     </set>
 
     <lib id="wxtiff" template="3rdparty_lib"
@@ -56,6 +53,16 @@
         <cflags-watcom>-wcd=124</cflags-watcom>
         <define cond="PLATFORM_OS2=='1' and FORMAT=='watcom'">OS2_32</define>
         <define cond="PLATFORM_MSDOS=='1' and FORMAT=='watcom'">__MSDOS__</define>
+        <if cond="IS_MSVC">
+            <!--
+                define this to get rid of a warning about using POSIX lfind():
+                confusingly enough, we do define lfind as _lfind for MSVC but
+                doing this results in a just more confusing warning, see:
+                http://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?FeedbackID=101278
+             -->
+            <define>_CRT_NONSTDC_NO_WARNINGS</define>
+        </if>
+
         <sources>
             $(TIFF_PLATFORM_SRC)
             src/tiff/libtiff/tif_aux.c
@@ -74,8 +81,11 @@
             src/tiff/libtiff/tif_fax3sm.c
             src/tiff/libtiff/tif_flush.c
             src/tiff/libtiff/tif_getimage.c
+            src/tiff/libtiff/tif_jbig.c
             src/tiff/libtiff/tif_jpeg.c
+            src/tiff/libtiff/tif_jpeg_12.c
             src/tiff/libtiff/tif_luv.c
+            src/tiff/libtiff/tif_lzma.c
             src/tiff/libtiff/tif_lzw.c
             src/tiff/libtiff/tif_next.c
             src/tiff/libtiff/tif_ojpeg.c