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

sev at users.sourceforge.net sev at users.sourceforge.net
Mon Dec 28 21:11:15 CET 2009


Revision: 46682
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46682&view=rev
Author:   sev
Date:     2009-12-28 20:11:15 +0000 (Mon, 28 Dec 2009)

Log Message:
-----------
Skip encode_dxa when libpng is not present

Modified Paths:
--------------
    tools/branches/gsoc2009-gui/Makefile.common
    tools/branches/gsoc2009-gui/tools.cpp

Modified: tools/branches/gsoc2009-gui/Makefile.common
===================================================================
--- tools/branches/gsoc2009-gui/Makefile.common	2009-12-28 20:10:15 UTC (rev 46681)
+++ tools/branches/gsoc2009-gui/Makefile.common	2009-12-28 20:11:15 UTC (rev 46682)
@@ -189,12 +189,15 @@
 	engines/scumm/extract_zak_c64.o \
 	engines/kyra/kyra_pak.o \
 	engines/kyra/kyra_ins.o \
-	encode_dxa.o \
 	compress.o \
 	tool.o \
 	tools.o \
 	$(UTILS)
 
+ifdef USE_PNG
+tools_OBJS += \
+	encode_dxa.o
+endif
 
 scummvm-tools_OBJS := \
 	gui/main.o \

Modified: tools/branches/gsoc2009-gui/tools.cpp
===================================================================
--- tools/branches/gsoc2009-gui/tools.cpp	2009-12-28 20:10:15 UTC (rev 46681)
+++ tools/branches/gsoc2009-gui/tools.cpp	2009-12-28 20:11:15 UTC (rev 46682)
@@ -38,7 +38,11 @@
 #include "engines/tinsel/compress_tinsel.h"
 #include "engines/touche/compress_touche.h"
 #include "engines/tucker/compress_tucker.h"
+
+#ifdef USE_PNG
 #include "encode_dxa.h"
+#endif
+
 #include "engines/agos/extract_agos.h"
 #include "engines/cine/extract_cine.h"
 #include "engines/gob/extract_gob_stk.h"
@@ -67,7 +71,10 @@
 	_tools.push_back(new CompressTinsel());
 	_tools.push_back(new CompressTouche());
 	_tools.push_back(new CompressTucker());
+
+#ifdef USE_PNG
 	_tools.push_back(new EncodeDXA());
+#endif
 
 	_tools.push_back(new ExtractAgos());
 	_tools.push_back(new ExtractCine());


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




More information about the Scummvm-git-logs mailing list