Merge pull request #81 from Okkoma/sdl2.30

sdl2.30.9
u3d-community · Nov 22, 2024 · c252464 · c252464
2 parents 1474bbf + 85fae35
commit c252464
Show file tree

Hide file tree

Showing 1,108 changed files with 222,779 additions and 130,837 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -7,7 +7,7 @@ concurrency:
 
 jobs:
   android:
-    name: android📱
+    name: 📱
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false

diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
@@ -15,16 +15,25 @@ jobs:
         platform:
           - iOS
           - tvOS
+        lib-type:
+          - static       
     env:
       HOST: macOS
       PLATFORM: ${{ matrix.platform }}
-      LIB_TYPE: static
+      LIB_TYPE: ${{ matrix.lib-type }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
         with: { fetch-depth: 0 }
+      - name: Cache
+        uses: actions/cache@v4
+        with:
+          path: |
+            build
+          key: |
+            ${{ matrix.platform }}-${{ matrix.lib-type }}-${{ runner.os }}-${{ runner.arch }}     
       - name: Select Xcode
-        run: sudo xcode-select --switch /Applications/Xcode_15.4.app
+        run: sudo xcode-select -s /Applications/Xcode.app
       - name: CMake
         run: rake cmake
       - name: Build
@@ -45,6 +54,9 @@ jobs:
       - name: Upload
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ matrix.platform }}-static-all-rel
+          name: ${{ matrix.platform }}-${{ matrix.lib-type }}-all-rel
           path: build/ci/*.tar.gz
         if: github.event_name == 'push'
+      - name: Clean
+        run: |
+            rm -rf {build/ci/lib,build/ci/bin/*.app}
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -95,8 +95,6 @@ jobs:
           PUBLISHER_NAME: ${{ secrets.PUBLISHER_NAME }}
           PUBLISHER_EMAIL: ${{ secrets.PUBLISHER_EMAIL }}
           PUBLISHER_TOKEN: ${{ secrets.PUBLISHER_TOKEN }}
-          BINTRAY_USER: ${{ secrets.BINTRAY_USER }}
-          BINTRAY_KEY: ${{ secrets.BINTRAY_KEY }}
         run: script/dockerized.sh ${PLATFORM/-*} rake publish
         if: |
           github.event_name == 'push' &&

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -26,7 +26,7 @@ jobs:
         uses: actions/checkout@v4
         with: { fetch-depth: 0 }
       - name: Select Xcode
-        run: sudo xcode-select --switch /Applications/Xcode_15.4.app
+        run: sudo xcode-select -s /Applications/Xcode.app
       - name: CMake
         run: rake cmake
       - name: Build

diff --git a/.github/workflows/web.yml b/.github/workflows/web.yml
@@ -17,7 +17,7 @@ jobs:
           #- Debug
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       # - name: Cache
       #   id: cache-system-libraries
@@ -27,17 +27,17 @@ jobs:
       #     key: emsdk-${{ runner.os }}
 
       - name: Emscripten
-        uses: mymindstorm/setup-emsdk@v11
+        uses: mymindstorm/setup-emsdk@v14
         with:
           #actions-cache-folder: 'emsdk-cache'
           no-cache: true
-          version: 3.1.17
+          version: 3.1.60
 
       - name: Verify Emscripten
         run: emcc -v
 
       - name: CMake
-        run: emcmake script/cmake_emscripten.sh build -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} -DURHO3D_LIB_TYPE=static -DURHO3D_PROFILING=0
+        run: script/cmake_emscripten.sh build -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} -DURHO3D_LIB_TYPE=static -DURHO3D_PROFILING=0
 
       - name: Build
         run: cmake --build build --parallel 2 --config ${{ matrix.build-type }}

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -31,7 +31,7 @@ jobs:
         with: { fetch-depth: 0 }
       - name: Set cache TTL
         run: |
-          echo ("CACHE_MONTH=" + $(date '+%b %Y')) >> $env:GITHUB_ENV
+          echo ("CACHE_MONTH=vs_" + $(date '+%b %Y')) >> $env:GITHUB_ENV
       - name: CMake
         run: rake cmake
       - name: Build
@@ -84,11 +84,11 @@ jobs:
       MINGW_SYSROOT: 'C:/ProgramData/chocolatey/lib/mingw'
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with: { fetch-depth: 0 }
       - name: Set cache TTL
         run: |
-          echo ("CACHE_MONTH=" + $(date '+%b %Y')) >> $env:GITHUB_ENV
+          echo ("CACHE_MONTH=gcc_" + $(date '+%b %Y')) >> $env:GITHUB_ENV
       - name: Cache MinGW installation
         id: cache-mingw
         uses: actions/cache@v4
@@ -100,6 +100,7 @@ jobs:
         with:
           version: 12.2.0 
           platform: x64
+        if: steps.cache-mingw.outputs.cache-hit != 'true'
       - name: CMake
         run: rake cmake
       - name: Build

diff --git a/Source/ThirdParty/SDL/BUGS.txt b/Source/ThirdParty/SDL/BUGS.txt
@@ -1,7 +1,7 @@
 
-Bugs are now managed in the SDL bug tracker, here:
+Bugs are now managed in the SDL issue tracker, here:
 
-    https://bugzilla.libsdl.org/
+    https://github.com/libsdl-org/SDL/issues
 
 You may report bugs there, and search to see if a given issue has already
  been reported, discussed, and maybe even fixed.
@@ -11,6 +11,6 @@ You may also find help at the SDL forums/mailing list:
 
     https://discourse.libsdl.org/
 
-Bug reports are welcome here, but we really appreciate if you use Bugzilla, as
- bugs discussed on the mailing list may be forgotten or missed.
+Bug reports are welcome here, but we really appreciate if you use the issue
+ tracker, as bugs discussed on the mailing list may be forgotten or missed.