mirror of
https://github.com/libretro/ppsspp.git
synced 2024-11-23 16:19:44 +00:00
Update for CMake.
This commit is contained in:
parent
57e4088216
commit
c228b9a61e
@ -22,8 +22,10 @@ endif()
|
||||
if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^armv7")
|
||||
set(ARMV7 ON)
|
||||
endif()
|
||||
if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^x86" OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "i.86")
|
||||
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()
|
||||
|
||||
# Remove soon?
|
||||
@ -199,8 +201,10 @@ if(ARMV7)
|
||||
message("Building for ARMv7, ${CMAKE_BUILD_TYPE}")
|
||||
elseif(ARM)
|
||||
message("Building for ARMv6, ${CMAKE_BUILD_TYPE}")
|
||||
elseif(MIPS)
|
||||
elseif(MIPS AND X86)
|
||||
message("Building for MIPS in x86 mode, ${CMAKE_BUILD_TYPE}")
|
||||
elseif(MIPS)
|
||||
message("Buildings for MIPS, ${CMAKE_BUILD_TYPE}")
|
||||
elseif(X86)
|
||||
message("Building for x86, ${CMAKE_BUILD_TYPE}")
|
||||
else()
|
||||
@ -289,16 +293,11 @@ set(CommonExtra)
|
||||
if(ARM)
|
||||
set(CommonExtra ${CommonExtra}
|
||||
Common/ArmCPUDetect.cpp
|
||||
Common/ArmEmitter.h
|
||||
Common/ArmEmitter.cpp
|
||||
Common/ArmThunk.cpp)
|
||||
elseif(X86)
|
||||
# ARMEmitter is here for the unit tests and don't really hurt otherwise.
|
||||
set(CommonExtra ${CommonExtra}
|
||||
Common/ABI.cpp
|
||||
Common/ABI.h
|
||||
Common/ArmEmitter.h
|
||||
Common/ArmEmitter.cpp
|
||||
Common/CPUDetect.cpp
|
||||
Common/CPUDetect.h
|
||||
Common/Thunk.cpp
|
||||
@ -307,7 +306,17 @@ elseif(X86)
|
||||
Common/x64Analyzer.h
|
||||
Common/x64Emitter.cpp
|
||||
Common/x64Emitter.h)
|
||||
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.
|
||||
set(CommonExtra ${CommonExtra}
|
||||
Common/ArmEmitter.h
|
||||
Common/ArmEmitter.cpp)
|
||||
|
||||
if(WIN32)
|
||||
set(CommonExtra ${CommonExtra}
|
||||
Common/stdafx.cpp
|
||||
@ -429,6 +438,8 @@ if(USE_FFMPEG AND NOT DEFINED FFMPEG_BUILDDIR)
|
||||
set(PLATFORM_ARCH "linux/armv7")
|
||||
elseif(ARM)
|
||||
set(PLATFORM_ARCH "linux/arm")
|
||||
elseif(MIPS)
|
||||
set(PLATFORM_ARCH "linux/mips32")
|
||||
elseif(CMAKE_SIZEOF_VOID_P EQUAL 8)
|
||||
set(PLATFORM_ARCH "linux/x86_64")
|
||||
else()
|
||||
@ -1066,6 +1077,12 @@ elseif(X86)
|
||||
Core/MIPS/x86/RegCacheFPU.h
|
||||
GPU/Common/VertexDecoderX86.cpp
|
||||
ext/disarm.cpp)
|
||||
else()
|
||||
set(CoreExtra ${CoreExtra}
|
||||
Core/MIPS/fake/FakeJit.cpp
|
||||
Core/MIPS/fake/FakeJit.h
|
||||
GPU/Common/VertexDecoderFake.cpp
|
||||
ext/disarm.cpp)
|
||||
endif()
|
||||
|
||||
# 'ppsspp_jni' on ANDROID, 'Core' everywhere else
|
||||
|
Loading…
Reference in New Issue
Block a user