From c40e507f3d7b0cbe2637c7a323816d354b08afc5 Mon Sep 17 00:00:00 2001
From: Henrik Rydgard <hrydgard@gmail.com>
Date: Sun, 9 Oct 2016 22:10:51 +0200
Subject: [PATCH] Get rid of some blackberry build stuff

Conflicts:
	CMakeLists.txt
---
 .travis.sh     | 12 ------------
 .travis.yml    |  4 ----
 CMakeLists.txt | 20 +++++---------------
 3 files changed, 5 insertions(+), 31 deletions(-)

diff --git a/.travis.sh b/.travis.sh
index c8dce4fccd..b31a5e4397 100644
--- a/.travis.sh
+++ b/.travis.sh
@@ -71,13 +71,6 @@ travis_install() {
 		download_extract_zip http://dl.google.com/android/repository/${NDK_VER}-linux-x86_64.zip ${NDK_VER}-linux-x86_64.zip
 	fi
 
-	# Blackberry NDK: 10.3.0.440 + GCC: 4.8.2
-	if [ "$PPSSPP_BUILD_TYPE" = "Blackberry" ]; then
-		download_extract http://downloads.blackberry.com/upr/developers/update/bbndk/10_3_beta/ndktarget_10.3.0.440/ndktargetrepo_10.3.0.440/packages/bbndk.linux.libraries.10.3.0.440.tar.gz libs.tar.gz
-		download_extract http://downloads.blackberry.com/upr/developers/update/bbndk/10_3_beta/ndktarget_10.3.0.440/ndktargetrepo_10.3.0.440/packages/bbndk.linux.tools.10.3.0.2702.tar.gz tools.tar.gz
-		sed -i 's/-g../&-4.8.2/g' Blackberry/bb.toolchain.cmake
-	fi
-
 	# Ensure we're using ccache
 	if [[ "$CXX" = "clang" && "$CC" == "clang" ]]; then
 		export CXX="ccache clang" CC="ccache clang"
@@ -113,11 +106,6 @@ travis_script() {
 		./ab.sh -j2 APP_ABI=$APP_ABI
 		popd
 	fi
-	if [ "$PPSSPP_BUILD_TYPE" = "Blackberry" ]; then
-		export QNX_TARGET="$(pwd)/target_10_3_0_440/qnx6" QNX_HOST="$(pwd)/host_10_3_0_2702/linux/x86" && PATH="$QNX_HOST/usr/bin:$PATH"
-
-		./b.sh --release --no-package
-	fi
 	if [ "$PPSSPP_BUILD_TYPE" = "iOS" ]; then
 		./b.sh --ios
 		pushd build
diff --git a/.travis.yml b/.travis.yml
index 396cb8443f..41e202cbce 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -58,10 +58,6 @@ matrix:
       compiler: "gcc android-x86_64"
       env: PPSSPP_BUILD_TYPE=Android
            APP_ABI=x86_64
-    - os: linux
-      compiler: "gcc blackberry"
-      env: PPSSPP_BUILD_TYPE=Blackberry
-           CMAKE=TRUE
     - os: linux
       compiler: "clang linux"
       env: PPSSPP_BUILD_TYPE=Linux
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2e2bc98289..b80910d8ae 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -101,7 +101,6 @@ option(MIPS "Set to ON if targeting a MIPS processor" ${MIPS})
 option(X86 "Set to ON if targeting an X86 processor" ${X86})
 # :: Platforms
 option(ANDROID "Set to ON if targeting an Android device" ${ANDROID})
-option(BLACKBERRY "Set to ON if targeting a Blackberry device" ${BLACKBERRY})
 option(IOS "Set to ON if targeting an iOS device" ${IOS})
 option(MAEMO "Set to ON if targeting a Maemo (N900) device" ${MAEMO})
 option(BB "Set to ON if targeting a Beaglebone/Beaglebone Black device" ${BB})
@@ -112,7 +111,7 @@ option(USING_GLES2 "Set to ON if target device uses OpenGL ES 2.0" ${USING_GLES2
 option(RASPBIAN "Set to ON to workaround threading issues when building for ARMV7 on Raspbian" ${RASPBIAN})
 # :: Frontends
 option(USING_QT_UI "Set to ON if you wish to use the Qt frontend wrapper" ${USING_QT_UI})
-option(MOBILE_DEVICE "Set to ON when targetting a mobile device" ${MOBILE_DEVICE})
+option(MOBILE_DEVICE "Set to ON when targeting a mobile device" ${MOBILE_DEVICE})
 option(HEADLESS "Set to OFF to not generate the PPSSPPHeadless target" ${HEADLESS})
 option(UNITTEST "Set to ON to generate the unittest target" ${UNITTEST})
 option(SIMULATOR "Set to ON when targeting an x86 simulator of an ARM platform" ${SIMULATOR})
@@ -120,15 +119,9 @@ option(SIMULATOR "Set to ON when targeting an x86 simulator of an ARM platform"
 option(USE_FFMPEG "Build with FFMPEG support" ${USE_FFMPEG})
 option(USE_SYSTEM_FFMPEG "Dynamically link against system FFMPEG" ${USE_SYSTEM_FFMPEG})
 
-if(ANDROID OR BLACKBERRY OR IOS)
+if(IOS)
 	if (NOT CMAKE_TOOLCHAIN_FILE)
-		if (ANDROID)
-			set(CMAKE_TOOLCHAIN_FILE ${CMAKE_SOURCE_DIR}/android/android.toolchain.cmake)
-		elseif(BLACKBERRY)
-			set(CMAKE_TOOLCHAIN_FILE ${CMAKE_SOURCE_DIR}/Blackberry/bb.toolchain.cmake)
-		elseif(IOS)
-			set(CMAKE_TOOLCHAIN_FILE ${CMAKE_SOURCE_DIR}/ios/ios.toolchain.cmake)
-		endif()
+		set(CMAKE_TOOLCHAIN_FILE ${CMAKE_SOURCE_DIR}/ios/ios.toolchain.cmake)
 		message(FATAL_ERROR "CMAKE_TOOLCHAIN_FILE was not set!\n"
 			"Delete the CMakeCache.txt file and CMakeFiles directory.\n"
 			"Re-run ${CMAKE_COMMAND} with:\n"
@@ -141,6 +134,8 @@ endif()
 if(ANDROID)
 	set(CoreLibName ppsspp_jni)
 	set(CoreLinkType SHARED)
+	set(MOBILE_DEVICE ON)
+	set(USING_GLES2 ON)
 else()
 	set(CoreLibName Core)
 	set(CoreLinkType STATIC)
@@ -846,11 +841,6 @@ elseif(USING_QT_UI)
 	if(APPLE)
 		set(nativeExtraLibs ${nativeExtraLibs} "-framework CoreFoundation")
 	endif()
-elseif(BLACKBERRY)
-	unset(CMAKE_DL_LIBS)
-	set(nativeExtra ${nativeExtra} ext/native/base/BlackberryMain.cpp ext/native/base/BlackberryDisplay.cpp)
-	set(nativeExtraLibs ${nativeExtraLibs} OpenAL bps screen socket EGL)
-	set(TargetBin PPSSPPBlackberry)
 elseif(SDL2_FOUND)
 	set(TargetBin PPSSPPSDL)
 	# Require SDL