Merge branch 'master' of https://github.com/WagicProject/wagic

Conflicts: JGE/include/JTypes.h
2013-10-29 23:36:07 +01:00
parent a3a1bc2b79 9037699281
commit f08f0ad3b9
180 changed files with 725 additions and 23783 deletions
@@ -183,8 +183,7 @@ SOURCES += \
        src/WGui.cpp\
        src/WResourceManager.cpp \
        src/AIPlayerBakaB.cpp \
-        src/TestSuiteAI.cpp \
-    ../../JGE/src/Qtconsole.cpp
+        src/TestSuiteAI.cpp

 HEADERS  += \
        include/CacheEngine.h\
@@ -355,7 +354,8 @@ CONFIG(graphics, graphics|console){
 }
 else:CONFIG(console, graphics|console){
    SOURCES += \
-        ../../JGE/src/JGfx-fake.cpp
+        ../../JGE/src/JGfx-fake.cpp\
+        ../../JGE/src/Qtconsole.cpp
 }