Merge branch 'release/2.x' into dev

Author: halx99

.github/workflows/build.yml

@@ -142,7 +142,7 @@ jobs:
         - name: Build
           shell: pwsh
           run: .\tools\cmdline\axmol -p win32 -a x64 -dll
-  linux:
+  linux-ogl:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v6
@@ -190,7 +190,7 @@ jobs:
     - name: Build
       shell: pwsh
       run: ./tools/cmdline/axmol -p osx -a x64
-  android:
+  android-ogl:
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -211,7 +211,7 @@ jobs:
         ./tools/cmdline/axmol -p android -a $env:BUILD_ARCH
     - uses: actions/upload-artifact@v6
       with:
-        name: android_${{ matrix.arch }}
+        name: android_${{ matrix.arch }}_ogl
         path: |
           templates/**/*.apk
           tests/**/*.apk

.github/workflows/verify-app.yml

@@ -14,8 +14,8 @@ on:
 
 run-name: verify-app-pr${{ inputs.pr_id }}
 
-# env:
-#   pr_id: '${{ inputs.pr_id }}'
+env:
+  GH_XCODE_VER: '16.4'
 
 jobs:
   win32:
@@ -70,23 +70,31 @@ jobs:
         axmol new HelloCpp
         axmol -d HelloCpp
   osx-arm64:
-    runs-on: macos-latest
+    runs-on: ${{ vars.GH_MACOS_VER }}
     steps:
     - uses: actions/checkout@v6
       with:
         ref: 'refs/pull/${{ inputs.pr_id }}/merge'
+    - uses: maxim-lobanov/setup-xcode@v1
+      id: setup-xcode
+      with:
+        xcode-version: '${{ env.GH_XCODE_VER }}'
     - name: Build
       shell: pwsh
       run: |
         ./setup.ps1
         axmol new HelloCpp
         axmol -d HelloCpp
   osx-x64:
-    runs-on: macos-13
+    runs-on: ${{ vars.GH_MACOS_VER }}-intel
     steps:
     - uses: actions/checkout@v6
       with:
         ref: 'refs/pull/${{ inputs.pr_id }}/merge'
+    - uses: maxim-lobanov/setup-xcode@v1
+      id: setup-xcode
+      with:
+        xcode-version: '${{ env.GH_XCODE_VER }}'
     - name: Build
       shell: pwsh
       run: |
@@ -106,7 +114,7 @@ jobs:
         axmol new HelloCpp
         axmol -p android -d HelloCpp
   ios:
-    runs-on: macos-latest
+    runs-on: ${{ vars.GH_MACOS_VER }}
     strategy:
       matrix:
         target_os:
@@ -118,6 +126,10 @@ jobs:
     - uses: actions/checkout@v6
       with:
         ref: 'refs/pull/${{ inputs.pr_id }}/merge'
+    - uses: maxim-lobanov/setup-xcode@v1
+      id: setup-xcode
+      with:
+        xcode-version: '${{ env.GH_XCODE_VER }}'
     - name: Build
       shell: pwsh
       run: |

1k/build.profiles

@@ -10,7 +10,7 @@ axslcc=3.3.1+
 
 # The cmake, @gradle @axmol-cmdline
 # as latest as possible
-cmake=4.2.0+
+cmake=4.2.0~4.2.1+
 
 # The ninja
 ninja=1.10.0~1.13.1+
@@ -34,7 +34,7 @@ llvm=21.1.5
 # region platform:android
 
 # The microsoft openjdk, @axmol-cmdline
-jdk=17.0.10~17.0.15+
+jdk=17.0.10~17.0.17+
 
 # The android cmdline-tools aka sdkmanager, as stable as possible
 cmdlinetools=19.0

1k/install-pwsh.sh

@@ -12,7 +12,7 @@ mkdir -p $cacheDir
 
 pwsh_ver=$1
 if [ "$pwsh_ver" = "" ] ; then
-    pwsh_ver='7.5.3'
+    pwsh_ver='7.5.4'
 fi
 
 pwsh_min_ver=$2

3rdparty/README.md

@@ -22,7 +22,7 @@
 
 ## c-ares
 - [![Upstream](https://img.shields.io/github/v/release/c-ares/c-ares?label=Upstream)](https://github.com/c-ares/c-ares)
-- Version: 1.34.5
+- Version: 1.34.6
 - License: MIT
 
 ## Clipper2
@@ -98,7 +98,7 @@
 
 ## jpeg-turbo
 - [![Upstream](https://img.shields.io/github/v/release/libjpeg-turbo/libjpeg-turbo?label=Upstream)](https://github.com/libjpeg-turbo/libjpeg-turbo)
-- Version: 3.1.2
+- Version: 3.1.3
 - License: BSD-style (IJG,BSD-3-Clause,zlib)
 
 ## kcp
@@ -124,7 +124,7 @@
 
 - luajit
   - Upstream: https://github.com/LuaJIT/LuaJIT
-  - Version: 2.1-68354f4
+  - Version: 2.1-7152e15
   - License: MIT
 
 - tolua

CHANGELOG.md

@@ -1,3 +1,42 @@
+# axmol-2.11.0 ?? 2025
+
+## Bug fixes
+
+- Fix audio stop blocking on iOS during active phone calls by @halx99 in [#2950](https://github.com/axmolengine/axmol/pull/2950)
+- Fix WebSocket close code byte order for [#2889](https://github.com/axmolengine/axmol/issues/2889) by @halx99
+- Fix Xcode 14.2 compatibility linking issue by @halx99
+- Fix `build-docs.ps1` failing to build 2.10.x by @halx99
+- Fix `AX_USE_ALSOFT` definition by @halx99 in [#2912](https://github.com/axmolengine/axmol/pull/2912)
+- Fix compile error when `AX_CORE_PROFILE` is defined by @crazyhappygame in [#2910](https://github.com/axmolengine/axmol/pull/2910)
+- Fix luabinding generator not working due to missing `clang-ver.ps1` by @halx99
+- Fix isolated Axmol apps unable to find NuGet program for [#2926](https://github.com/axmolengine/axmol/issues/2926) by @halx99
+- Fix various Particle System bugs by @WUCJ638 in [#2935](https://github.com/axmolengine/axmol/pull/2935)
+
+## Improvements
+
+- Allow overriding `FileUtils::getWritablePath()` on Linux by @j-jorge in [#2906](https://github.com/axmolengine/axmol/pull/2906)
+- CI: Stop generating Axmol BS package by @halx99
+- CI: Relax map-diff CHECK condition in unit-tests to avoid flaky CI failures by @halx99
+- CI: Improve macOS runners and build commands by @halx99
+- Add `Node::getHashOfName()` by @j-jorge in [#2907](https://github.com/axmolengine/axmol/pull/2907)
+- Lock `axslcc` version to `1.9.6` for Axmol 2.x by @halx99
+- Minor performance-related improvements in FontFreeType by @j-jorge
+- Delete pending `AsyncStruct`s when `TextureCache` loading thread is destroyed by @j-jorge in [#2911](https://github.com/axmolengine/axmol/pull/2911)
+
+## SDK & Tools updates
+
+- cmake: 4.2.0 => 4.2.1
+- jdk: 17.0.15 => 17.0.17
+- webview2: 1.0.3595.46 => 1.0.3650.58
+
+## 3rdparty updates
+
+- c-ares: 1.34.5 => 1.34.6
+- jpeg-turbo: 3.1.2 => 3.1.3
+- libpng: 1.6.50 => 1.6.53
+- luajit: 2.1-68354f4 => 2.1-7152e15
+
+
 # axmol-2.10.0 Nov.27 2025
 
 ## Significant changes relative to 2.9.1
@@ -29,14 +68,14 @@
 
 ## SDK & Tools updates
 
-- cmake: 4.1.1 → 4.2.0 (required for VS2026 support)  
-- gradle: 9.2.0 → 9.2.1  
-- webview2: 1.0.3537.50 → 1.0.3595.46  
+- cmake: 4.1.1 => 4.2.0 (required for VS2026 support)
+- gradle: 9.2.0 => 9.2.1
+- webview2: 1.0.3537.50 => 1.0.3595.46
 
 ## 3rdparty updates
 
-- curl: 8.16.0 → 8.17.0  
-- luajit: 2.1-871db2c → 2.1-68354f4  
+- curl: 8.16.0 => 8.17.0
+- luajit: 2.1-871db2c => 2.1-68354f4
 
 ## Community News
 
@@ -441,7 +480,7 @@ across different devices and orientations.
 
 ## 3rdparty updates
 
-- cares: 1.34.4 => 1.34.5
+- c-ares: 1.34.4 => 1.34.5
 - Clipper2: 1.5.2 => 1.5.3
 - doctest: 2.4.11 => 2.4.12
 - fmtlib: 11.1.4 => 11.2.0

CMakeLists.txt

@@ -27,7 +27,7 @@
 
 # build engine library and all tests
 
-cmake_minimum_required(VERSION 3.22...4.1)
+cmake_minimum_required(VERSION 3.22...4.2)
 
 project(axmol)
 

INFRA.md

@@ -11,8 +11,8 @@
 ## Microsoft.Web.WebView2
 
 - [![nuget](https://img.shields.io/nuget/v/Microsoft.Web.WebView2?label=Upstream)](https://www.nuget.org/packages/Microsoft.Web.WebView2)
-- Version: 1.0.3595.46
-- License: https://www.nuget.org/packages/Microsoft.Web.WebView2/1.0.3595.46/License
+- Version: 1.0.3650.58
+- License: https://www.nuget.org/packages/Microsoft.Web.WebView2/1.0.3650.58/License
 - Platform: Win32
 - Managed by: `cmake/Modules/AXConfigDefine.cmake`
 

axmol/CMakeLists.txt

@@ -32,7 +32,7 @@
 # include_guard (GLOBAL)
 
 # The version number
-set(_AX_VERSION 2.8)
+set(_AX_VERSION 3.0)
 
 if(NOT DEFINED _AX_CORE_LIB)
   set(_AX_CORE_LIB axmol CACHE INTERNAL "The axmol engine lib name")
@@ -596,4 +596,4 @@ elseif(LINUX)
     target_include_directories(${_AX_CORE_LIB} PUBLIC ${WEBKIT2GTK_INCLUDE_DIRS})
     target_link_libraries(${_AX_CORE_LIB} ${WEBKIT2GTK_LIBRARIES})
   endif()
-endif()
+endif()

axmol/audio/AudioEngineImpl.cpp

@@ -44,6 +44,10 @@ static ALCdevice* s_ALDevice           = nullptr;
 static ALCcontext* s_ALContext         = nullptr;
 static ax::AudioEngineImpl* s_instance = nullptr;
 
+#if defined(__APPLE__)
+bool __axmolAudioSessionInterrupted = false;
+#endif
+
 namespace ax
 {
 static void pauseAudioDevice()
@@ -122,15 +126,14 @@ static void resumeAudioDevice()
 
 - (void)handleInterruption:(NSNotification*)notification
 {
-    static bool isAudioSessionInterrupted = false;
-    static bool resumeOnBecomingActive    = false;
+    static bool resumeOnBecomingActive = false;
 
     if ([notification.name isEqualToString:AVAudioSessionInterruptionNotification])
     {
         NSInteger reason = [[[notification userInfo] objectForKey:AVAudioSessionInterruptionTypeKey] integerValue];
         if (reason == AVAudioSessionInterruptionTypeBegan)
         {
-            isAudioSessionInterrupted = true;
+            __axmolAudioSessionInterrupted = true;
 
             AXLOGD("AVAudioSessionInterruptionTypeBegan, alcMakeContextCurrent(nullptr)");
 
@@ -139,7 +142,7 @@ static void resumeAudioDevice()
         }
         else if (reason == AVAudioSessionInterruptionTypeEnded)
         {
-            isAudioSessionInterrupted = false;
+            __axmolAudioSessionInterrupted = false;
 
             if ([UIApplication sharedApplication].applicationState == UIApplicationStateActive)
             {
@@ -174,7 +177,7 @@ static void resumeAudioDevice()
         if (resumeOnBecomingActive)
         {
             resumeOnBecomingActive = false;
-            if (!isAudioSessionInterrupted)
+            if (!__axmolAudioSessionInterrupted)
                 ax::pauseAudioDevice();
 
             AXLOGD("UIApplicationDidBecomeActiveNotification, resume audio device");
@@ -189,7 +192,7 @@ static void resumeAudioDevice()
 
             ax::resumeAudioDevice();
         }
-        else if (isAudioSessionInterrupted)
+        else if (__axmolAudioSessionInterrupted)
         {
             AXLOGD("Audio session is still interrupted!");
         }
@@ -851,7 +854,7 @@ void AudioEngineImpl::stop(AUDIO_ID audioID)
         return;
 
     auto player = iter->second;
-    player->destroy();
+    player->stop();
 
     // Call '_updatePlayersState' method to cleanup immediately since the schedule may be cancelled without any
     // notification.
@@ -863,7 +866,7 @@ void AudioEngineImpl::stopAll()
     std::lock_guard<std::recursive_mutex> lck(_threadMutex);
     for (auto&& player : _audioPlayers)
     {
-        player.second->destroy();
+        player.second->stop();
     }
     // Note: Don't set the flag to false here, it should be set in 'update' function.
     // Otherwise, the state got from alSourceState may be wrong