Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added JPEG support

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1577 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
1999-02-03 13:43:04 +00:00
parent 4dba84be23
commit 2fff5f0811
7 changed files with 405 additions and 301 deletions
Download Patch File Download Diff File Expand all files Collapse all files

682
configure vendored
View File

File diff suppressed because it is too large Load Diff

13
configure.in
View File

@@ -749,6 +749,7 @@ DEFAULT_wxUSE_IOSTREAMH=1
DEFAULT_wxUSE_ZLIB=1 DEFAULT_wxUSE_ZLIB=1
DEFAULT_wxUSE_LIBPNG=1 DEFAULT_wxUSE_LIBPNG=1
DEFAULT_wxUSE_LIBJPEG=1
DEFAULT_wxUSE_ODBC=1 DEFAULT_wxUSE_ODBC=1
DEFAULT_wxUSE_TIMEDATE=1 DEFAULT_wxUSE_TIMEDATE=1
@@ -851,6 +852,10 @@ AC_OVERRIDES(libpng,libpng,
**--with-libpng use libpng (PNG image format), **--with-libpng use libpng (PNG image format),
wxUSE_LIBPNG) wxUSE_LIBPNG)
AC_OVERRIDES(libjpeg,libjpeg,
**--with-libjpeg use libjpeg (JPEG image format),
wxUSE_LIBJPEG)
AC_OVERRIDES(odbc,odbc, AC_OVERRIDES(odbc,odbc,
**--with-odbc use iODBC and wxODBC classes, **--with-odbc use iODBC and wxODBC classes,
wxUSE_ODBC) wxUSE_ODBC)
@@ -1184,6 +1189,14 @@ if test "$wxUSE_LIBPNG" = 1 ; then
fi fi
AC_SUBST(PNG_C_SRC) AC_SUBST(PNG_C_SRC)
JPEG_LINK=""
if test "$wxUSE_LIBJPEG" = 1 ; then
AC_DEFINE_UNQUOTED(wxUSE_LIBJPEG,$wxUSE_LIBJPEG)
AC_HAVE_LIBRARY(jpeg)
JPEG_LINK="-ljpeg"
fi
AC_SUBST(JPEG_LINK)
IODBC_C_SRC="" IODBC_C_SRC=""
if test "$wxUSE_ODBC" = 1 ; then if test "$wxUSE_ODBC" = 1 ; then
AC_DEFINE_UNQUOTED(wxUSE_ODBC,$wxUSE_ODBC) AC_DEFINE_UNQUOTED(wxUSE_ODBC,$wxUSE_ODBC)

2
include/wx/msw/setup.h
View File

@@ -150,6 +150,8 @@
// Use zlib for compression in streams and PNG code // Use zlib for compression in streams and PNG code
#define wxUSE_LIBPNG 1 #define wxUSE_LIBPNG 1
// Use PNG bitmap code // Use PNG bitmap code
#define wxUSE_LIBJPEG 0
// Use JPEG bitmap code
#define wxUSE_STD_IOSTREAM 1 #define wxUSE_STD_IOSTREAM 1
// Use standard C++ streams if 1. If 0, use wxWin // Use standard C++ streams if 1. If 0, use wxWin
// streams implementation. // streams implementation.

2
include/wx/msw/setup0.h
View File

@@ -150,6 +150,8 @@
// Use zlib for compression in streams and PNG code // Use zlib for compression in streams and PNG code
#define wxUSE_LIBPNG 1 #define wxUSE_LIBPNG 1
// Use PNG bitmap code // Use PNG bitmap code
#define wxUSE_LIBJPEG 0
// Use JPEG bitmap code
#define wxUSE_STD_IOSTREAM 1 #define wxUSE_STD_IOSTREAM 1
// Use standard C++ streams if 1. If 0, use wxWin // Use standard C++ streams if 1. If 0, use wxWin
// streams implementation. // streams implementation.

4
setup/setup.hin
View File

@@ -47,6 +47,10 @@
* Use libpng * Use libpng
*/ */
#define wxUSE_LIBPNG 0 #define wxUSE_LIBPNG 0
/*
* Use libjpeg
*/
#define wxUSE_LIBJPEG 0
/* /*
* Use iODBC * Use iODBC
*/ */

1
setup/substit.in
View File

@@ -48,3 +48,4 @@ s|*UNIX_THREAD*|@UNIX_THREAD@|g
s|*IODBC_C_SRC*|@IODBC_C_SRC@|g s|*IODBC_C_SRC*|@IODBC_C_SRC@|g
s|*PNG_C_SRC*|@PNG_C_SRC@|g s|*PNG_C_SRC*|@PNG_C_SRC@|g
s|*Z_C_SRC*|@Z_C_SRC@|g s|*Z_C_SRC*|@Z_C_SRC@|g
s|*JPEG_LINK*|@JPEG_LINK@|g

2
wx-config.in
View File

@@ -47,7 +47,7 @@ while test $# -gt 0; do
;; ;;
--libs) --libs)
echo -L@libdir@ @THREADS_LINK@ @WX_LINK@ @DL_LIBRARY@ @GUI_TK_LIBRARY@ @EXTRA_LINK@ echo -L@libdir@ @THREADS_LINK@ @WX_LINK@ @DL_LIBRARY@ @GUI_TK_LIBRARY@ @EXTRA_LINK@ @JPEG_LINK@
;; ;;
*) *)
echo "${usage}" 1>&2 echo "${usage}" 1>&2