Skip to content
Snippets Groups Projects
Commit 4febb6bc authored by Rye Mutt's avatar Rye Mutt :bread:
Browse files

Target 10.13 deployment on osx

parent e5b93408
No related branches found
No related tags found
1 merge request!12Master
...@@ -287,7 +287,7 @@ if (DARWIN) ...@@ -287,7 +287,7 @@ if (DARWIN)
add_definitions(-DLL_DARWIN=1 -DGL_SILENCE_DEPRECATION) add_definitions(-DLL_DARWIN=1 -DGL_SILENCE_DEPRECATION)
set(CMAKE_CXX_LINK_FLAGS "-Wl,-headerpad_max_install_names,-search_paths_first") set(CMAKE_CXX_LINK_FLAGS "-Wl,-headerpad_max_install_names,-search_paths_first")
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_CXX_LINK_FLAGS}") set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_CXX_LINK_FLAGS}")
set(DARWIN_extra_cstar_flags "-gdwarf-2 -fobjc-arc -fno-strict-aliasing") set(DARWIN_extra_cstar_flags "-gdwarf-2 -fobjc-arc -fno-strict-aliasing -faligned-allocation")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${DARWIN_extra_cstar_flags}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${DARWIN_extra_cstar_flags}")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${DARWIN_extra_cstar_flags}") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${DARWIN_extra_cstar_flags}")
# NOTE: it's critical that the optimization flag is put in front. # NOTE: it's critical that the optimization flag is put in front.
...@@ -302,10 +302,6 @@ if (DARWIN) ...@@ -302,10 +302,6 @@ if (DARWIN)
set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${CMAKE_C_FLAGS_RELWITHDEBINFO}") set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${CMAKE_C_FLAGS_RELWITHDEBINFO}")
set(CMAKE_CXX_FLAGS_RELEASE "-Ofast -ffast-math -mavx -mprefer-vector-width=128 ${CMAKE_CXX_FLAGS_RELEASE}") set(CMAKE_CXX_FLAGS_RELEASE "-Ofast -ffast-math -mavx -mprefer-vector-width=128 ${CMAKE_CXX_FLAGS_RELEASE}")
set(CMAKE_C_FLAGS_RELEASE "-Ofast -ffast-math -mavx -mprefer-vector-width=128 ${CMAKE_C_FLAGS_RELEASE}") set(CMAKE_C_FLAGS_RELEASE "-Ofast -ffast-math -mavx -mprefer-vector-width=128 ${CMAKE_C_FLAGS_RELEASE}")
if(USE_LTO)
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fforce-emit-vtables -fwhole-program-vtables")
set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -fforce-emit-vtables -fwhole-program-vtables")
endif()
endif() endif()
endif (DARWIN) endif (DARWIN)
......
...@@ -206,8 +206,8 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") ...@@ -206,8 +206,8 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
if (XCODE_VERSION LESS 10.2.0) if (XCODE_VERSION LESS 10.2.0)
message( FATAL_ERROR "Xcode 10.2.0 or greater is required." ) message( FATAL_ERROR "Xcode 10.2.0 or greater is required." )
endif (XCODE_VERSION LESS 10.2.0) endif (XCODE_VERSION LESS 10.2.0)
message( "Building with " ${CMAKE_OSX_SYSROOT} ) message( "Building with " ${CMAKE_OSX_SYSROOT} )
set(CMAKE_OSX_DEPLOYMENT_TARGET 10.14) set(CMAKE_OSX_DEPLOYMENT_TARGET 10.13)
set(CMAKE_XCODE_GENERATE_SCHEME ON) set(CMAKE_XCODE_GENERATE_SCHEME ON)
if (USE_ASAN) if (USE_ASAN)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment