Various fixes and activated cmake in travis.

tools/travis-script.sh

@@ -34,50 +34,40 @@ cd ../../../..
 
 # we're building a PSP binary here
 if [ "$BUILD_PSP" = "YES" ]; then
-    echo PSPDEV = $PSPDEV
-    echo psp-config = `psp-config --psp-prefix`
-    cd JGE
-    make -j 4
+    mkdir build_psp
+    cd build_psp
+    cmake -DCMAKE_TOOLCHAIN_FILE=../CMakeModules/psp.toolchain.cmake ..
+    make -j8
     cd ..
-    cd projects/mtg
-    mkdir objs
-    make -j 4
-    mkdir WTH
-    mkdir WTH/Res
-    mv EBOOT.PBP WTH/
-    mv ../../JGE/exceptionHandler/prx/exception.prx WTH/
-    cp ../../core.zip WTH/Res
-    cd WTH/Res
-    unzip core.zip
-    rm core.zip
-    cd ..
-    chmod -R 775 Res
-    cd ..
-    zip psprelease.zip -r WTH/
-    cd ../..
 fi
 
 # we're building an Android binary here
 if [ "$BUILD_ANDROID" = "YES" ]; then
-    android-ndk-r9/ndk-build -C projects/mtg/Android -j4
-    $ANDROID list targets
-    $ANDROID update project -t 1 -p projects/mtg/Android
-    ant debug -f projects/mtg/Android/build.xml
+	mkdir build_sdl
+	cd build_sdl
+	cmake -DCMAKE_TOOLCHAIN_FILE=../CMakeModules/android.toolchain.cmake -DANDROID_NATIVE_API_LEVEL=android-10
+	make -j8
+	cd ..
 fi
 
 # we're building a Qt version with GUI here
 if [ "$BUILD_Qt" = "YES" ]; then
-    mkdir qt-gui-build
-    cd qt-gui-build
-    $QMAKE ../projects/mtg/wagic-qt.pro CONFIG+=release CONFIG+=graphics
-    make -j 4
-    cd ..
+	mkdir build_qt_widget
+	cd build_qt_widget
+	cmake -Dbackend_qt_widget=ON -Dbackend_qt_console=OFF ..
+	make -j8
+	cd ..
+
     # let's try an Intel linux binary in debug text-mode-only
-    $QMAKE projects/mtg/wagic-qt.pro CONFIG+=console CONFIG+=debug DEFINES+=CAPTURE_STDERR
-    make -j 4
+	mkdir build_qt_console
+	cd build_qt_console
+	cmake -Dbackend_qt_console=ON ..
+	make -j8
+	cd ..
+
     # Now we run the testsuite (Res needs to be in the working directory)
     cd projects/mtg
-    ../../wagic
+    ./../../build_qt_console/bin/wagic
     cd ../..
 fi