MGislv
/
Quake3e
1
0
Fork 0
Code Releases Activity

Merge pull request #133 from dbeef/master 

Mac M1 adjustments to CMake build system
This commit is contained in:
Eugene C 2021-12-10 21:23:48 +02:00 committed by GitHub
parent 2bdc3692a7 882ab59501
commit 776cbaf7aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -130,7 +130,7 @@ endif(UNIX)
if(CMAKE_SYSTEM_PROCESSOR MATCHES AMD|x86)
set(VM_SRCS code/qcommon/vm_x86.c)
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES aarch)
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES aarch|arm64)
set(VM_SRCS code/qcommon/vm_aarch64.c)
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES arm)
set(VM_SRCS code/qcommon/vm_armv7l.c)

2
cmake_modules/FindSDL2.cmake
View File

@ -340,7 +340,7 @@ if(SDL2_FOUND)
# For OS X, SDL2 uses Cocoa as a backend so it must link to Cocoa.
# For more details, please see above.
set_target_properties(SDL2::Core PROPERTIES
IMPORTED_LOCATION "${SDL2_LIBRARY}/SDL2"
IMPORTED_LOCATION "${SDL2_LIBRARY}"
INTERFACE_INCLUDE_DIRECTORIES "${SDL2_INCLUDE_DIR}")
else()
# For threads, as mentioned Apple doesn't need this.