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

[remere at users.sourceforge.net]

Revision: 43017
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43017&view=rev
Author:   remere
Date:     2009-08-02 22:58:27 +0000 (Sun, 02 Aug 2009)

Log Message:
-----------
*Updated makefile and fixed g++ warnings.

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

Modified: tools/branches/gsoc2009-gui/Makefile
===================================================================
--- tools/branches/gsoc2009-gui/Makefile	2009-08-02 22:51:01 UTC (rev 43016)
+++ tools/branches/gsoc2009-gui/Makefile	2009-08-02 22:58:27 UTC (rev 43017)
@@ -189,17 +189,17 @@
 tools_gui$(EXEEXT): gui/main.o gui/pages.o gui/gui_tools.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 \
 	compress_sword1.o compress_sword2.o compress_touche.o compress_tucker.o compress_tinsel.o \
-	extract_agos.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 encode_dxa.o \
-	extract_zak_c64.o kyra_pak.o kyra_ins.o compress.o util.o tool.o tools.o $(UTILS)
+	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 util.o tool.o tools.o $(UTILS)
 	$(CXX) $(LDFLAGS) -o $@ $+ `wx-config --libs` -lpng -lz -lvorbis -logg -lvorbisenc -lFLAC
 
 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 \
 	compress_sword1.o compress_sword2.o compress_touche.o compress_tucker.o compress_tinsel.o \
-	extract_agos.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 encode_dxa.o \
-	extract_zak_c64.o kyra_pak.o kyra_ins.o compress.o util.o tool.o tools.o $(UTILS)
+	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 util.o tool.o tools.o $(UTILS)
 	$(CXX) $(LDFLAGS) -o $@ $+ -lpng -lz -lvorbis -logg -lvorbisenc -lFLAC
 
 sword2_clue$(EXEEXT): sword2_clue.o util.o

Modified: tools/branches/gsoc2009-gui/extract_cine.cpp
===================================================================
--- tools/branches/gsoc2009-gui/extract_cine.cpp	2009-08-02 22:51:01 UTC (rev 43016)
+++ tools/branches/gsoc2009-gui/extract_cine.cpp	2009-08-02 22:58:27 UTC (rev 43017)
@@ -192,7 +192,7 @@
 		file.readUint32BE();
 		unsigned int savedPos = file.pos();
 
-		print("unpacking '%s' ... ", outPath.getFullName());
+		print("unpacking '%s' ... ", outPath.getFullName().c_str());
 
 		File fpOut(outPath, "wb");
 

Modified: tools/branches/gsoc2009-gui/extract_t7g_mac.cpp
===================================================================
--- tools/branches/gsoc2009-gui/extract_t7g_mac.cpp	2009-08-02 22:51:01 UTC (rev 43016)
+++ tools/branches/gsoc2009-gui/extract_t7g_mac.cpp	2009-08-02 22:58:27 UTC (rev 43017)
@@ -51,7 +51,7 @@
 void ExtractT7GMac::dumpResource(File &infile, std::string name) {
 	// Show the resource details
 	uint32 fileSize = infile.readUint32BE();
-	print("  \"%s\" (%d bytes)\n", name, fileSize);
+	print("  \"%s\" (%d bytes)\n", name.c_str(), fileSize);
 
 	// Read the resource contents
 	byte *buf = new byte[fileSize];


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