Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-02-08 14:58:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Successful build on GCW-Zero.

Browse Source
This commit is contained in:
Sacha 2014-11-14 01:41:30 +10:00
parent 653ac91d6a
commit a95500c930
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
CMakeLists.txt
View File

@ -15,16 +15,16 @@ else()
endif()
# Detect CPU from CMAKE configuration. Toolchains should set this up
if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^arm")
set(ARM ON)
endif()
if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^armv7")
set(ARMV7 ON)
elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^x86" OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "i.86")
set(X86 ON)
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^mips")
set(MIPS ON)
if(CMAKE_SYSTEM_PROCESSOR)
if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^arm")
set(ARM ON)
elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^armv7")
set(ARMV7 ON)
elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^x86" OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "i.86")
set(X86 ON)
elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^mips")
set(MIPS ON)
endif()
endif()
# Remove soon?
@ -308,7 +308,6 @@ elseif(X86)
else()
set(CommonExtra ${CommonExtra}
Common/FakeCPUDetect.cpp
Common/FakeEmitter.cpp
Common/FakeEmitter.h)
endif()
# ARMEmitter is here for the unit tests and don't really hurt otherwise.

4
Core/Config.cpp
View File

@ -262,8 +262,10 @@ static int DefaultNumWorkers() {
static bool DefaultJit() {
#ifdef IOS
return iosCanUseJit;
#else
#elif defined(ARM) || defined(_M_IX86) || defined(_M_X64)
return true;
#else
return false;
#endif
}

2
native

@ -1 +1 @@
Subproject commit 3c201d073eff5f19f095632a754d10f5276aadd4
Subproject commit dea2ae0950406358b3029e3c9190a2aeb464ff8d