Test SDK release test 17

o01eg · Dec 23, 2024 · 2fdfd33 · 2fdfd33
1 parent d69a4a2
commit 2fdfd33
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/.github/workflows/_build-android.yml b/.github/workflows/_build-android.yml
@@ -42,7 +42,7 @@ jobs:
         id: download-sdk
         uses: suisei-cn/[email protected]
         with:
-          url: https://github.com/o01eg/freeorion-sdk/releases/download/v16/FreeOrionSDK_16_Android-${{ matrix.arch }}.zip
+          url: https://github.com/o01eg/freeorion-sdk/releases/download/v17/FreeOrionSDK_17_Android-${{ matrix.arch }}.zip
           target: ../
       - uses: nttld/setup-ndk@v1
         id: setup-ndk

diff --git a/.github/workflows/_build-windows-msvs.yml b/.github/workflows/_build-windows-msvs.yml
@@ -23,7 +23,7 @@ jobs:
         id: download-sdk
         uses: suisei-cn/[email protected]
         with:
-          url: https://github.com/o01eg/freeorion-sdk/releases/download/v16/FreeOrionSDK_16_MSVC-v143-Win32.zip
+          url: https://github.com/o01eg/freeorion-sdk/releases/download/v17/FreeOrionSDK_17_MSVC-v143-Win32.zip
           target: ../
       - name: Add msbuild to PATH
         uses: microsoft/[email protected]

diff --git a/.github/workflows/_build-windows.yml b/.github/workflows/_build-windows.yml
@@ -23,7 +23,7 @@ jobs:
         id: download-sdk
         uses: suisei-cn/[email protected]
         with:
-          url: https://github.com/o01eg/freeorion-sdk/releases/download/v16/FreeOrionSDK_16_MSVC-v143-Win32.zip
+          url: https://github.com/o01eg/freeorion-sdk/releases/download/v17/FreeOrionSDK_17_MSVC-v143-Win32.zip
           target: ../
       - name: Add msbuild to PATH
         uses: microsoft/[email protected]

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -102,7 +102,7 @@ else()
 endif()
 
 if(APPLE)
-    set(FreeOrionSDK_VERSION 16)
+    set(FreeOrionSDK_VERSION 17)
     set(FreeOrionSDK_FILE "FreeOrionSDK_${FreeOrionSDK_VERSION}_Clang-MacOSX-10.15-x86_64.tar.bz2")
     if(NOT EXISTS "${CMAKE_BINARY_DIR}/${FreeOrionSDK_FILE}")
     file(DOWNLOAD
@@ -849,6 +849,8 @@ if(APPLE AND BUILD_CLIENT_GG)
            ${CMAKE_COMMAND} -E copy_if_different "${Boost_SYSTEM_LIBRARY}" "$<TARGET_FILE_DIR:freeorion>/../SharedSupport"
         COMMAND
            ${CMAKE_COMMAND} -E copy_if_different "${Boost_THREAD_LIBRARY}" "$<TARGET_FILE_DIR:freeorion>/../SharedSupport"
+        COMMAND
+           ${CMAKE_COMMAND} -E copy_if_different "$<TARGET_FILE:SDL::SDL>" "$<TARGET_FILE_DIR:freeorion>/../SharedSupport"
         COMMAND
            ${CMAKE_COMMAND} -E remove_directory "$<TARGET_FILE_DIR:freeorion>/../SharedSupport/lib/python${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}"
         COMMAND