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

[remere at users.sourceforge.net]

Revision: 42678
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42678&view=rev
Author:   remere
Date:     2009-07-23 12:46:06 +0000 (Thu, 23 Jul 2009)

Log Message:
-----------
*Fixed make under *nix

Modified Paths:
--------------
    tools/branches/gsoc2009-gui/Makefile
    tools/branches/gsoc2009-gui/encode_dxa.cpp
    tools/branches/gsoc2009-gui/gui/gui_tools.cpp
    tools/branches/gsoc2009-gui/tool.h

Modified: tools/branches/gsoc2009-gui/Makefile
===================================================================
--- tools/branches/gsoc2009-gui/Makefile	2009-07-23 10:54:12 UTC (rev 42677)
+++ tools/branches/gsoc2009-gui/Makefile	2009-07-23 12:46:06 UTC (rev 42678)
@@ -30,7 +30,7 @@
 CXXFLAGS+= -Wno-long-long -Wno-multichar -Wno-unknown-pragmas -Wno-reorder
 # Enable even more warnings...
 #CXXFLAGS+= -pedantic	# -pedantic is too pedantic, at least on Mac OS X
-CXXFLAGS+= -Wpointer-arith -Wcast-qual -Wuninitialized -Wcast-align
+CXXFLAGS+= -Wpointer-arith -Wuninitialized -Wcast-align
 CXXFLAGS+= -Wshadow -Wimplicit -Wundef -Wnon-virtual-dtor -Wwrite-strings
 
 # Enable checking of pointers returned by "new"
@@ -185,7 +185,7 @@
 #extract_zak_c64$(EXEEXT): extract_zak_c64.o util.o tool.o
 #	$(CXX) $(LDFLAGS) -o $@ $+
 
-tools_gui$(EXEEXT): gui/main.o gui/pages.o gui/tools.o compress_agos.o compress_gob.o compress_kyra.o \
+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 \
@@ -199,11 +199,11 @@
 gui/main.o: gui/main.cpp gui/main.h gui/configuration.h gui/pages.h
 	$(CXX) $(CXXFLAGS) $(CPPFLAGS) `wx-config --cxxflags` -c gui/main.cpp -o gui/main.o
 
-gui/pages.o: gui/pages.cpp gui/pages.h gui/main.h gui/tools.h
+gui/pages.o: gui/pages.cpp gui/pages.h gui/main.h gui/gui_tools.h
 	$(CXX) $(CXXFLAGS) $(CPPFLAGS) `wx-config --cxxflags` -c gui/pages.cpp -o gui/pages.o
 
-gui/tools.o: gui/tools.cpp gui/tools.h
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) `wx-config --cxxflags` -c gui/tools.cpp -o gui/tools.o
+gui/gui_tools.o: gui/gui_tools.cpp gui/gui_tools.h
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) `wx-config --cxxflags` -c gui/gui_tools.cpp -o gui/gui_tools.o
 
 sword2_clue.o: sword2_clue.cpp
 	$(CXX) $(CXXFLAGS) $(CPPFLAGS) `pkg-config --cflags gtk+-2.0` -c sword2_clue.cpp

Modified: tools/branches/gsoc2009-gui/encode_dxa.cpp
===================================================================
--- tools/branches/gsoc2009-gui/encode_dxa.cpp	2009-07-23 10:54:12 UTC (rev 42677)
+++ tools/branches/gsoc2009-gui/encode_dxa.cpp	2009-07-23 12:46:06 UTC (rev 42678)
@@ -535,7 +535,7 @@
 	return outb - outbuf;
 }
 
-EncodeDXA::EncodeDXA(const std::string &name) : CompressionTool(name) {
+EncodeDXA::EncodeDXA(const std::string &name) : CompressionTool(name, TOOLTYPE_COMPRESSION) {
 	
 	ToolInput input;
 	input.format = "*.*";

Modified: tools/branches/gsoc2009-gui/gui/gui_tools.cpp
===================================================================
--- tools/branches/gsoc2009-gui/gui/gui_tools.cpp	2009-07-23 10:54:12 UTC (rev 42677)
+++ tools/branches/gsoc2009-gui/gui/gui_tools.cpp	2009-07-23 12:46:06 UTC (rev 42678)
@@ -32,7 +32,7 @@
 
 #include <algorithm>
 
-#include "tools.h"
+#include "gui_tools.h"
 
 // Include all tools
 #include "../compress_agos.h"

Modified: tools/branches/gsoc2009-gui/tool.h
===================================================================
--- tools/branches/gsoc2009-gui/tool.h	2009-07-23 10:54:12 UTC (rev 42677)
+++ tools/branches/gsoc2009-gui/tool.h	2009-07-23 12:46:06 UTC (rev 42678)
@@ -28,8 +28,6 @@
 
 #include "util.h"
 
-class ToolGUI;
-
 /** 
  * Different types of tools, used to differentiate them when 
  * fetching lists of games & tools.


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