From 38ccdd2c3bb6165a4b15e8a3f1c7c88bdd69905a Mon Sep 17 00:00:00 2001
From: Florent Castelli <florent.castelli@gmail.com>
Date: Thu, 13 Oct 2016 03:26:18 +0200
Subject: [PATCH] travis: Build Linux/Qt with CMake

---
 .travis.sh  |  4 +---
 .travis.yml |  2 --
 b.sh        | 15 ++++-----------
 3 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/.travis.sh b/.travis.sh
index 8fca2617a4..3e15509263 100644
--- a/.travis.sh
+++ b/.travis.sh
@@ -67,9 +67,7 @@ travis_install() {
             sudo apt-get install -qq qt5-qmake qtmultimedia5-dev qtsystems5-dev qtbase5-dev qtdeclarative5-dev qttools5-dev-tools libqt5webkit5-dev libsqlite3-dev qt5-default
         fi
 
-        if [ "$CMAKE" = "TRUE" ]; then
-            download_extract "https://cmake.org/files/v3.6/cmake-3.6.2-Linux-x86_64.tar.gz" cmake-3.6.2-Linux-x86_64.tar.gz
-        fi
+        download_extract "https://cmake.org/files/v3.6/cmake-3.6.2-Linux-x86_64.tar.gz" cmake-3.6.2-Linux-x86_64.tar.gz
     fi
 
     # Android NDK + GCC 4.8
diff --git a/.travis.yml b/.travis.yml
index c2a71aa2d1..319606fa14 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -41,7 +41,6 @@ matrix:
     - os: linux
       compiler: "gcc linux"
       env: PPSSPP_BUILD_TYPE=Linux
-           CMAKE=TRUE
     - os: linux
       compiler: "gcc android-arm64-v8a"
       env: PPSSPP_BUILD_TYPE=Android
@@ -61,7 +60,6 @@ matrix:
     - os: linux
       compiler: "clang linux"
       env: PPSSPP_BUILD_TYPE=Linux
-           CMAKE=TRUE
     - os: linux
       compiler: "gcc qt"
       env: PPSSPP_BUILD_TYPE=Linux
diff --git a/b.sh b/b.sh
index c8cbed6944..c1a6844558 100755
--- a/b.sh
+++ b/b.sh
@@ -6,7 +6,8 @@ while test $# -gt 0
 do
 	case "$1" in
 		--qt) echo "Qt enabled"
-			CMAKE=0
+			QT=1
+			CMAKE_ARGS="-DUSING_QT_UI=ON ${CMAKE_ARGS}"
 			;;
 		--ios) CMAKE_ARGS="-DCMAKE_TOOLCHAIN_FILE=cmake/Toolchains/ios.cmake ${CMAKE_ARGS}"
 			TARGET_OS=iOS
@@ -52,11 +53,7 @@ if [ ! -z "$TARGET_OS" ]; then
 	BUILD_DIR="$(tr [A-Z] [a-z] <<< build-"$TARGET_OS")"
 else
 	echo "Building for native host."
-	if [ "$CMAKE" == "0" ]; then
-		BUILD_DIR="build-qt"
-	else
-		BUILD_DIR="build"
-	fi
+	BUILD_DIR="build"
 fi
 
 # Strict errors. Any non-zero return exits this script
@@ -65,11 +62,7 @@ set -e
 mkdir -p ${BUILD_DIR}
 pushd ${BUILD_DIR}
 
-if [ "$CMAKE" == "1" ]; then
-	cmake $HEADLESS $CMAKE_ARGS .. | (grep -v "^-- " || true)
-else
-	qmake $QMAKE_ARGS ../Qt/PPSSPPQt.pro
-fi
+cmake $CMAKE_ARGS .. | (grep -v "^-- " || true)
 
 make -j4 $MAKE_OPT
 popd