Updated the Qt project to work on Desktop/Maemo/Meego/Symbian. Removed all dependencies except Qt and OpenGl.

projects/mtg/src/CardSelector.cpp

@@ -7,7 +7,7 @@
 #include "Closest.cpp"
 #include "GameObserver.h"
 
-using std::cout;
+//using std::cout;
 
 // The X lib annoyingly defines True to be 1, leading to
 // hard to understand syntax errors. Not using it, so it's

projects/mtg/src/GuiMana.cpp

@@ -4,7 +4,7 @@
 #include "OptionItem.h"
 #include "Player.h"
 
-using std::cout;
+//using std::cout;
 using std::endl;
 
 ManaIcon::ManaIcon(int color, float x, float y, float destx, float desty) :

projects/mtg/wagic-Qt.pro

@@ -4,10 +4,9 @@
 #
 #-------------------------------------------------
 
-QT       += core gui opengl
-macx:QT += phonon
+QT       += core gui opengl phonon
 #CONFIG += warn_off precompile_header // causes some massives errors on mac.
-VERSION = 0.14.1
+VERSION = 0.16.0
 TARGET = wagic
 TEMPLATE = app
 unix|macx:QMAKE_CXXFLAGS += -Wno-unused-parameter
@@ -16,14 +15,13 @@ windows:DEFINES += _CRT_SECURE_NO_WARNINGS
 unix|macx:DEFINES += LINUX
 CONFIG(debug, debug|release):DEFINES += _DEBUG
 DEFINES += QT_CONFIG
-macx:DEFINES += USE_PHONON
-maemo5 {
 DEFINES += USE_PHONON
-QT += phonon dbus
+maemo5 {
+QT += dbus
 }
 windows:INCLUDEPATH += ../../JGE/Dependencies/include
 windows:INCLUDEPATH += extra
-unix:INCLUDEPATH += /usr/include/GL
+unix:!symbian:INCLUDEPATH += /usr/include/GL
 macx:INCLUDEPATH += /opt/include
 INCLUDEPATH += ../../JGE/include
 INCLUDEPATH += ../../Boost
@@ -31,10 +29,8 @@ INCLUDEPATH += include
 OBJECTS_DIR = objs
 MOC_DIR = objs
 DESTDIR = bin
-
-unix:LIBS += -ljpeg -lgif -lpng12 -lboost_thread-mt
-windows:LIBS += -L../../JGE/Dependencies/lib -L../../Boost/lib -llibjpeg-static-mt-debug -lgiflib -llibpng -lfmodvc -llibboost_date_time-vc100-mt-1_44
-macx|unix:LIBS += -lz
+symbian:DEFINES += FORCE_GLES
+symbian:DEFINES += QT_OPENGL_ES_1
 
 PRECOMPILED_HEADER = include/PrecompiledHeader.h
 
@@ -198,7 +194,7 @@ HEADERS  += \
         include/ThisDescriptor.h\
         include/CardGui.h\
         include/GameStateTransitions.h\
-		include/IconButton.h\
+        include/IconButton.h\
         include/OptionItem.h\
         include/Token.h\
         include/CardPrimitive.h\
@@ -329,6 +325,7 @@ HEADERS += \
         ../../JGE/src/tinyxml/tinyxml.h\
         ../../JGE/include/vram.h
 
+# maemo 5 packaging
 maemo5: {
     # Variables
     BINDIR = /opt/wagic
@@ -361,3 +358,9 @@ maemo5: {
     launcher.path = $$BINDIR
     launcher.files += debian/launcher
 }
+
+# Meego/maemo 6 packaging (incomplete)
+unix:!symbian:!maemo5 {
+    target.path = /opt/wagic/bin
+    INSTALLS += target
+}

projects/mtg/wagic-SDL.pro

@@ -24,6 +24,7 @@ DEFINES += USE_PHONON
 QT += phonon dbus
 }
 windows:INCLUDEPATH += ../../JGE/Dependencies/include
+windows:INCLUDEPATH += ../../JGE/Dependencies/SDL/include
 windows:INCLUDEPATH += extra
 unix:INCLUDEPATH += /usr/include/GL
 unix:INCLUDEPATH += /usr/local/include/SDL
@@ -47,6 +48,7 @@ SOURCES += \
         src/ActionElement.cpp\
         src/ActionLayer.cpp\
         src/ActionStack.cpp\
+        src/AIHints.cpp\
         src/AIMomirPlayer.cpp\
         src/AIPlayer.cpp\
         src/AIStats.cpp\
@@ -97,10 +99,11 @@ SOURCES += \
         src/GuiPhaseBar.cpp\
         src/GuiPlay.cpp\
         src/GuiStatic.cpp\
-		src/IconButton.cpp\	
+        src/IconButton.cpp\
         src/ManaCost.cpp\
         src/ManaCostHybrid.cpp\
         src/MenuItem.cpp\
+        src/ModRules.cpp\
         src/MTGAbility.cpp\
         src/MTGCard.cpp\
         src/MTGCardInstance.cpp\
@@ -201,7 +204,7 @@ HEADERS  += \
         include/ThisDescriptor.h\
         include/CardGui.h\
         include/GameStateTransitions.h\
-		include/IconButton.h\
+        include/IconButton.h\
         include/OptionItem.h\
         include/Token.h\
         include/CardPrimitive.h\
@@ -257,7 +260,9 @@ HEADERS  += \
         include/Navigator.h\
         include/DeckEditorMenu.h\
         include/PlayRestrictions.h\
-        include/NetworkPlayer.h
+        include/NetworkPlayer.h\
+        include/ModRules.h\
+        include/AIHints.h\
 
 # JGE, could probably be moved outside
 SOURCES += \