Mac: Start bringing up Universal build support

This commit is contained in:
Vicki Pfau 2022-06-15 23:31:20 -07:00
parent 6159c5a70b
commit fa910fc629
2 changed files with 7 additions and 1 deletions

View File

@ -401,7 +401,10 @@ if(QT_STATIC)
find_package(Cups)
find_package(${QT}PrintSupport)
list(APPEND QT_LIBRARIES Cups ${QT}::PrintSupport ${QT}::QCocoaIntegrationPlugin ${QT}::CoreAudioPlugin ${QT}::AVFServicePlugin ${QT}::QCocoaPrinterSupportPlugin)
list(APPEND QT_LIBRARIES ${QT}AccessibilitySupport ${QT}CglSupport ${QT}ClipboardSupport ${QT}FontDatabaseSupport ${QT}GraphicsSupport ${QT}ThemeSupport)
list(APPEND QT_LIBRARIES ${QT}AccessibilitySupport ${QT}ClipboardSupport ${QT}FontDatabaseSupport ${QT}GraphicsSupport ${QT}ThemeSupport)
if(CMAKE_SYSTEM_VERSION VERSION_LESS "19.0")
list(APPEND QT_LIBRARIES ${QT}CglSupport)
endif()
list(APPEND QT_LIBRARIES "-framework AVFoundation" "-framework CoreMedia" "-framework SystemConfiguration" "-framework Security")
set_target_properties(${QT}::Core PROPERTIES INTERFACE_LINK_LIBRARIES "${QTPCRE}")
elseif(UNIX)

View File

@ -56,6 +56,9 @@ elseif(APPLE)
if(NOT CMAKE_SYSTEM_VERSION VERSION_LESS "17.0") # Darwin 17.x is macOS 10.13
list(APPEND SDL_LIBRARY "-framework Metal")
endif()
if(NOT CMAKE_SYSTEM_VERSION VERSION_LESS "19.0") # Darwin 19.x is macOS 10.15
list(APPEND SDL_LIBRARY "-framework GameController" "-framework CoreHaptics")
endif()
endif()
if(NOT SDLMAIN_LIBRARY)