Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-26 23:10:38 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Blackberry: Link with pie (required for 10.3?). Fix debug build. Cmake: Show compile type (debug, release) in output.

Browse Source
This commit is contained in:
Sacha 2014-07-06 23:50:48 +10:00
parent b370621a3a
commit b8432c0cc5
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
CMakeLists.txt
View File

@ -102,18 +102,6 @@ if(ANDROID OR BLACKBERRY OR IOS)
endif()
endif()
if(ARMV7)
message("Building for ARMv7")
elseif(ARM)
message("Building for ARMv6")
elseif(MIPS)
message("Building for MIPS in x86 mode")
elseif(X86)
message("Building for x86")
else()
message("Building for Generic")
endif()
if(ANDROID)
set(CoreLibName ppsspp_jni)
set(CoreLinkType SHARED)
@ -190,6 +178,18 @@ if (NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE "Release")
endif()
if(ARMV7)
message("Building for ARMv7, ${CMAKE_BUILD_TYPE}")
elseif(ARM)
message("Building for ARMv6, ${CMAKE_BUILD_TYPE}")
elseif(MIPS)
message("Building for MIPS in x86 mode, ${CMAKE_BUILD_TYPE}")
elseif(X86)
message("Building for x86, ${CMAKE_BUILD_TYPE}")
else()
message("Building for Generic, ${CMAKE_BUILD_TYPE}")
endif()
if(NOT MSVC)
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g -D_DEBUG")
set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} -Os -D_NDEBUG")
@ -215,6 +215,7 @@ 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)

2
Common/Log.h
View File

@ -38,6 +38,8 @@
#include <signal.h>
#endif
#include <cstdio>
namespace LogTypes
{