</if>
</set>
</if>
+
+ <set var="INC_TIFF_BUILD"></set>
+ <if cond="FORMAT=='autoconf'">
+ <set var="INC_TIFF_BUILD">
+ <if cond="wxUSE_LIBTIFF=='builtin'">$(wx_top_builddir)/src/tiff/libtiff</if>
+ </set>
+ </if>
<set var="INC_TIFF">
- <if cond="wxUSE_LIBTIFF=='builtin'">$(TOP_SRCDIR)src/tiff</if>
+ <if cond="wxUSE_LIBTIFF=='builtin'">$(TOP_SRCDIR)src/tiff/libtiff</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' and FORMAT!='watcom'">src/tiff/tif_unix.c</if>
- <if cond="PLATFORM_OS2=='1' and FORMAT=='watcom'">src/tiff/tif_os2.c</if>
- <if cond="PLATFORM_WIN32=='1'">src/tiff/tif_win32.c</if>
- <if cond="PLATFORM_MACOS=='1'">src/tiff/tif_apple.c</if>
- <if cond="PLATFORM_MSDOS=='1'">src/tiff/tif_msdos.c</if>
+ <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'">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"
<dirname>$(LIBDIRNAME)</dirname>
<include>$(INC_ZLIB)</include>
<include>$(INC_JPEG)</include>
+ <include>$(INC_TIFF_BUILD)</include>
+ <include>$(INC_TIFF)</include>
<cflags-borland>-w-8004 -w-8012 -w-8057 -w-8060 -w-8066</cflags-borland>
<cflags-dmars>-w2</cflags-dmars>
+ <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/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
- src/tiff/tif_dirread.c
- 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
- src/tiff/tif_jpeg.c
- src/tiff/tif_flush.c
- src/tiff/tif_lzw.c
- src/tiff/tif_luv.c
- src/tiff/tif_next.c
- src/tiff/tif_open.c
- src/tiff/tif_packbits.c
- src/tiff/tif_pixarlog.c
- src/tiff/tif_predict.c
- src/tiff/tif_print.c
- src/tiff/tif_read.c
- src/tiff/tif_swab.c
- src/tiff/tif_strip.c
- src/tiff/tif_thunder.c
- src/tiff/tif_tile.c
- src/tiff/tif_version.c
- src/tiff/tif_warning.c
- src/tiff/tif_write.c
- src/tiff/tif_zip.c
+ src/tiff/libtiff/tif_aux.c
+ src/tiff/libtiff/tif_close.c
+ src/tiff/libtiff/tif_codec.c
+ src/tiff/libtiff/tif_color.c
+ src/tiff/libtiff/tif_compress.c
+ src/tiff/libtiff/tif_dir.c
+ src/tiff/libtiff/tif_dirinfo.c
+ src/tiff/libtiff/tif_dirread.c
+ src/tiff/libtiff/tif_dirwrite.c
+ src/tiff/libtiff/tif_dumpmode.c
+ src/tiff/libtiff/tif_error.c
+ src/tiff/libtiff/tif_extension.c
+ src/tiff/libtiff/tif_fax3.c
+ src/tiff/libtiff/tif_fax3sm.c
+ src/tiff/libtiff/tif_flush.c
+ src/tiff/libtiff/tif_getimage.c
+ src/tiff/libtiff/tif_jpeg.c
+ src/tiff/libtiff/tif_luv.c
+ src/tiff/libtiff/tif_lzw.c
+ src/tiff/libtiff/tif_next.c
+ src/tiff/libtiff/tif_ojpeg.c
+ src/tiff/libtiff/tif_open.c
+ src/tiff/libtiff/tif_packbits.c
+ src/tiff/libtiff/tif_pixarlog.c
+ src/tiff/libtiff/tif_predict.c
+ src/tiff/libtiff/tif_print.c
+ src/tiff/libtiff/tif_read.c
+ src/tiff/libtiff/tif_strip.c
+ src/tiff/libtiff/tif_swab.c
+ src/tiff/libtiff/tif_thunder.c
+ src/tiff/libtiff/tif_tile.c
+ src/tiff/libtiff/tif_version.c
+ src/tiff/libtiff/tif_warning.c
+ src/tiff/libtiff/tif_write.c
+ src/tiff/libtiff/tif_zip.c
</sources>
</lib>