Merge branch 'master' into ci_upload_binaries

Fixed Windows compilation.
2013-12-07 22:08:54 +01:00
parent 38e19f7d35 ee217e94a8
commit cb73e2b90d
41 changed files with 1353 additions and 624 deletions
@@ -49,9 +49,13 @@ CONFIG(graphics, graphics|console){
        ../../JGE/src/pc/JGfx.cpp
 }
 else:CONFIG(console, graphics|console){
+    HEADERS += \
+        ../../JGE/include/OutputCapturer.h
+
    SOURCES += \
+        ../../JGE/src/OutputCapturer.cpp\
        ../../JGE/src/JGfx-fake.cpp\
-        ../../JGE/src/Qtconsole.cpp
+        ../../JGE/src/Qtconsole.cpp\
 }

 # maemo 5 packaging