[Scummvm-cvs-logs] SF.net SVN: scummvm:[46454] tools/branches/gsoc2009-gui

[mthreepwood at users.sourceforge.net]

Revision: 46454
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46454&view=rev
Author:   mthreepwood
Date:     2009-12-21 00:02:05 +0000 (Mon, 21 Dec 2009)

Log Message:
-----------
Add autodetection of libpng.

Modified Paths:
--------------
    tools/branches/gsoc2009-gui/Makefile
    tools/branches/gsoc2009-gui/configure

Modified: tools/branches/gsoc2009-gui/Makefile
===================================================================
--- tools/branches/gsoc2009-gui/Makefile	2009-12-20 23:26:58 UTC (rev 46453)
+++ tools/branches/gsoc2009-gui/Makefile	2009-12-21 00:02:05 UTC (rev 46454)
@@ -126,7 +126,7 @@
 	extract_agos.o extract_cine.o extract_gob_stk.o extract_kyra.o extract_loom_tg16.o extract_mm_apple.o \
 	extract_mm_c64.o extract_mm_nes.o extract_parallaction.o extract_scumm_mac.o extract_t7g_mac.o \
 	encode_dxa.o extract_zak_c64.o kyra_pak.o kyra_ins.o compress.o tool.o tools.o $(UTILS)
-	$(CXX) $(LDFLAGS) -o $@ $+ $(WXLIBS) $(LIBS) -lpng
+	$(CXX) $(LDFLAGS) -o $@ $+ $(WXLIBS) $(LIBS)
 
 tools_cli$(EXEEXT): main_cli.o tools_cli.o compress_agos.o compress_gob.o compress_kyra.o \
 	compress_queen.o compress_saga.o compress_scumm_bun.o compress_scumm_san.o compress_scumm_sou.o \
@@ -134,7 +134,7 @@
 	extract_agos.o extract_cine.o extract_gob_stk.o extract_kyra.o extract_loom_tg16.o extract_mm_apple.o \
 	extract_mm_c64.o extract_mm_nes.o extract_parallaction.o extract_scumm_mac.o extract_t7g_mac.o \
 	encode_dxa.o extract_zak_c64.o kyra_pak.o kyra_ins.o compress.o tool.o tools.o $(UTILS)
-	$(CXX) $(LDFLAGS) -o $@ $+ $(LIBS) -lpng
+	$(CXX) $(LDFLAGS) -o $@ $+ $(LIBS)
 
 sword2_clue$(EXEEXT): sword2_clue.o
 	$(CXX) $(LDFLAGS) -o $@ $+ `pkg-config --libs gtk+-2.0`

Modified: tools/branches/gsoc2009-gui/configure
===================================================================
--- tools/branches/gsoc2009-gui/configure	2009-12-20 23:26:58 UTC (rev 46453)
+++ tools/branches/gsoc2009-gui/configure	2009-12-21 00:02:05 UTC (rev 46454)
@@ -74,6 +74,7 @@
 _flac=auto
 _mad=auto
 _zlib=auto
+_png=auto
 _endian=unknown
 _need_memalign=no
 _verbose_build=no
@@ -276,7 +277,10 @@
   --with-zlib-prefix=DIR   Prefix where zlib is installed (optional)
   --disable-zlib           disable zlib (compression) support [autodetect]
 
+  --with-png-prefix=DIR    Prefix where libpng is installed (optional)
+  --disable-png            disable libpng (compression) support [autodetect]
 
+
 Some influential environment variables:
   LDFLAGS        linker flags, e.g. -L<lib dir> if you have libraries in a
                  nonstandard directory <lib dir>
@@ -302,6 +306,8 @@
 	--disable-mad)            _mad=no         ;;
 	--enable-zlib)            _zlib=yes       ;;
 	--disable-zlib)           _zlib=no        ;;
+	--enable-png)             _png=yes        ;;
+	--disable-png)            _png=no         ;;
 	--enable-verbose-build)   _verbose_build=yes ;;
 	--with-ogg-prefix=*)
 		arg=`echo $ac_option | cut -d '=' -f 2`
@@ -333,6 +339,11 @@
 		ZLIB_CFLAGS="-I$arg/include"
 		ZLIB_LIBS="-L$arg/lib"
 		;;
+	--with-png-prefix=*)
+		arg=`echo $ac_option | cut -d '=' -f 2`
+		PNG_CFLAGS="-I$arg/include"
+		PNG_LIBS="-L$arg/lib"
+		;;
 	--with-wx-prefix=*)
 		arg=`echo $ac_option | cut -d '=' -f 2`
 		_wxpath="$arg:$arg/bin"
@@ -878,6 +889,34 @@
 echo "$_zlib"
 
 #
+# Check for PNG
+#
+echocheck "png"
+if test "$_png" = auto ; then
+	_png=no
+	cat > $TMPC << EOF
+#include <png.h>
+int main(void) {
+#ifdef PNG_LIBPNG_VER_STRING
+	return 0;
+#else
+	return -1;
+#endif
+}
+EOF
+	cc_check $LDFLAGS $CXXFLAGS $PNG_CFLAGS $PNG_LIBS -lpng && _png=yes
+fi
+if test "$_png" = yes ; then
+	_def_png='#define USE_PNG'
+	LIBS="$LIBS $PNG_LIBS -lpng"
+	INCLUDES="$INCLUDES $PNG_CFLAGS"
+else
+	_def_png='#undef USE_PNG'
+fi
+add_to_config_mk_if_yes "$_png" 'USE_PNG = 1'
+echo "$_png"
+
+#
 # Figure out installation directories
 #
 test -z "$_bindir" && _bindir="$_prefix/bin"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.