From 377334dcd08ce5424eaf5a53fc2c683c1a6c3895 Mon Sep 17 00:00:00 2001
From: Sacha <xsacha@gmail.com>
Date: Mon, 7 Jul 2014 04:01:01 +1000
Subject: [PATCH] Blackberry: Make compatible with 10.2 again. Remove
 deprecated descriptor elements.

---
 Blackberry/bar-descriptor.xml | 4 +---
 Blackberry/bb.toolchain.cmake | 4 ++--
 CMakeLists.txt                | 1 -
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/Blackberry/bar-descriptor.xml b/Blackberry/bar-descriptor.xml
index 1d613d3c35..88e6f2bb49 100644
--- a/Blackberry/bar-descriptor.xml
+++ b/Blackberry/bar-descriptor.xml
@@ -14,7 +14,6 @@
         <aspectRatio>landscape</aspectRatio>
         <autoOrients>false</autoOrients>
         <systemChrome>none</systemChrome>
-        <transparent>false</transparent>
     </initialWindow>
 
     <asset path="PPSSPPBlackberry" entry="true" type="Qnx/Elf">PPSSPPBlackberry</asset>
@@ -29,9 +28,8 @@
     <icon>
         <image>icon-114.png</image>
     </icon>
-    <splashscreen>icon-114.png</splashscreen>
 
-	<invoke-target id="com.Qtness.PPSSPP.openrom">
+    <invoke-target id="com.Qtness.PPSSPP.openrom">
         <invoke-target-name>Open PSP ROM</invoke-target-name>
         <invoke-target-type>application</invoke-target-type>
         <icon><image>icon-114.png</image></icon>
diff --git a/Blackberry/bb.toolchain.cmake b/Blackberry/bb.toolchain.cmake
index b56f90f745..dfb3b43332 100644
--- a/Blackberry/bb.toolchain.cmake
+++ b/Blackberry/bb.toolchain.cmake
@@ -18,8 +18,8 @@ set (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 set (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
 
 include (CMakeForceCompiler)
-CMAKE_FORCE_C_COMPILER (nto${CMAKE_SYSTEM_PROCESSOR}-gcc-4.8.2 nto${CMAKE_SYSTEM_PROCESSOR}-gcc-4.8.2)
-CMAKE_FORCE_CXX_COMPILER (nto${CMAKE_SYSTEM_PROCESSOR}-g++-4.8.2 nto${CMAKE_SYSTEM_PROCESSOR}-g++-4.8.2)
+CMAKE_FORCE_C_COMPILER (nto${CMAKE_SYSTEM_PROCESSOR}-gcc nto${CMAKE_SYSTEM_PROCESSOR}-gcc)
+CMAKE_FORCE_CXX_COMPILER (nto${CMAKE_SYSTEM_PROCESSOR}-g++ nto${CMAKE_SYSTEM_PROCESSOR}-g++)
 set (CMAKE_COMPILER_IS_GNUCXX True)
 execute_process( COMMAND nto${CMAKE_SYSTEM_PROCESSOR}-gcc --version
 OUTPUT_VARIABLE GCC_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE )
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cac0bc3314..e37306e95b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -215,7 +215,6 @@ if(NOT MSVC)
 	if (BLACKBERRY AND ARM)
 		set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=armv7-a -mfpu=neon -mcpu=cortex-a9")
 		set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=armv7-a -mfpu=neon -mcpu=cortex-a9")
-		set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pie")
 	endif()
 
 	if(IOS)