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

Safer hack to build on M1.

Browse Source
This commit is contained in:
Henrik Rydgård 2020-12-02 22:46:56 +01:00
parent 5126c91a81
commit 90f8799065
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
CMakeLists.txt
View File

@ -9,7 +9,6 @@ if(NOT ANDROID)
endif() endif()
enable_language(ASM) enable_language(ASM)
list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/Modules)
add_definitions(-D__STDC_CONSTANT_MACROS) add_definitions(-D__STDC_CONSTANT_MACROS)
@ -61,8 +60,6 @@ if(CMAKE_SYSTEM_PROCESSOR)
endif() endif()
endif() endif()
include(ccache)
# the libraries in the ffmpeg/ directory are not compatible with mingw # the libraries in the ffmpeg/ directory are not compatible with mingw
if(MINGW AND NOT DEFINED USE_SYSTEM_FFMPEG) if(MINGW AND NOT DEFINED USE_SYSTEM_FFMPEG)
set(USE_SYSTEM_FFMPEG ON) set(USE_SYSTEM_FFMPEG ON)
@ -93,6 +90,14 @@ if(ANDROID OR WIN32 OR (UNIX AND NOT ARM_NO_VULKAN))
set(VULKAN ON) set(VULKAN ON)
endif() endif()
list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/Modules)
if(NOT (ARM64 AND MACOSX))
list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/sdl)
endif()
include(ccache)
if(GOLD) if(GOLD)
add_definitions(-DGOLD) add_definitions(-DGOLD)
message("Gold Build") message("Gold Build")

0
cmake/Modules/FindSDL2.cmake → cmake/sdl/FindSDL2.cmake
View File