Bakefile updates for libtiff 4.0.3 merge.

This should have been part of r73157,

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73158 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/Makefile.in b/Makefile.in
index 74a3cf0f70ffc519e7996dfdfc02d6c7f96b6ffa..85917f0d8a2407dfb6a8d6b5ab840f5567b93546 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -185,8 +185,11 @@ WXTIFF_OBJECTS =  \
        wxtiff_tif_fax3sm.o \
        wxtiff_tif_flush.o \
        wxtiff_tif_getimage.o \
+       wxtiff_tif_jbig.o \
        wxtiff_tif_jpeg.o \
+       wxtiff_tif_jpeg_12.o \
        wxtiff_tif_luv.o \
+       wxtiff_tif_lzma.o \
        wxtiff_tif_lzw.o \
        wxtiff_tif_next.o \
        wxtiff_tif_ojpeg.o \
@@ -2127,12 +2130,10 @@ COND_USE_GUI_1_wxUSE_LIBTIFF_builtin___wxtiff___depname = \
 @COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin@        = install_wxtiff
 @COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin@__uninstall_wxtiff___depname \
 @COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin@        = uninstall_wxtiff
-@COND_PLATFORM_UNIX_1@__TIFF_PLATFORM_SRC_OBJECTS = wxtiff_tif_unix.o
 @COND_PLATFORM_MACOSX_1@__TIFF_PLATFORM_SRC_OBJECTS = wxtiff_tif_unix.o
 @COND_PLATFORM_OS2_1@__TIFF_PLATFORM_SRC_OBJECTS = wxtiff_tif_unix.o
+@COND_PLATFORM_UNIX_1@__TIFF_PLATFORM_SRC_OBJECTS = wxtiff_tif_unix.o
 @COND_PLATFORM_WIN32_1@__TIFF_PLATFORM_SRC_OBJECTS = wxtiff_tif_win32.o
-@COND_PLATFORM_MACOS_1@__TIFF_PLATFORM_SRC_OBJECTS = wxtiff_tif_apple.o
-@COND_PLATFORM_MSDOS_1@__TIFF_PLATFORM_SRC_OBJECTS = wxtiff_tif_msdos.o
 COND_wxUSE_EXPAT_builtin___wxexpat___depname = \
        $(LIBDIRNAME)/$(LIBPREFIX)wxexpat$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
 @COND_wxUSE_EXPAT_builtin@__wxexpat___depname = $(COND_wxUSE_EXPAT_builtin___wxexpat___depname)
@@ -16228,12 +16229,6 @@ wxjpeg_jdmerge.o: $(srcdir)/src/jpeg/jdmerge.c
 wxtiff_tif_win32.o: $(srcdir)/src/tiff/libtiff/tif_win32.c
        $(CCC) -c -o $@ $(WXTIFF_CFLAGS) $(srcdir)/src/tiff/libtiff/tif_win32.c
 
-wxtiff_tif_apple.o: $(srcdir)/src/tiff/libtiff/tif_apple.c
-       $(CCC) -c -o $@ $(WXTIFF_CFLAGS) $(srcdir)/src/tiff/libtiff/tif_apple.c
-
-wxtiff_tif_msdos.o: $(srcdir)/src/tiff/libtiff/tif_msdos.c
-       $(CCC) -c -o $@ $(WXTIFF_CFLAGS) $(srcdir)/src/tiff/libtiff/tif_msdos.c
-
 wxtiff_tif_aux.o: $(srcdir)/src/tiff/libtiff/tif_aux.c
        $(CCC) -c -o $@ $(WXTIFF_CFLAGS) $(srcdir)/src/tiff/libtiff/tif_aux.c
 
@@ -16282,12 +16277,21 @@ wxtiff_tif_flush.o: $(srcdir)/src/tiff/libtiff/tif_flush.c
 wxtiff_tif_getimage.o: $(srcdir)/src/tiff/libtiff/tif_getimage.c
        $(CCC) -c -o $@ $(WXTIFF_CFLAGS) $(srcdir)/src/tiff/libtiff/tif_getimage.c
 
+wxtiff_tif_jbig.o: $(srcdir)/src/tiff/libtiff/tif_jbig.c
+       $(CCC) -c -o $@ $(WXTIFF_CFLAGS) $(srcdir)/src/tiff/libtiff/tif_jbig.c
+
 wxtiff_tif_jpeg.o: $(srcdir)/src/tiff/libtiff/tif_jpeg.c
        $(CCC) -c -o $@ $(WXTIFF_CFLAGS) $(srcdir)/src/tiff/libtiff/tif_jpeg.c
 
+wxtiff_tif_jpeg_12.o: $(srcdir)/src/tiff/libtiff/tif_jpeg_12.c
+       $(CCC) -c -o $@ $(WXTIFF_CFLAGS) $(srcdir)/src/tiff/libtiff/tif_jpeg_12.c
+
 wxtiff_tif_luv.o: $(srcdir)/src/tiff/libtiff/tif_luv.c
        $(CCC) -c -o $@ $(WXTIFF_CFLAGS) $(srcdir)/src/tiff/libtiff/tif_luv.c
 
+wxtiff_tif_lzma.o: $(srcdir)/src/tiff/libtiff/tif_lzma.c
+       $(CCC) -c -o $@ $(WXTIFF_CFLAGS) $(srcdir)/src/tiff/libtiff/tif_lzma.c
+
 wxtiff_tif_lzw.o: $(srcdir)/src/tiff/libtiff/tif_lzw.c
        $(CCC) -c -o $@ $(WXTIFF_CFLAGS) $(srcdir)/src/tiff/libtiff/tif_lzw.c
 

diff --git a/autoconf_inc.m4 b/autoconf_inc.m4
index b50da682cb1927aa6a31664c1b9eb7b5df97a8d2..4c93c9405c519dc5e2a1155f3f2daaf1207cf533 100644 (file)
--- a/autoconf_inc.m4
+++ b/autoconf_inc.m4
@@ -524,7 +524,7 @@ dnl ### begin block 20_COND_PLATFORM_MACOSX_1_USE_SOVERSION_1[wx.bkl] ###
         COND_PLATFORM_MACOSX_1_USE_SOVERSION_1=""
     fi
     AC_SUBST(COND_PLATFORM_MACOSX_1_USE_SOVERSION_1)
-dnl ### begin block 20_COND_PLATFORM_MACOS_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_PLATFORM_MACOS_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl] ###
     COND_PLATFORM_MACOS_1="#"
     if test "x$PLATFORM_MACOS" = "x1" ; then
         COND_PLATFORM_MACOS_1=""

diff --git a/build/bakefiles/tiff.bkl b/build/bakefiles/tiff.bkl
index 2deb872b7dba2f875c0bcebf7fa96b2690af7b72..0364c70a095e3f014cc5088416f324a602ac75d6 100644 (file)
--- a/build/bakefiles/tiff.bkl
+++ b/build/bakefiles/tiff.bkl
@@ -39,8 +39,6 @@
         <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"
@@ -83,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

diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc
index 955db8f54329002d4220364e7bb2982f0e869292..8a31f7af506766fde628b2ad471e1fe4e696baa7 100644 (file)
--- a/build/msw/makefile.bcc
+++ b/build/msw/makefile.bcc
@@ -163,8 +163,11 @@ WXTIFF_OBJECTS =  \
        $(OBJS)\wxtiff_tif_fax3sm.obj \\r
        $(OBJS)\wxtiff_tif_flush.obj \\r
        $(OBJS)\wxtiff_tif_getimage.obj \\r
+       $(OBJS)\wxtiff_tif_jbig.obj \
        $(OBJS)\wxtiff_tif_jpeg.obj \\r
+       $(OBJS)\wxtiff_tif_jpeg_12.obj \
        $(OBJS)\wxtiff_tif_luv.obj \\r
+       $(OBJS)\wxtiff_tif_lzma.obj \
        $(OBJS)\wxtiff_tif_lzw.obj \\r
        $(OBJS)\wxtiff_tif_next.obj \\r
        $(OBJS)\wxtiff_tif_ojpeg.obj \\r
@@ -5770,12 +5773,21 @@ $(OBJS)\wxtiff_tif_flush.obj: ..\..\src\tiff\libtiff\tif_flush.c
 $(OBJS)\wxtiff_tif_getimage.obj: ..\..\src\tiff\libtiff\tif_getimage.c\r
        $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_getimage.c\r
 \r
+$(OBJS)\wxtiff_tif_jbig.obj: ..\..\src\tiff\libtiff\tif_jbig.c
+       $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_jbig.c
+
 $(OBJS)\wxtiff_tif_jpeg.obj: ..\..\src\tiff\libtiff\tif_jpeg.c\r
        $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_jpeg.c\r
 \r
+$(OBJS)\wxtiff_tif_jpeg_12.obj: ..\..\src\tiff\libtiff\tif_jpeg_12.c
+       $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_jpeg_12.c
+
 $(OBJS)\wxtiff_tif_luv.obj: ..\..\src\tiff\libtiff\tif_luv.c\r
        $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_luv.c\r
 \r
+$(OBJS)\wxtiff_tif_lzma.obj: ..\..\src\tiff\libtiff\tif_lzma.c
+       $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_lzma.c
+
 $(OBJS)\wxtiff_tif_lzw.obj: ..\..\src\tiff\libtiff\tif_lzw.c\r
        $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_lzw.c\r
 \r

diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc
index dc39c1f4d6d71a01819fa2d2aa32df89abd94f5f..4049d9a2d85e27050eb9d265246a047920ca86b6 100644 (file)
--- a/build/msw/makefile.gcc
+++ b/build/msw/makefile.gcc
@@ -150,8 +150,11 @@ WXTIFF_OBJECTS =  \
        $(OBJS)\wxtiff_tif_fax3sm.o \\r
        $(OBJS)\wxtiff_tif_flush.o \\r
        $(OBJS)\wxtiff_tif_getimage.o \\r
+       $(OBJS)\wxtiff_tif_jbig.o \
        $(OBJS)\wxtiff_tif_jpeg.o \\r
+       $(OBJS)\wxtiff_tif_jpeg_12.o \
        $(OBJS)\wxtiff_tif_luv.o \\r
+       $(OBJS)\wxtiff_tif_lzma.o \
        $(OBJS)\wxtiff_tif_lzw.o \\r
        $(OBJS)\wxtiff_tif_next.o \\r
        $(OBJS)\wxtiff_tif_ojpeg.o \\r
@@ -5939,12 +5942,21 @@ $(OBJS)\wxtiff_tif_flush.o: ../../src/tiff/libtiff/tif_flush.c
 $(OBJS)\wxtiff_tif_getimage.o: ../../src/tiff/libtiff/tif_getimage.c\r
        $(CC) -c -o $@ $(WXTIFF_CFLAGS) $(CPPDEPS) $<\r
 \r
+$(OBJS)\wxtiff_tif_jbig.o: ../../src/tiff/libtiff/tif_jbig.c
+       $(CC) -c -o $@ $(WXTIFF_CFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\wxtiff_tif_jpeg.o: ../../src/tiff/libtiff/tif_jpeg.c\r
        $(CC) -c -o $@ $(WXTIFF_CFLAGS) $(CPPDEPS) $<\r
 \r
+$(OBJS)\wxtiff_tif_jpeg_12.o: ../../src/tiff/libtiff/tif_jpeg_12.c
+       $(CC) -c -o $@ $(WXTIFF_CFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\wxtiff_tif_luv.o: ../../src/tiff/libtiff/tif_luv.c\r
        $(CC) -c -o $@ $(WXTIFF_CFLAGS) $(CPPDEPS) $<\r
 \r
+$(OBJS)\wxtiff_tif_lzma.o: ../../src/tiff/libtiff/tif_lzma.c
+       $(CC) -c -o $@ $(WXTIFF_CFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\wxtiff_tif_lzw.o: ../../src/tiff/libtiff/tif_lzw.c\r
        $(CC) -c -o $@ $(WXTIFF_CFLAGS) $(CPPDEPS) $<\r
 \r

diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc
index 6aa31ce7a692c06977f4f28955b81bd52df4d81e..546cd023540f2ede194d0e76692b6a8d35b42c34 100644 (file)
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -167,8 +167,11 @@ WXTIFF_OBJECTS =  \
        $(OBJS)\wxtiff_tif_fax3sm.obj \\r
        $(OBJS)\wxtiff_tif_flush.obj \\r
        $(OBJS)\wxtiff_tif_getimage.obj \\r
+       $(OBJS)\wxtiff_tif_jbig.obj \
        $(OBJS)\wxtiff_tif_jpeg.obj \\r
+       $(OBJS)\wxtiff_tif_jpeg_12.obj \
        $(OBJS)\wxtiff_tif_luv.obj \\r
+       $(OBJS)\wxtiff_tif_lzma.obj \
        $(OBJS)\wxtiff_tif_lzw.obj \\r
        $(OBJS)\wxtiff_tif_next.obj \\r
        $(OBJS)\wxtiff_tif_ojpeg.obj \\r
@@ -6454,12 +6457,21 @@ $(OBJS)\wxtiff_tif_flush.obj: ..\..\src\tiff\libtiff\tif_flush.c
 $(OBJS)\wxtiff_tif_getimage.obj: ..\..\src\tiff\libtiff\tif_getimage.c\r
        $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_getimage.c\r
 \r
+$(OBJS)\wxtiff_tif_jbig.obj: ..\..\src\tiff\libtiff\tif_jbig.c
+       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_jbig.c
+
 $(OBJS)\wxtiff_tif_jpeg.obj: ..\..\src\tiff\libtiff\tif_jpeg.c\r
        $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_jpeg.c\r
 \r
+$(OBJS)\wxtiff_tif_jpeg_12.obj: ..\..\src\tiff\libtiff\tif_jpeg_12.c
+       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_jpeg_12.c
+
 $(OBJS)\wxtiff_tif_luv.obj: ..\..\src\tiff\libtiff\tif_luv.c\r
        $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_luv.c\r
 \r
+$(OBJS)\wxtiff_tif_lzma.obj: ..\..\src\tiff\libtiff\tif_lzma.c
+       $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_lzma.c
+
 $(OBJS)\wxtiff_tif_lzw.obj: ..\..\src\tiff\libtiff\tif_lzw.c\r
        $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_lzw.c\r
 \r

diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat
index 1563ffff10983490c67b021176fa850884364caf..ec1ad50071dd9914f1886023e7f1ff8c8a7ec061 100644 (file)
--- a/build/msw/makefile.wat
+++ b/build/msw/makefile.wat
@@ -3755,8 +3755,11 @@ WXTIFF_OBJECTS =  &
        $(OBJS)\wxtiff_tif_fax3sm.obj &\r
        $(OBJS)\wxtiff_tif_flush.obj &\r
        $(OBJS)\wxtiff_tif_getimage.obj &\r
+       $(OBJS)\wxtiff_tif_jbig.obj &
        $(OBJS)\wxtiff_tif_jpeg.obj &\r
+       $(OBJS)\wxtiff_tif_jpeg_12.obj &
        $(OBJS)\wxtiff_tif_luv.obj &\r
+       $(OBJS)\wxtiff_tif_lzma.obj &
        $(OBJS)\wxtiff_tif_lzw.obj &\r
        $(OBJS)\wxtiff_tif_next.obj &\r
        $(OBJS)\wxtiff_tif_ojpeg.obj &\r
@@ -6212,12 +6215,21 @@ $(OBJS)\wxtiff_tif_flush.obj :  .AUTODEPEND ..\..\src\tiff\libtiff\tif_flush.c
 $(OBJS)\wxtiff_tif_getimage.obj :  .AUTODEPEND ..\..\src\tiff\libtiff\tif_getimage.c\r
        $(CC) -bt=nt -zq -fo=$^@ $(WXTIFF_CFLAGS) $<\r
 \r
+$(OBJS)\wxtiff_tif_jbig.obj :  .AUTODEPEND ..\..\src\tiff\libtiff\tif_jbig.c
+       $(CC) -bt=nt -zq -fo=$^@ $(WXTIFF_CFLAGS) $<
+
 $(OBJS)\wxtiff_tif_jpeg.obj :  .AUTODEPEND ..\..\src\tiff\libtiff\tif_jpeg.c\r
        $(CC) -bt=nt -zq -fo=$^@ $(WXTIFF_CFLAGS) $<\r
 \r
+$(OBJS)\wxtiff_tif_jpeg_12.obj :  .AUTODEPEND ..\..\src\tiff\libtiff\tif_jpeg_12.c
+       $(CC) -bt=nt -zq -fo=$^@ $(WXTIFF_CFLAGS) $<
+
 $(OBJS)\wxtiff_tif_luv.obj :  .AUTODEPEND ..\..\src\tiff\libtiff\tif_luv.c\r
        $(CC) -bt=nt -zq -fo=$^@ $(WXTIFF_CFLAGS) $<\r
 \r
+$(OBJS)\wxtiff_tif_lzma.obj :  .AUTODEPEND ..\..\src\tiff\libtiff\tif_lzma.c
+       $(CC) -bt=nt -zq -fo=$^@ $(WXTIFF_CFLAGS) $<
+
 $(OBJS)\wxtiff_tif_lzw.obj :  .AUTODEPEND ..\..\src\tiff\libtiff\tif_lzw.c\r
        $(CC) -bt=nt -zq -fo=$^@ $(WXTIFF_CFLAGS) $<\r
 \r

diff --git a/build/msw/wx_vc7_wxtiff.vcproj b/build/msw/wx_vc7_wxtiff.vcproj
index 676255c81a0d8be32a6f416fd751ab1475b75512..6845a90b46ae38853d4a981cfac26e041df6adea 100644 (file)
--- a/build/msw/wx_vc7_wxtiff.vcproj
+++ b/build/msw/wx_vc7_wxtiff.vcproj
@@ -509,12 +509,21 @@
                        <File\r
                                RelativePath="..\..\src\tiff\libtiff\tif_getimage.c">\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\src\tiff\libtiff\tif_jbig.c">\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\tiff\libtiff\tif_jpeg.c">\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\src\tiff\libtiff\tif_jpeg_12.c">\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\tiff\libtiff\tif_luv.c">\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\src\tiff\libtiff\tif_lzma.c">\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\tiff\libtiff\tif_lzw.c">\r
                        </File>\r

diff --git a/build/msw/wx_vc8_wxtiff.vcproj b/build/msw/wx_vc8_wxtiff.vcproj
index 7b0df7d23dc3d34b0f7aabca651952e3e32e131d..438b5c78b1a9396cc6dc7dcf07678c3fc1bff1dc 100644 (file)
--- a/build/msw/wx_vc8_wxtiff.vcproj
+++ b/build/msw/wx_vc8_wxtiff.vcproj
@@ -731,14 +731,26 @@
                                RelativePath="..\..\src\tiff\libtiff\tif_getimage.c"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\src\tiff\libtiff\tif_jbig.c"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\tiff\libtiff\tif_jpeg.c"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\src\tiff\libtiff\tif_jpeg_12.c"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\tiff\libtiff\tif_luv.c"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\src\tiff\libtiff\tif_lzma.c"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\tiff\libtiff\tif_lzw.c"\r
                                >\r

diff --git a/build/msw/wx_vc9_wxtiff.vcproj b/build/msw/wx_vc9_wxtiff.vcproj
index 9f393dbee357cac696cbde1242deb99a7209d3fa..ab43850c4e248fb7a86349fde7ed39b9f9695bf6 100644 (file)
--- a/build/msw/wx_vc9_wxtiff.vcproj
+++ b/build/msw/wx_vc9_wxtiff.vcproj
@@ -727,14 +727,26 @@
                                RelativePath="..\..\src\tiff\libtiff\tif_getimage.c"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\src\tiff\libtiff\tif_jbig.c"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\tiff\libtiff\tif_jpeg.c"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\src\tiff\libtiff\tif_jpeg_12.c"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\tiff\libtiff\tif_luv.c"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\src\tiff\libtiff\tif_lzma.c"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\tiff\libtiff\tif_lzw.c"\r
                                >\r

diff --git a/build/msw/wx_wxtiff.dsp b/build/msw/wx_wxtiff.dsp
index 3273be1a4dc9d1115fd44bb0e40becaa442a4285..1e5b91996440afa2491bf43be3ee61da1c0cc4cc 100644 (file)
--- a/build/msw/wx_wxtiff.dsp
+++ b/build/msw/wx_wxtiff.dsp
@@ -299,14 +299,26 @@ SOURCE=..\..\src\tiff\libtiff\tif_getimage.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\src\tiff\libtiff\tif_jbig.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\tiff\libtiff\tif_jpeg.c\r
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\src\tiff\libtiff\tif_jpeg_12.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\tiff\libtiff\tif_luv.c\r
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\src\tiff\libtiff\tif_lzma.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\tiff\libtiff\tif_lzw.c\r
 # End Source File\r
 # Begin Source File\r