From ed64e018073f5bab632dba4d5eb9a18db9528e3b Mon Sep 17 00:00:00 2001 From: Gibbon <44937323+atsb@users.noreply.github.com> Date: Mon, 22 Nov 2021 00:33:35 +0100 Subject: [PATCH] Fix for #87 related to resulting link.txt and M1 using cortex flag (due to the arm with no system specified) (#92) --- CMakeLists.txt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 69a478d08..a7a5c99d9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -258,10 +258,12 @@ elseif(CMAKE_SIZEOF_VOID_P EQUAL 4) endif() endif(MSVC) -if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm") +if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm" AND NOT APPLE) set ( CMAKE_CXX_FLAGS "-mfpu=neon-vfpv4 -mtune=cortex-a7 -mhard-float ${CMAKE_CXX_FLAGS}" ) - elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64") + elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64" AND NOT APPLE) set( CMAKE_CXX_FLAGS "-mcpu=cortex-a72 -mtune=cortex-a72 -march=armv8-a+fp+simd+crc ${CMAKE_CXX_FLAGS}" ) + elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm64" AND APPLE) + set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}" ) elseif(CMAKE_SIZEOF_VOID_P EQUAL 4 AND NOT MSVC) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse2") endif() @@ -795,7 +797,7 @@ if (WIN32) ) elseif(APPLE) set_target_properties(EDGE PROPERTIES LINK_FLAGS "-framework OpenGL -framework Cocoa -framework IOKit") - target_link_libraries(EDGE SDL2 COCOA_LIBRARY stdc++ "-framework Foundation" "-framework Cocoa" "-framework IOKIT" objc) + target_link_libraries(EDGE stdc++ "-framework Foundation" "-framework Cocoa" "-framework IOKIT" objc) elseif(VITA) target_link_libraries(EDGE SDL2 vitaGL SceDisplay_stub SceCtrl_stub SceAudio_stub SceSysmodule_stub SceGxm_stub SceCommonDialog_stub SceTouch_stub SceHid_stub m) elseif(NOT ${CMAKE_SYSTEM_NAME} MATCHES "(Free|Open)BSD") @@ -828,4 +830,3 @@ vita_create_vpk(${PROJECT_NAME}.vpk ${VITA_TITLEID} ${PROJECT_NAME}.self ) endif() ## EOF -