Some tiff code.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4722 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
parent
aec0ed2e25
commit
c7a2bf27da
53
Makefile.in
53
Makefile.in
@ -1,5 +1,5 @@
|
||||
#
|
||||
# This file was automatically generated by tmake at 13:22, 1999/11/24
|
||||
# This file was automatically generated by tmake at 17:13, 1999/11/28
|
||||
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNX.T!
|
||||
|
||||
#
|
||||
@ -43,10 +43,11 @@ VP5 = @top_srcdir@/src/unix
|
||||
VP6 = @top_srcdir@/src/html
|
||||
VP7 = @top_srcdir@/src/png
|
||||
VP8 = @top_srcdir@/src/jpeg
|
||||
VP9 = @top_srcdir@/src/zlib
|
||||
VP10 = @top_srcdir@/src/iodbc
|
||||
VP9 = @top_srcdir@/src/tiff
|
||||
VP10 = @top_srcdir@/src/zlib
|
||||
VP11 = @top_srcdir@/src/iodbc
|
||||
|
||||
VPATH = $(VP1):$(VP2):$(VP3):$(VP4):$(VP5):$(VP6):$(VP7):$(VP8):$(VP9):$(VP10)
|
||||
VPATH = $(VP1):$(VP2):$(VP3):$(VP4):$(VP5):$(VP6):$(VP7):$(VP8):$(VP9):$(VP10):$(VP11)
|
||||
|
||||
top_srcdir = @top_srcdir@
|
||||
prefix = @prefix@
|
||||
@ -740,6 +741,7 @@ GTK_COMMONOBJS = \
|
||||
imagpcx.o \
|
||||
imagpng.o \
|
||||
imagpnm.o \
|
||||
imagtiff.o \
|
||||
intl.o \
|
||||
ipcbase.o \
|
||||
layout.o \
|
||||
@ -836,6 +838,7 @@ GTK_COMMONDEPS = \
|
||||
imagpcx.d \
|
||||
imagpng.d \
|
||||
imagpnm.d \
|
||||
imagtiff.d \
|
||||
intl.d \
|
||||
ipcbase.d \
|
||||
layout.d \
|
||||
@ -1128,6 +1131,7 @@ MOTIF_COMMONOBJS = \
|
||||
imagpcx.o \
|
||||
imagpng.o \
|
||||
imagpnm.o \
|
||||
imagtiff.o \
|
||||
intl.o \
|
||||
ipcbase.o \
|
||||
layout.o \
|
||||
@ -1224,6 +1228,7 @@ MOTIF_COMMONDEPS = \
|
||||
imagpcx.d \
|
||||
imagpng.d \
|
||||
imagpnm.d \
|
||||
imagtiff.d \
|
||||
intl.d \
|
||||
ipcbase.d \
|
||||
layout.d \
|
||||
@ -1474,6 +1479,7 @@ MSW_COMMONOBJS = \
|
||||
imagpcx.o \
|
||||
imagpng.o \
|
||||
imagpnm.o \
|
||||
imagtiff.o \
|
||||
intl.o \
|
||||
ipcbase.o \
|
||||
layout.o \
|
||||
@ -1571,6 +1577,7 @@ MSW_COMMONDEPS = \
|
||||
imagpcx.d \
|
||||
imagpng.d \
|
||||
imagpnm.d \
|
||||
imagtiff.d \
|
||||
intl.d \
|
||||
ipcbase.d \
|
||||
layout.d \
|
||||
@ -1648,6 +1655,7 @@ MSW_GUIOBJS = \
|
||||
dcscreen.o \
|
||||
dde.o \
|
||||
dialog.o \
|
||||
dialup.o \
|
||||
dib.o \
|
||||
dibutils.o \
|
||||
dragimag.o \
|
||||
@ -1738,6 +1746,7 @@ MSW_GUIDEPS = \
|
||||
dcscreen.d \
|
||||
dde.d \
|
||||
dialog.d \
|
||||
dialup.d \
|
||||
dib.d \
|
||||
dibutils.d \
|
||||
dragimag.d \
|
||||
@ -1835,6 +1844,7 @@ BASE_OBJS = \
|
||||
utilscmn.o \
|
||||
variant.o \
|
||||
wxchar.o \
|
||||
threadpsx.o \
|
||||
utilsunx.o
|
||||
|
||||
BASE_DEPS = \
|
||||
@ -1870,6 +1880,7 @@ BASE_DEPS = \
|
||||
utilscmn.d \
|
||||
variant.d \
|
||||
wxchar.d \
|
||||
threadpsx.d \
|
||||
utilsunx.d
|
||||
|
||||
HTMLOBJS = \
|
||||
@ -2010,6 +2021,40 @@ JPEGOBJS = \
|
||||
jquant2.o \
|
||||
jdmerge.o
|
||||
|
||||
TIFFOBJS = \
|
||||
tif_aux.o \
|
||||
tif_close.o \
|
||||
tif_codec.o \
|
||||
tif_compress.o \
|
||||
tif_dir.o \
|
||||
tif_dirinfo.o \
|
||||
tif_dirread.o \
|
||||
tif_dirwrite.o \
|
||||
tif_dumpmode.o \
|
||||
tif_error.o \
|
||||
tif_fax3.o \
|
||||
tif_fax3sm.o \
|
||||
tif_getimage.o \
|
||||
tif_jpeg.o \
|
||||
tif_flush.o \
|
||||
tif_lzw.o \
|
||||
tif_next.o \
|
||||
tif_open.o \
|
||||
tif_packbits.o \
|
||||
tif_pixarlog.o \
|
||||
tif_predict.o \
|
||||
tif_print.o \
|
||||
tif_read.o \
|
||||
tif_swab.o \
|
||||
tif_strip.o \
|
||||
tif_thunder.o \
|
||||
tif_tile.o \
|
||||
tif_unix.o \
|
||||
tif_version.o \
|
||||
tif_warning.o \
|
||||
tif_write.o \
|
||||
tif_zip.o
|
||||
|
||||
IODBC_OBJS = \
|
||||
catalog.o \
|
||||
connect.o \
|
||||
|
||||
12
configure.in
12
configure.in
@ -624,6 +624,7 @@ if test $DEBUG_CONFIGURE = 1; then
|
||||
DEFAULT_wxUSE_ZLIB=no
|
||||
DEFAULT_wxUSE_LIBPNG=no
|
||||
DEFAULT_wxUSE_LIBJPEG=no
|
||||
DEFAULT_wxUSE_LIBTIFF=no
|
||||
DEFAULT_wxUSE_ODBC=no
|
||||
|
||||
DEFAULT_wxUSE_STD_IOSTREAM=no
|
||||
@ -737,6 +738,7 @@ else
|
||||
DEFAULT_wxUSE_ZLIB=yes
|
||||
DEFAULT_wxUSE_LIBPNG=yes
|
||||
DEFAULT_wxUSE_LIBJPEG=yes
|
||||
DEFAULT_wxUSE_LIBTIFF=no
|
||||
DEFAULT_wxUSE_ODBC=yes
|
||||
|
||||
DEFAULT_wxUSE_STD_IOSTREAM=no
|
||||
@ -861,6 +863,7 @@ if test "$wxUSE_GUI" = "no"; then
|
||||
DEFAULT_wxUSE_ZLIB=no
|
||||
DEFAULT_wxUSE_LIBPNG=no
|
||||
DEFAULT_wxUSE_LIBJPEG=no
|
||||
DEFAULT_wxUSE_LIBTIFF=no
|
||||
DEFAULT_wxUSE_SOCKETS=no
|
||||
DEFAULT_wxUSE_JOYSTICK=no
|
||||
DEFAULT_wxUSE_AFM_FOR_POSTSCRIPT=no
|
||||
@ -942,6 +945,7 @@ WX_ARG_WITH(dmalloc, [ --with-dmalloc use dmalloc library (www.l
|
||||
WX_ARG_WITH(zlib, [ --with-zlib use zlib for LZW compression], wxUSE_ZLIB)
|
||||
WX_ARG_WITH(libpng, [ --with-libpng use libpng (PNG image format)], wxUSE_LIBPNG)
|
||||
WX_ARG_WITH(libjpeg, [ --with-libjpeg use libjpeg (JPEG file format)], wxUSE_LIBJPEG)
|
||||
WX_ARG_WITH(libtiff, [ --with-libtiff use libtiff (TIFF file format)], wxUSE_LIBTIFF)
|
||||
WX_ARG_WITH(opengl, [ --with-opengl use OpenGL (or Mesa)], wxUSE_OPENGL)
|
||||
WX_ARG_WITH(odbc, [ --with-odbc use the IODBC and wxODBC classes], wxUSE_ODBC)
|
||||
|
||||
@ -2255,6 +2259,12 @@ if test "$wxUSE_LIBJPEG" = "yes" ; then
|
||||
JPEG_INCLUDE="-I\${top_srcdir}/src/jpeg"
|
||||
fi
|
||||
|
||||
TIFF_INCLUDE=
|
||||
if test "$wxUSE_LIBTIFF" = "yes" ; then
|
||||
AC_DEFINE(wxUSE_LIBTIFF)
|
||||
TIFF_INCLUDE="-I\${top_srcdir}/src/tiff"
|
||||
fi
|
||||
|
||||
if test "$wxUSE_OPENGL" = "yes"; then
|
||||
AC_CHECK_HEADER(GL/gl.h, [
|
||||
AC_CHECK_LIB(GL, glInitNames, [
|
||||
@ -2949,7 +2959,7 @@ dnl makefile system without libtool
|
||||
LD_LIBS="\${top_builddir}/lib/${WX_LIBRARY_NAME_STATIC} $EXTRA_LIBS"
|
||||
|
||||
dnl all -I options we must pass to the compiler
|
||||
INCLUDES="-I. -I\${top_builddir}/include -I\${top_srcdir}/include $ZLIB_INCLUDE $PNG_INCLUDE $JPEG_INCLUDE $TOOLKIT_INCLUDE"
|
||||
INCLUDES="-I. -I\${top_builddir}/include -I\${top_srcdir}/include $ZLIB_INCLUDE $PNG_INCLUDE $JPEG_INCLUDE $TIFF_INCLUDE $TOOLKIT_INCLUDE"
|
||||
|
||||
dnl C/C++ compiler options used to compile wxWindows
|
||||
if test "$GXX" = yes ; then
|
||||
|
||||
Loading…
Reference in New Issue
Block a user