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

[mthreepwood at users.sourceforge.net]

Revision: 46451
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46451&view=rev
Author:   mthreepwood
Date:     2009-12-20 23:02:24 +0000 (Sun, 20 Dec 2009)

Log Message:
-----------
Fix zlib detection and fix libpng linking.

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 22:24:34 UTC (rev 46450)
+++ tools/branches/gsoc2009-gui/Makefile	2009-12-20 23:02:24 UTC (rev 46451)
@@ -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)
+	$(CXX) $(LDFLAGS) -o $@ $+ $(WXLIBS) $(LIBS) -lpng
 
 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 \

Modified: tools/branches/gsoc2009-gui/configure
===================================================================
--- tools/branches/gsoc2009-gui/configure	2009-12-20 22:24:34 UTC (rev 46450)
+++ tools/branches/gsoc2009-gui/configure	2009-12-20 23:02:24 UTC (rev 46451)
@@ -73,6 +73,7 @@
 _tremor=auto
 _flac=auto
 _mad=auto
+_zlib=auto
 _endian=unknown
 _need_memalign=no
 _verbose_build=no


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