mirror of https://github.com/mgba-emu/mgba.git
CMake: I'm tired of putting out fires
This commit is contained in:
parent
d9b43463d0
commit
2a0ed00d0d
|
@ -759,6 +759,7 @@ if(USE_ELF)
|
|||
endif()
|
||||
|
||||
if (USE_DISCORD_RPC)
|
||||
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.7")
|
||||
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/src/third-party/discord-rpc discord-rpc EXCLUDE_FROM_ALL)
|
||||
list(APPEND FEATURES DISCORD_RPC)
|
||||
include_directories(AFTER ${CMAKE_CURRENT_SOURCE_DIR}/src/third-party/discord-rpc/include)
|
||||
|
|
|
@ -77,8 +77,6 @@ if(APPLE)
|
|||
else()
|
||||
set(MIN_VER 10.8)
|
||||
endif()
|
||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mmacosx-version-min=${MIN_VER}")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=${MIN_VER}")
|
||||
set(CMAKE_OSX_DEPLOYMENT_TARGET ${MIN_VER})
|
||||
if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
|
||||
|
|
|
@ -23,7 +23,6 @@ if (SDL_VERSION EQUAL "2")
|
|||
endif()
|
||||
|
||||
if(APPLE)
|
||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mmacosx-version-min=10.7")
|
||||
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.7")
|
||||
endif()
|
||||
set(SDLMAIN_LIBRARY ${SDL2MAIN_LIBRARY})
|
||||
|
|
Loading…
Reference in New Issue