Skip to content

Commit

Permalink
Fix for #87 related to resulting link.txt and M1 using cortex flag (d…
Browse files Browse the repository at this point in the history
…ue to the arm with no system specified) (#92)
  • Loading branch information
atsb committed Nov 21, 2021
1 parent c9cb35c commit ed64e01
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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")
Expand Down Expand Up @@ -828,4 +830,3 @@ vita_create_vpk(${PROJECT_NAME}.vpk ${VITA_TITLEID} ${PROJECT_NAME}.self
)
endif()
## EOF

0 comments on commit ed64e01

Please sign in to comment.