ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CMake: I'm tired of putting out fires

This commit is contained in:
Vicki Pfau 2024-11-18 00:55:55 -08:00
parent d9b43463d0
commit 2a0ed00d0d
3 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -759,6 +759,7 @@ if(USE_ELF)
endif() endif()
if (USE_DISCORD_RPC) 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) add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/src/third-party/discord-rpc discord-rpc EXCLUDE_FROM_ALL)
list(APPEND FEATURES DISCORD_RPC) list(APPEND FEATURES DISCORD_RPC)
include_directories(AFTER ${CMAKE_CURRENT_SOURCE_DIR}/src/third-party/discord-rpc/include) include_directories(AFTER ${CMAKE_CURRENT_SOURCE_DIR}/src/third-party/discord-rpc/include)

2
src/platform/qt/CMakeLists.txt
View File

@ -77,8 +77,6 @@ if(APPLE)
else() else()
set(MIN_VER 10.8) set(MIN_VER 10.8)
endif() 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}) set(CMAKE_OSX_DEPLOYMENT_TARGET ${MIN_VER})
if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")

1
src/platform/sdl/CMakeLists.txt
View File

@ -23,7 +23,6 @@ if (SDL_VERSION EQUAL "2")
endif() endif()
if(APPLE) if(APPLE)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mmacosx-version-min=10.7")
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.7") set(CMAKE_OSX_DEPLOYMENT_TARGET "10.7")
endif() endif()
set(SDLMAIN_LIBRARY ${SDL2MAIN_LIBRARY}) set(SDLMAIN_LIBRARY ${SDL2MAIN_LIBRARY})