From 1811951b4a4b1e9825e779ca590b14ad3564d50e Mon Sep 17 00:00:00 2001 From: Chris Thrasher Date: Sat, 26 Aug 2023 21:28:21 -0600 Subject: [PATCH] Allow for shared libs on iOS --- .github/workflows/ci.yml | 6 ------ CMakeLists.txt | 4 ---- 2 files changed, 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e37e49d83..beb585174 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -40,12 +40,6 @@ jobs: - { name: Release } - { name: Debug, flags: -DCMAKE_BUILD_TYPE=Debug -DSFML_ENABLE_COVERAGE=TRUE } - exclude: - - platform: { name: iOS } - config: { name: Shared } - - platform: { name: iOS Xcode } - config: { name: Shared } - include: - platform: { name: Windows VS2022, os: windows-2022 } config: { name: Unity, flags: -DSFML_USE_MESA3D=TRUE -DBUILD_SHARED_LIBS=TRUE -DCMAKE_UNITY_BUILD=ON } diff --git a/CMakeLists.txt b/CMakeLists.txt index 52e9425ed..d409652ba 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -60,10 +60,6 @@ if(SFML_OS_MACOS OR SFML_OS_IOS) # add an option to build frameworks instead of dylibs (release only) sfml_set_option(SFML_BUILD_FRAMEWORKS FALSE BOOL "TRUE to build SFML as frameworks libraries (release only), FALSE to build according to BUILD_SHARED_LIBS") - if (SFML_OS_IOS AND NOT SFML_BUILD_FRAMEWORKS AND BUILD_SHARED_LIBS) - message(FATAL_ERROR "Naked dynamic libs not supported for iOS, build static or frameworks instead") - endif() - # add an option to automatically install Xcode templates sfml_set_option(SFML_INSTALL_XCODE_TEMPLATES FALSE BOOL "TRUE to automatically install the Xcode templates, FALSE to do nothing about it. The templates are compatible with Xcode 4 and 5.") endif()