Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-05-30 13:05:35 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

STR #1962: I tried to fix the configuration scripts so that the image support libraries (fltk_jpeg fltk_png fltk_z) are linked in the same fashion as the fltk_image library. Please verify this fix.

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6609 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Matthias Melcher
2008-12-29 17:10:12 +00:00
parent a85a33aa87
commit 7180c24f3c
3 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGES
+1
View File
@@ -1,5 +1,6 @@
CHANGES IN FLTK 1.3.0 CHANGES IN FLTK 1.3.0
- Fixed static linking of image libraries (STR #1962)
- Fixed fl_set_spot() for Windows (STR #2101) - Fixed fl_set_spot() for Windows (STR #2101)
- Added sorting to Fl_Browser_ (STR #2113) - Added sorting to Fl_Browser_ (STR #2113)
- Added utf8 support for OS X copy and paste - Added utf8 support for OS X copy and paste
configure.in
+8
View File
@@ -531,8 +531,10 @@ AC_SUBST(AUDIOLIBS)
dnl Check for image libraries... dnl Check for image libraries...
SAVELIBS="$LIBS" SAVELIBS="$LIBS"
IMAGELIBS="" IMAGELIBS=""
STATICIMAGELIBS=""
AC_SUBST(IMAGELIBS) AC_SUBST(IMAGELIBS)
AC_SUBST(STATICIMAGELIBS)
# Handle the JPEG lib linking mode (use fltk local or system lib) # Handle the JPEG lib linking mode (use fltk local or system lib)
# If --enable-(resp. --disable-)localjpeg parameter is not set by user # If --enable-(resp. --disable-)localjpeg parameter is not set by user
@@ -554,6 +556,7 @@ if test x$enable_localjpeg = xyes -o x$sysjpeglib_ok = xno; then
JPEGINC="-I../jpeg" JPEGINC="-I../jpeg"
JPEG="jpeg" JPEG="jpeg"
IMAGELIBS="-lfltk_jpeg $IMAGELIBS" IMAGELIBS="-lfltk_jpeg $IMAGELIBS"
STATICIMAGELIBS="\$libdir/libfltk_jpeg.a $STATICIMAGELIBS"
AC_DEFINE(HAVE_LIBJPEG) AC_DEFINE(HAVE_LIBJPEG)
#ac_cv_lib_jpeg_jpeg_CreateCompress=no # from ima: should not be necessary #ac_cv_lib_jpeg_jpeg_CreateCompress=no # from ima: should not be necessary
# Finally, warn user if system lib was requested but not found # Finally, warn user if system lib was requested but not found
@@ -564,6 +567,7 @@ else
JPEGINC="" JPEGINC=""
JPEG="" JPEG=""
IMAGELIBS="-ljpeg $IMAGELIBS" IMAGELIBS="-ljpeg $IMAGELIBS"
STATICIMAGELIBS="-ljpeg $STATICIMAGELIBS"
AC_DEFINE(HAVE_LIBJPEG) AC_DEFINE(HAVE_LIBJPEG)
fi fi
@@ -588,6 +592,7 @@ if test x$enable_localzlib = xyes -o x$syszlib_ok = xno ; then
ZLIB="zlib" ZLIB="zlib"
LIBS="-lfltk_z $LIBS" LIBS="-lfltk_z $LIBS"
IMAGELIBS="-lfltk_z $IMAGELIBS" IMAGELIBS="-lfltk_z $IMAGELIBS"
STATICIMAGELIBS="\$libdir/libfltk_z.a $STATICIMAGELIBS"
AC_DEFINE(HAVE_LIBZ) AC_DEFINE(HAVE_LIBZ)
ac_cv_lib_z_gzgets=no # fc: is still necessary ? ac_cv_lib_z_gzgets=no # fc: is still necessary ?
# Finally, warn user if system lib was requested but not found # Finally, warn user if system lib was requested but not found
@@ -599,6 +604,7 @@ else
ZLIB="" ZLIB=""
LIBS="-lz $LIBS" LIBS="-lz $LIBS"
IMAGELIBS="-lz $IMAGELIBS" IMAGELIBS="-lz $IMAGELIBS"
STATICIMAGELIBS="-lz $STATICIMAGELIBS"
AC_DEFINE(HAVE_LIBZ) AC_DEFINE(HAVE_LIBZ)
fi fi
@@ -629,6 +635,7 @@ if test x$enable_localpng = xyes -o x$syspnglib_ok = xno ; then
PNGINC="-I../png" PNGINC="-I../png"
PNG="png" PNG="png"
IMAGELIBS="-lfltk_png $IMAGELIBS" IMAGELIBS="-lfltk_png $IMAGELIBS"
STATICIMAGELIBS="\$libdir/libfltk_png.a $STATICIMAGELIBS"
AC_DEFINE(HAVE_LIBPNG) AC_DEFINE(HAVE_LIBPNG)
AC_DEFINE(HAVE_PNG_H) AC_DEFINE(HAVE_PNG_H)
AC_DEFINE(HAVE_PNG_GET_VALID) AC_DEFINE(HAVE_PNG_GET_VALID)
@@ -641,6 +648,7 @@ else
PNGINC="" PNGINC=""
PNG="" PNG=""
IMAGELIBS="-lpng $IMAGELIBS" IMAGELIBS="-lpng $IMAGELIBS"
STATICIMAGELIBS="-lpng $STATICIMAGELIBS"
AC_DEFINE(HAVE_LIBPNG) AC_DEFINE(HAVE_LIBPNG)
AC_CHECK_LIB(png,png_get_valid, AC_DEFINE(HAVE_PNG_GET_VALID)) AC_CHECK_LIB(png,png_get_valid, AC_DEFINE(HAVE_PNG_GET_VALID))
AC_CHECK_LIB(png,png_set_tRNS_to_alpha, AC_DEFINE(HAVE_PNG_SET_TRNS_TO_ALPHA)) AC_CHECK_LIB(png,png_set_tRNS_to_alpha, AC_DEFINE(HAVE_PNG_SET_TRNS_TO_ALPHA))
fltk-config.in
+2 -1
View File
@@ -95,6 +95,7 @@ LIBNAME="@LIBNAME@"
DSONAME="@DSONAME@" DSONAME="@DSONAME@"
DSOLINK="@DSOLINK@" DSOLINK="@DSOLINK@"
IMAGELIBS="@IMAGELIBS@" IMAGELIBS="@IMAGELIBS@"
STATICIMAGELIBS="@STATICIMAGELIBS@"
CAIROLIBS="@CAIROLIBS@" CAIROLIBS="@CAIROLIBS@"
SHAREDSUFFIX="@SHAREDSUFFIX@" SHAREDSUFFIX="@SHAREDSUFFIX@"
@@ -243,7 +244,7 @@ if test x$use_gl = xyes; then
fi fi
if test x$use_images = xyes; then if test x$use_images = xyes; then
LDLIBS="-lfltk_images$SHAREDSUFFIX $IMAGELIBS $LDLIBS" LDLIBS="-lfltk_images$SHAREDSUFFIX $IMAGELIBS $LDLIBS"
LDSTATIC="$libdir/libfltk_images.a $IMAGELIBS $LDSTATIC" LDSTATIC="$libdir/libfltk_images.a $STATICIMAGELIBS $LDSTATIC"
fi fi
if test x$use_cairo = xyes; then if test x$use_cairo = xyes; then