Blackberry: Make compatible with 10.2 again. Remove deprecated descriptor elements.

This commit is contained in:
Sacha 2014-07-07 04:01:01 +10:00
parent 95774f732c
commit 377334dcd0
3 changed files with 3 additions and 6 deletions

View File

@ -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>

View File

@ -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 )

View File

@ -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)