removed wxGzipStreams (supported by wxZlibStreams now)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26959 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
30
Makefile.in
30
Makefile.in
@@ -79,10 +79,8 @@ WXZLIB_OBJECTS = \
|
||||
wxzlib_trees.o \
|
||||
wxzlib_zutil.o \
|
||||
wxzlib_inflate.o \
|
||||
wxzlib_infblock.o \
|
||||
wxzlib_infback.o \
|
||||
wxzlib_inftrees.o \
|
||||
wxzlib_infcodes.o \
|
||||
wxzlib_infutil.o \
|
||||
wxzlib_inffast.o
|
||||
WXPNG_CFLAGS = $(__INC_ZLIB_p) $(____SHARED) $(CPPFLAGS) $(CFLAGS)
|
||||
WXPNG_OBJECTS = \
|
||||
@@ -249,7 +247,6 @@ ALL_BASE_HEADERS = \
|
||||
wx/fontmap.h \
|
||||
wx/fs_mem.h \
|
||||
wx/fs_zip.h \
|
||||
wx/gzstream.h \
|
||||
wx/hash.h \
|
||||
wx/hashmap.h \
|
||||
wx/hashset.h \
|
||||
@@ -350,7 +347,6 @@ ALL_BASE_SOURCES = \
|
||||
src/common/filesys.cpp \
|
||||
src/common/fmapbase.cpp \
|
||||
src/common/fs_zip.cpp \
|
||||
src/common/gzstream.cpp \
|
||||
src/common/hash.cpp \
|
||||
src/common/hashmap.cpp \
|
||||
src/common/init.cpp \
|
||||
@@ -474,7 +470,6 @@ MONODLL_OBJECTS = \
|
||||
monodll_filesys.o \
|
||||
monodll_fmapbase.o \
|
||||
monodll_fs_zip.o \
|
||||
monodll_gzstream.o \
|
||||
monodll_hash.o \
|
||||
monodll_hashmap.o \
|
||||
monodll_init.o \
|
||||
@@ -558,7 +553,6 @@ MONOLIB_OBJECTS = \
|
||||
monolib_filesys.o \
|
||||
monolib_fmapbase.o \
|
||||
monolib_fs_zip.o \
|
||||
monolib_gzstream.o \
|
||||
monolib_hash.o \
|
||||
monolib_hashmap.o \
|
||||
monolib_init.o \
|
||||
@@ -643,7 +637,6 @@ BASEDLL_OBJECTS = \
|
||||
basedll_filesys.o \
|
||||
basedll_fmapbase.o \
|
||||
basedll_fs_zip.o \
|
||||
basedll_gzstream.o \
|
||||
basedll_hash.o \
|
||||
basedll_hashmap.o \
|
||||
basedll_init.o \
|
||||
@@ -712,7 +705,6 @@ BASELIB_OBJECTS = \
|
||||
baselib_filesys.o \
|
||||
baselib_fmapbase.o \
|
||||
baselib_fs_zip.o \
|
||||
baselib_gzstream.o \
|
||||
baselib_hash.o \
|
||||
baselib_hashmap.o \
|
||||
baselib_init.o \
|
||||
@@ -7438,18 +7430,12 @@ wxzlib_zutil.o: $(srcdir)/src/zlib/zutil.c
|
||||
wxzlib_inflate.o: $(srcdir)/src/zlib/inflate.c
|
||||
$(CCC) -c -o $@ $(WXZLIB_CFLAGS) $<
|
||||
|
||||
wxzlib_infblock.o: $(srcdir)/src/zlib/infblock.c
|
||||
wxzlib_infback.o: $(srcdir)/src/zlib/infback.c
|
||||
$(CCC) -c -o $@ $(WXZLIB_CFLAGS) $<
|
||||
|
||||
wxzlib_inftrees.o: $(srcdir)/src/zlib/inftrees.c
|
||||
$(CCC) -c -o $@ $(WXZLIB_CFLAGS) $<
|
||||
|
||||
wxzlib_infcodes.o: $(srcdir)/src/zlib/infcodes.c
|
||||
$(CCC) -c -o $@ $(WXZLIB_CFLAGS) $<
|
||||
|
||||
wxzlib_infutil.o: $(srcdir)/src/zlib/infutil.c
|
||||
$(CCC) -c -o $@ $(WXZLIB_CFLAGS) $<
|
||||
|
||||
wxzlib_inffast.o: $(srcdir)/src/zlib/inffast.c
|
||||
$(CCC) -c -o $@ $(WXZLIB_CFLAGS) $<
|
||||
|
||||
@@ -7861,9 +7847,6 @@ monodll_fmapbase.o: $(srcdir)/src/common/fmapbase.cpp $(MONODLL_ODEP)
|
||||
monodll_fs_zip.o: $(srcdir)/src/common/fs_zip.cpp $(MONODLL_ODEP)
|
||||
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
|
||||
|
||||
monodll_gzstream.o: $(srcdir)/src/common/gzstream.cpp $(MONODLL_ODEP)
|
||||
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
|
||||
|
||||
monodll_hash.o: $(srcdir)/src/common/hash.cpp $(MONODLL_ODEP)
|
||||
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
|
||||
|
||||
@@ -10789,9 +10772,6 @@ monolib_fmapbase.o: $(srcdir)/src/common/fmapbase.cpp $(MONOLIB_ODEP)
|
||||
monolib_fs_zip.o: $(srcdir)/src/common/fs_zip.cpp $(MONOLIB_ODEP)
|
||||
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
|
||||
|
||||
monolib_gzstream.o: $(srcdir)/src/common/gzstream.cpp $(MONOLIB_ODEP)
|
||||
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
|
||||
|
||||
monolib_hash.o: $(srcdir)/src/common/hash.cpp $(MONOLIB_ODEP)
|
||||
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
|
||||
|
||||
@@ -13717,9 +13697,6 @@ basedll_fmapbase.o: $(srcdir)/src/common/fmapbase.cpp $(BASEDLL_ODEP)
|
||||
basedll_fs_zip.o: $(srcdir)/src/common/fs_zip.cpp $(BASEDLL_ODEP)
|
||||
$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
|
||||
|
||||
basedll_gzstream.o: $(srcdir)/src/common/gzstream.cpp $(BASEDLL_ODEP)
|
||||
$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
|
||||
|
||||
basedll_hash.o: $(srcdir)/src/common/hash.cpp $(BASEDLL_ODEP)
|
||||
$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
|
||||
|
||||
@@ -14023,9 +14000,6 @@ baselib_fmapbase.o: $(srcdir)/src/common/fmapbase.cpp $(BASELIB_ODEP)
|
||||
baselib_fs_zip.o: $(srcdir)/src/common/fs_zip.cpp $(BASELIB_ODEP)
|
||||
$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
|
||||
|
||||
baselib_gzstream.o: $(srcdir)/src/common/gzstream.cpp $(BASELIB_ODEP)
|
||||
$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
|
||||
|
||||
baselib_hash.o: $(srcdir)/src/common/hash.cpp $(BASELIB_ODEP)
|
||||
$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
|
||||
|
||||
|
@@ -160,7 +160,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
src/common/filesys.cpp
|
||||
src/common/fmapbase.cpp
|
||||
src/common/fs_zip.cpp
|
||||
src/common/gzstream.cpp
|
||||
src/common/hash.cpp
|
||||
src/common/hashmap.cpp
|
||||
src/common/init.cpp
|
||||
@@ -239,7 +238,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
wx/fontmap.h
|
||||
wx/fs_mem.h
|
||||
wx/fs_zip.h
|
||||
wx/gzstream.h
|
||||
wx/hash.h
|
||||
wx/hashmap.h
|
||||
wx/hashset.h
|
||||
|
52
configure
vendored
52
configure
vendored
@@ -933,7 +933,6 @@ Optional Features:
|
||||
--enable-sound use wxSound class
|
||||
--enable-wxprintfv use wxWindows implementation of vprintf()
|
||||
--enable-zipstream use wxZipInputStream
|
||||
--enable-gzstream use wxGzipInputStream
|
||||
--enable-url use wxURL class
|
||||
--enable-protocol use wxProtocol class
|
||||
--enable-protocol-http HTTP support in wxProtocol
|
||||
@@ -2130,7 +2129,6 @@ if test $DEBUG_CONFIGURE = 1; then
|
||||
DEFAULT_wxUSE_FS_ZIP=no
|
||||
DEFAULT_wxUSE_BUSYINFO=no
|
||||
DEFAULT_wxUSE_ZIPSTREAM=no
|
||||
DEFAULT_wxUSE_GZSTREAM=no
|
||||
DEFAULT_wxUSE_VALIDATORS=no
|
||||
|
||||
DEFAULT_wxUSE_ACCEL=no
|
||||
@@ -2313,7 +2311,6 @@ else
|
||||
DEFAULT_wxUSE_FS_ZIP=yes
|
||||
DEFAULT_wxUSE_BUSYINFO=yes
|
||||
DEFAULT_wxUSE_ZIPSTREAM=yes
|
||||
DEFAULT_wxUSE_GZSTREAM=yes
|
||||
DEFAULT_wxUSE_VALIDATORS=yes
|
||||
|
||||
DEFAULT_wxUSE_ACCEL=yes
|
||||
@@ -5789,47 +5786,6 @@ echo "${ECHO_T}no" >&6
|
||||
fi
|
||||
|
||||
|
||||
enablestring=
|
||||
echo "$as_me:$LINENO: checking for --${enablestring:-enable}-gzstream" >&5
|
||||
echo $ECHO_N "checking for --${enablestring:-enable}-gzstream... $ECHO_C" >&6
|
||||
no_cache=0
|
||||
# Check whether --enable-gzstream or --disable-gzstream was given.
|
||||
if test "${enable_gzstream+set}" = set; then
|
||||
enableval="$enable_gzstream"
|
||||
|
||||
if test "$enableval" = yes; then
|
||||
ac_cv_use_gzstream='wxUSE_GZSTREAM=yes'
|
||||
else
|
||||
ac_cv_use_gzstream='wxUSE_GZSTREAM=no'
|
||||
fi
|
||||
|
||||
else
|
||||
|
||||
LINE=`grep "wxUSE_GZSTREAM" ${wx_arg_cache_file}`
|
||||
if test "x$LINE" != x ; then
|
||||
eval "DEFAULT_$LINE"
|
||||
else
|
||||
no_cache=1
|
||||
fi
|
||||
|
||||
ac_cv_use_gzstream='wxUSE_GZSTREAM='$DEFAULT_wxUSE_GZSTREAM
|
||||
|
||||
fi;
|
||||
|
||||
eval "$ac_cv_use_gzstream"
|
||||
if test "$no_cache" != 1; then
|
||||
echo $ac_cv_use_gzstream >> ${wx_arg_cache_file}.tmp
|
||||
fi
|
||||
|
||||
if test "$wxUSE_GZSTREAM" = yes; then
|
||||
echo "$as_me:$LINENO: result: yes" >&5
|
||||
echo "${ECHO_T}yes" >&6
|
||||
else
|
||||
echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6
|
||||
fi
|
||||
|
||||
|
||||
|
||||
enablestring=
|
||||
echo "$as_me:$LINENO: checking for --${enablestring:-enable}-url" >&5
|
||||
@@ -34865,13 +34821,6 @@ _ACEOF
|
||||
|
||||
fi
|
||||
|
||||
if test "$wxUSE_GZSTREAM" = "yes"; then
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define wxUSE_GZSTREAM 1
|
||||
_ACEOF
|
||||
|
||||
fi
|
||||
|
||||
if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes"; then
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define wxUSE_ON_FATAL_EXCEPTION 1
|
||||
@@ -39886,7 +39835,6 @@ BAKEFILE_AUTOCONF_INC_M4_VERSION="0.1.4"
|
||||
|
||||
|
||||
|
||||
|
||||
# Check whether --enable-precomp-headers or --disable-precomp-headers was given.
|
||||
if test "${enable_precomp_headers+set}" = set; then
|
||||
enableval="$enable_precomp_headers"
|
||||
|
@@ -480,7 +480,6 @@ if test $DEBUG_CONFIGURE = 1; then
|
||||
DEFAULT_wxUSE_FS_ZIP=no
|
||||
DEFAULT_wxUSE_BUSYINFO=no
|
||||
DEFAULT_wxUSE_ZIPSTREAM=no
|
||||
DEFAULT_wxUSE_GZSTREAM=no
|
||||
DEFAULT_wxUSE_VALIDATORS=no
|
||||
|
||||
DEFAULT_wxUSE_ACCEL=no
|
||||
@@ -663,7 +662,6 @@ else
|
||||
DEFAULT_wxUSE_FS_ZIP=yes
|
||||
DEFAULT_wxUSE_BUSYINFO=yes
|
||||
DEFAULT_wxUSE_ZIPSTREAM=yes
|
||||
DEFAULT_wxUSE_GZSTREAM=yes
|
||||
DEFAULT_wxUSE_VALIDATORS=yes
|
||||
|
||||
DEFAULT_wxUSE_ACCEL=yes
|
||||
@@ -883,7 +881,6 @@ WX_ARG_ENABLE(unicode, [ --enable-unicode compile wxString with Un
|
||||
WX_ARG_ENABLE(sound, [ --enable-sound use wxSound class], wxUSE_SOUND)
|
||||
WX_ARG_ENABLE(wxprintfv, [ --enable-wxprintfv use wxWindows implementation of vprintf()], wxUSE_EXPERIMENTAL_PRINTF)
|
||||
WX_ARG_ENABLE(zipstream, [ --enable-zipstream use wxZipInputStream], wxUSE_ZIPSTREAM)
|
||||
WX_ARG_ENABLE(gzstream, [ --enable-gzstream use wxGzipInputStream], wxUSE_GZSTREAM)
|
||||
|
||||
WX_ARG_ENABLE(url, [ --enable-url use wxURL class], wxUSE_URL)
|
||||
WX_ARG_ENABLE(protocol, [ --enable-protocol use wxProtocol class], wxUSE_PROTOCOL)
|
||||
@@ -4648,10 +4645,6 @@ if test "$wxUSE_ZIPSTREAM" = "yes"; then
|
||||
AC_DEFINE(wxUSE_ZIPSTREAM)
|
||||
fi
|
||||
|
||||
if test "$wxUSE_GZSTREAM" = "yes"; then
|
||||
AC_DEFINE(wxUSE_GZSTREAM)
|
||||
fi
|
||||
|
||||
if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes"; then
|
||||
AC_DEFINE(wxUSE_ON_FATAL_EXCEPTION)
|
||||
fi
|
||||
|
@@ -135,7 +135,6 @@
|
||||
\input gridrend.tex
|
||||
\input gridtbl.tex
|
||||
\input gridsizr.tex
|
||||
\input gzstream.tex
|
||||
\input hashmap.tex
|
||||
\input hash.tex
|
||||
\input helpinst.tex
|
||||
|
@@ -786,17 +786,6 @@
|
||||
# endif
|
||||
#endif /* wxUSE_PROTOCOL */
|
||||
|
||||
#if wxUSE_GZSTREAM
|
||||
# if !wxUSE_ZLIB
|
||||
# ifdef wxABORT_ON_CONFIG_ERROR
|
||||
# error "wxUSE_GZSTREAM requires wxUSE_ZLIB"
|
||||
# else
|
||||
# undef wxUSE_ZLIB
|
||||
# define wxUSE_ZLIB 1
|
||||
# endif
|
||||
# endif
|
||||
#endif /* wxUSE_GZSTREAM */
|
||||
|
||||
/* have to test for wxUSE_HTML before wxUSE_FILESYSTEM */
|
||||
#if wxUSE_HTML
|
||||
# if !wxUSE_FILESYSTEM
|
||||
|
@@ -375,12 +375,9 @@
|
||||
#define wxUSE_ZIPSTREAM 1
|
||||
|
||||
// Set to 1 to compile wxZlibInput/OutputStream classes. Also required by
|
||||
// wxUSE_LIBPNG and wxUSE_GZSTREAM.
|
||||
// wxUSE_LIBPNG
|
||||
#define wxUSE_ZLIB 1
|
||||
|
||||
// Set to 1 to compile wxGzipInput/OutputStream classes. Requires wxUSE_ZLIB.
|
||||
#define wxUSE_GZSTREAM 1
|
||||
|
||||
// If enabled, the code written by Apple will be used to write, in a portable
|
||||
// way, float on the disk. See extended.c for the license which is different
|
||||
// from wxWindows one.
|
||||
|
@@ -395,12 +395,9 @@
|
||||
#define wxUSE_ZIPSTREAM 1
|
||||
|
||||
// Set to 1 to compile wxZlibInput/OutputStream classes. Also required by
|
||||
// wxUSE_LIBPNG and wxUSE_GZSTREAM.
|
||||
// wxUSE_LIBPNG
|
||||
#define wxUSE_ZLIB 1
|
||||
|
||||
// Set to 1 to compile wxGzipInput/OutputStream classes. Requires wxUSE_ZLIB.
|
||||
#define wxUSE_GZSTREAM 1
|
||||
|
||||
// If enabled, the code written by Apple will be used to write, in a portable
|
||||
// way, float on the disk. See extended.c for the license which is different
|
||||
// from wxWindows one.
|
||||
|
@@ -238,9 +238,6 @@
|
||||
// and make the library thread safe
|
||||
#define wxUSE_ZLIB 1
|
||||
// Use zlib for compression in streams and PNG code
|
||||
#define wxUSE_GZSTREAM 1
|
||||
// Set to 1 to compile wxGzipInput/OutputStream classes.
|
||||
// Requires wxUSE_ZLIB.
|
||||
#define wxUSE_IMAGE 1
|
||||
// Set to 1 for wxImage support (recommended).
|
||||
#define wxUSE_LIBPNG 1
|
||||
|
@@ -424,12 +424,9 @@
|
||||
#define wxUSE_ZIPSTREAM 1
|
||||
|
||||
// Set to 1 to compile wxZlibInput/OutputStream classes. Also required by
|
||||
// wxUSE_LIBPNG and wxUSE_GZSTREAM.
|
||||
// wxUSE_LIBPNG
|
||||
#define wxUSE_ZLIB 1
|
||||
|
||||
// Set to 1 to compile wxGzipInput/OutputStream classes. Requires wxUSE_ZLIB.
|
||||
#define wxUSE_GZSTREAM 1
|
||||
|
||||
// Set to 1 to enable virtual Internet filesystem (requires wxUSE_FILESYSTEM)
|
||||
#define wxUSE_FS_INET 1
|
||||
|
||||
|
@@ -900,11 +900,6 @@
|
||||
*/
|
||||
#define wxUSE_ZIPSTREAM 0
|
||||
|
||||
/*
|
||||
* Use gzip streams, requires wxUSE_ZLIB
|
||||
*/
|
||||
#define wxUSE_GZSTREAM 0
|
||||
|
||||
/*
|
||||
* wxPalette class
|
||||
*/
|
||||
|
@@ -920,11 +920,6 @@
|
||||
*/
|
||||
#define wxUSE_ZIPSTREAM 1
|
||||
|
||||
/*
|
||||
* Use gzip streams, requires wxUSE_ZLIB
|
||||
*/
|
||||
#define wxUSE_GZSTREAM 1
|
||||
|
||||
/*
|
||||
* wxPalette class
|
||||
*/
|
||||
|
Reference in New Issue
Block a user