diff --git a/.github/workflows/apple.yml b/.github/workflows/apple.yml index 2e72e8683ba..8bb9fb7bb88 100644 --- a/.github/workflows/apple.yml +++ b/.github/workflows/apple.yml @@ -35,7 +35,7 @@ jobs: wget https://github.com/kimden/stk-dependencies/releases/download/cctools/cctools-14.1.tar.xz tar xf cctools-14.1.tar.xz rm cctools-14.1.tar.xz - wget https://github.com/supertuxkart/dependencies/releases/download/preview/ispc-cross-1.26.0.tar.xz + wget https://github.com/kimden/stk-dependencies/releases/download/preview/ispc-cross-1.26.0.tar.xz tar xf ispc-cross-1.26.0.tar.xz rm ispc-cross-1.26.0.tar.xz - name: Restore timestamps @@ -161,7 +161,7 @@ jobs: # We use SDL_Vulkan_LoadLibrary for 10.9 compatibility, so otool -L supertuxkart has no libMoltenVK.dylib cp ./dependencies-macosx/lib/libMoltenVK.dylib ./macosx-arm64/supertuxkart.app/Contents/libs/ cd ./macosx-arm64/supertuxkart.app/Contents/Resources/data - wget https://github.com/supertuxkart/stk-assets-mobile/releases/download/git/stk-assets-full.zip + wget https://github.com/kimden/stk-dependencies/releases/download/preview/stk-assets-full.zip unzip stk-assets-full.zip rm stk-assets-full.zip cd ../../../../.. diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index add1375097c..a4fc05a7408 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -89,6 +89,7 @@ jobs: run: | # Something funky happens with freetype if mono is left sudo mv /Library/Frameworks/Mono.framework /Library/Frameworks/Mono.framework-disabled + # This dependency doesn't exist in the upstream either, as this branch of instructions wasn't executed for a long time. wget https://github.com/supertuxkart/dependencies/releases/download/preview/dependencies-mac.tar.xz # Remove any existing installation to avoid conflict with bundled dependencies rm -rf /usr/local/include/* @@ -147,7 +148,7 @@ jobs: working-directory: build run: | /usr/local/opt/dylibbundler/bin/dylibbundler -od -b -x ./bin/SuperTuxKart.app/Contents/MacOS/supertuxkart -d ./bin/SuperTuxKart.app/Contents/libs/ -p @executable_path/../libs/ - wget https://github.com/supertuxkart/stk-assets-mobile/releases/download/git/stk-assets-full.zip + wget https://github.com/kimden/stk-dependencies/releases/download/preview/stk-assets-full.zip unzip stk-assets-full.zip -d ../data rm stk-assets-full.zip cd bin diff --git a/.github/workflows/switch.yml b/.github/workflows/switch.yml index 372f0db9453..054696b539d 100644 --- a/.github/workflows/switch.yml +++ b/.github/workflows/switch.yml @@ -14,7 +14,7 @@ jobs: name: Build Switch runs-on: ubuntu-latest container: - image: 'devkitpro/devkita64' + image: 'devkitpro/devkita64:20241023' steps: - name: Checkout code uses: actions/checkout@v2 @@ -24,7 +24,7 @@ jobs: path: "./stk-code" - name: Grab assets run: | - wget -q https://github.com/supertuxkart/stk-assets-mobile/releases/download/git/stk-assets-full.zip + wget -q https://github.com/kimden/stk-dependencies/releases/download/preview/stk-assets-full.zip unzip -q stk-assets-full.zip -d stk-assets rm stk-assets-full.zip - name: Restore modified date diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index f1aa25cd0ea..7bb942013f4 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -82,7 +82,7 @@ jobs: if: ${{ matrix.os == 'ubuntu-latest' }} run: | cd /opt - wget https://github.com/supertuxkart/dependencies/releases/download/preview/ispc-cross-1.26.0.tar.xz + wget https://github.com/kimden/stk-dependencies/releases/download/preview/ispc-cross-1.26.0.tar.xz tar xf ispc-cross-1.26.0.tar.xz rm ispc-cross-1.26.0.tar.xz - name: Install MinGW for i686 or x86_64 @@ -239,7 +239,7 @@ jobs: - name: Downloading stk-assets if: ${{ env.release_tag != '' }} run: | - C:\msys64\usr\bin\wget.exe https://github.com/supertuxkart/stk-assets-mobile/releases/download/git/stk-assets-full.zip + C:\msys64\usr\bin\wget.exe https://github.com/kimden/stk-dependencies/releases/download/preview/stk-assets-full.zip mkdir stk-assets cd stk-assets unzip ..\stk-assets-full.zip diff --git a/CMakeLists.txt b/CMakeLists.txt index 51c59bd044d..fe21208b1af 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -644,7 +644,7 @@ else() add_executable(supertuxkart ${STK_SOURCES} ${STK_RESOURCES} ${STK_HEADERS} ${IOS_ASSETS_FILES}) set_target_properties(supertuxkart PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${PROJECT_SOURCE_DIR}/data/SuperTuxKart-Info-iOS.plist - XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET 10.0 + XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET 13.0 XCODE_ATTRIBUTE_INSTALL_PATH /Applications XCODE_ATTRIBUTE_SKIP_INSTALL No XCODE_ATTRIBUTE_ASSETCATALOG_COMPILER_APPICON_NAME "AppIcon") diff --git a/android/README.ANDROID b/android/README.ANDROID index 5e4fe416cdf..56d30ca8c72 100644 --- a/android/README.ANDROID +++ b/android/README.ANDROID @@ -39,7 +39,7 @@ Additionally some dependencies for optimize_data script: advancecomp, libjpeg-progs, optipng Before compilation you must download dependencies-android-src.tar.xz from: -https://github.com/supertuxkart/dependencies/releases +https://github.com/kimden/stk-dependencies/releases Choose the corresponding STK version you are compiling, use "preview" for git. It contains sources of libraries that are used in STK, but are not available in stk-code repository (curl, freetype, openal...). diff --git a/data/stk_config.xml b/data/stk_config.xml index aae59e0cac2..6c657c69867 100644 --- a/data/stk_config.xml +++ b/data/stk_config.xml @@ -193,7 +193,7 @@ + assets-download="https://github.com/kimden/stk-dependencies/releases/download/"/>