Merge branch 'release/2.x' into dev

halx99 · halx99 · commit a4cafa314ccb · 2025-11-13T19:24:31.000+08:00
diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt
@@ -237,7 +237,7 @@ endif()
 
 if(AX_ENABLE_AUDIO)
   # The openal-soft(LGPL 2.1)
-  if(AX_USE_ALSOFT)
+  if(NOT EMSCRIPTEN)
     set(alsoft_opts
       "ALSOFT_DLOPEN OFF"
       "ALSOFT_UTILS OFF"
@@ -289,7 +289,6 @@ if(AX_ENABLE_AUDIO)
 
     ax_add_3rd(openal EXCLUDE_FROM_ALL TARGETS OpenAL;alsoft.common OPTIONS ${alsoft_opts})
 
-    target_compile_definitions(3rdparty INTERFACE AX_USE_ALSOFT=1)
     set_target_properties(OpenAL alsoft.common PROPERTIES CXX_STANDARD ${_AX_CXX_STD})
 
     if(AX_USE_ALSOFT_STATIC)
diff --git a/3rdparty/README.md b/3rdparty/README.md
@@ -42,7 +42,7 @@
 
 ## curl
 - [![Upstream](https://img.shields.io/github/v/release/curl/curl?label=Upstream)](https://github.com/curl/curl)
-- Version: 8.16.0
+- Version: 8.17.0
 - License: Curl (MIT/X)
 
 ## doctest
@@ -124,7 +124,7 @@
 
 - luajit
   - Upstream: https://github.com/LuaJIT/LuaJIT
-  - Version: 2.1-871db2c
+  - Version: 2.1-68354f4
   - License: MIT
 
 - tolua
diff --git a/CMakeOptions.md b/CMakeOptions.md
@@ -18,9 +18,6 @@
   - AX_ENABLE_VR: whether to enable generic VR renderer support, status: `experimental`, default: `FALSE`
   - AX_ENABLE_WAYLAND: whether to enable linux wayland, default: `FALSE`
 - AX_USE_XXX:
-  - AX_USE_ALSOFT: whether use openal-soft for all platforms
-    - Apple platform: Use openal-soft instead system deprecated: `OpenAL.framework`
-    - Other platforms: Always use openal-soft even this option not enabled
   - AX_USE_LUAJIT: whether use luajit, default: `FALSE`, use plainlua
 - AX_ENABLE_EXT_XXX for extensions
   - AX_ENABLE_EXT_GUI: the traditional GUI extension, default: `TRUE`
diff --git a/axmol/CMakeLists.txt b/axmol/CMakeLists.txt
@@ -126,12 +126,6 @@ cmake_dependent_option(AX_ENABLE_VLC_MEDIA "Enabling vlc media" OFF "(WIN32 AND
 
 cmake_dependent_option(AX_ENABLE_WAYLAND "Enabling linux wayland" OFF "LINUX" OFF)
 
-if(NOT APPLE AND(NOT EMSCRIPTEN))
-  set(AX_USE_ALSOFT ON CACHE BOOL "" FORCE)
-else()
-  option(AX_USE_ALSOFT "Use ALSOFT on apple" OFF)
-endif()
-
 option(AX_ENABLE_PHYSICS "Build Physics support" ON)
 cmake_dependent_option(AX_ENABLE_MEDIA "Build media support" ON "AX_ENABLE_MFMEDIA OR AX_ENABLE_VLC_MEDIA OR APPLE OR ANDROID" OFF)
 option(AX_ENABLE_AUDIO "Build audio support" ON)
diff --git a/axmol/audio/CMakeLists.txt b/axmol/audio/CMakeLists.txt
@@ -24,7 +24,7 @@ set(_AX_AUDIO_SRC
   audio/AudioEngineImpl.cpp
 )
 
-if (AX_USE_ALSOFT)
+if (NOT EMSCRIPTEN)
   set(_AX_AUDIO_HEADER ${_AX_AUDIO_HEADER}
     audio/AudioEffectsExtension.h
   )
diff --git a/axmol/base/Director.cpp b/axmol/base/Director.cpp
@@ -998,6 +998,9 @@ Scene* Director::popPreviousSceneOut()
 
 void Director::end()
 {
+    auto app = Application::getInstance();
+    if (app)
+        app->applicationWillQuit();
     _cleanupDirectorInNextLoop = true;
 }
 
diff --git a/axmol/platform/ApplicationBase.h b/axmol/platform/ApplicationBase.h
@@ -91,6 +91,16 @@ class AX_DLL ApplicationBase
      */
     virtual void applicationWillEnterForeground() = 0;
 
+    /**
+     * @brief  This function will be called when the application is about to quit.
+     *         Typically triggered when the user clicks the close button or requests
+     *         to exit the application.
+     * @return void
+     * @lua NA
+     * @since axmol-2.10.0
+     */
+    virtual void applicationWillQuit() {};
+
     /**
      * @brief    Callback by Director for limit FPS.
      * @param interval The time, expressed in seconds, between current frame and next.
diff --git a/cmake/Modules/AXBuildHelpers.cmake b/cmake/Modules/AXBuildHelpers.cmake
@@ -539,7 +539,7 @@ function(ax_setup_app_config app_name)
 
   target_link_libraries(${app_name} ${_AX_EXTENSION_LIBS})
 
-  if(XCODE AND AX_ENABLE_AUDIO AND AX_USE_ALSOFT AND ALSOFT_OSX_FRAMEWORK)
+  if(XCODE AND AX_ENABLE_AUDIO AND ALSOFT_OSX_FRAMEWORK)
     # Embedded soft_oal embedded framework
     # XCODE_LINK_BUILD_PHASE_MODE BUILT_ONLY
     # ???Xcode limition: XCODE_EMBED_FRAMEWORKS_CODE_SIGN_ON_COPY works for first app
diff --git a/cmake/Modules/AXConfigDepend.cmake b/cmake/Modules/AXConfigDepend.cmake
@@ -2,8 +2,6 @@ macro(ax_depend)
   # confim the libs, prepare to link
   set(PLATFORM_SPECIFIC_LIBS)
 
-  message(STATUS "AX_USE_ALSOFT=${AX_USE_ALSOFT}")
-
   if(WINDOWS)
     list(APPEND PLATFORM_SPECIFIC_LIBS ws2_32 userenv psapi winmm Version Iphlpapi)
 
@@ -51,14 +49,6 @@ macro(ax_depend)
       ${COREMEDIA_LIBRARY}
     )
 
-    if(AX_ENABLE_AUDIO AND NOT AX_USE_ALSOFT)
-      find_library(OPENAL_LIBRARY OpenAL)
-      set(_AX_APPLE_LIBS
-        ${OPENAL_LIBRARY}
-        ${_AX_APPLE_LIBS}
-      )
-    endif()
-
     if(MACOSX)
       list(APPEND PREBUILT_SPECIFIC_LIBS GLFW3)
 
diff --git a/cmake/Modules/AXLinkHelpers.cmake b/cmake/Modules/AXLinkHelpers.cmake
@@ -61,7 +61,6 @@ function(ax_link_cxx_prebuilt APP_NAME AX_ROOT_DIR AX_PREBUILT_DIR)
     target_compile_definitions(${APP_NAME} PRIVATE AX_GLES_PROFILE=0)
   endif()
 
-  ax_config_pred(${APP_NAME} AX_USE_ALSOFT)
   ax_config_pred(${APP_NAME} AX_ENABLE_MSEDGE_WEBVIEW2)
   ax_config_pred(${APP_NAME} AX_ENABLE_PHYSICS)
   ax_config_pred(${APP_NAME} AX_ENABLE_3D)
diff --git a/manifest.json b/manifest.json
@@ -1,6 +1,6 @@
 {
   "versions": {
-    "1kdist": "v108",
+    "1kdist": "v109",
     "oboe": "1.10.0",
     "kcp": "v1.7-f4f3a89",
     "opus": "v1.5.2",
diff --git a/templates/cpp/Source/AppDelegate.cpp b/templates/cpp/Source/AppDelegate.cpp
@@ -127,3 +127,5 @@ void AppDelegate::applicationWillEnterForeground()
     AudioEngine::resumeAll();
 #endif
 }
+
+void AppDelegate::applicationWillQuit() {}
diff --git a/templates/cpp/Source/AppDelegate.h b/templates/cpp/Source/AppDelegate.h
@@ -56,4 +56,10 @@ class AppDelegate : private ax::Application
     @brief  Called when the application reenters the foreground
     */
     void applicationWillEnterForeground() override;
+
+    /**
+        @brief Called when application will quit
+    @since axmol-2.10.0
+        */
+    void applicationWillQuit() override;
 };
diff --git a/templates/lua/Source/AppDelegate.cpp b/templates/lua/Source/AppDelegate.cpp
@@ -119,3 +119,5 @@ void AppDelegate::applicationWillEnterForeground()
     AudioEngine::resumeAll();
 #endif
 }
+
+void AppDelegate::applicationWillQuit() {}
diff --git a/templates/lua/Source/AppDelegate.h b/templates/lua/Source/AppDelegate.h
@@ -56,4 +56,10 @@ class AppDelegate : private ax::Application
     @brief  Called when the application reenters the foreground
     */
     void applicationWillEnterForeground() override;
+
+    /**
+    @brief Called when application will quit
+    @since axmol-2.10.0
+    */
+    void applicationWillQuit() override;
 };
diff --git a/tests/cpp-tests/Source/AppDelegate.cpp b/tests/cpp-tests/Source/AppDelegate.cpp
@@ -184,6 +184,11 @@ void AppDelegate::applicationWillEnterForeground()
     Director::getInstance()->startAnimation();
 }
 
+void AppDelegate::applicationWillQuit()
+{
+    TestController::destroyInstance();
+}
+
 void AppDelegate::applicationScreenSizeChanged(int newWidth, int newHeight)
 {
     AXLOGI("AppDelegate::applicationScreenSizeChanged: ({},{})", newWidth, newHeight);
diff --git a/tests/cpp-tests/Source/AppDelegate.h b/tests/cpp-tests/Source/AppDelegate.h
@@ -52,16 +52,24 @@ class AppDelegate : private ax::Application
 
     /**
     @brief  Called when the application moves to the background
-    @param  the pointer of the application
     */
     void applicationDidEnterBackground() override;
 
     /**
     @brief  Called when the application reenters the foreground
-    @param  the pointer of the application
     */
     void applicationWillEnterForeground() override;
 
+    /**
+    @brief Called when application will quit
+    @since axmol-2.10.0
+    */
+    void applicationWillQuit() override;
+
+    /**
+    @brief Called when application screen size changed
+    @since axmol-3.0
+    */
     void applicationScreenSizeChanged(int newWidth, int newHeight) override;
 
 private:
diff --git a/tests/cpp-tests/Source/BaseTest.cpp b/tests/cpp-tests/Source/BaseTest.cpp
@@ -145,8 +145,12 @@ TestList::~TestList()
 void TestList::deatchTableView()
 {
     if (_tableView)
+    {
         _tableView->setDataSource(nullptr);
-    AX_SAFE_RELEASE_NULL(_tableView);
+        _tableView->removeFromParentAndCleanup(true);
+        _tableView->release();
+        _tableView = nullptr;
+    }
 }
 
 void TestList::addTest(std::string_view testName, std::function<TestBase*()> callback)
@@ -181,6 +185,7 @@ void TestList::runThisTest()
     auto origin      = director->getVisibleOrigin();
     deatchTableView();
     _tableView = TestCustomTableView::create(this, Size(400, visibleSize.height));
+    _tableView->retain();  // retain for we can safe detach
     _tableView->setPosition(origin.x + (visibleSize.width - 400) / 2, origin.y);
     _tableView->setDirection(ScrollView::Direction::VERTICAL);
     _tableView->setVerticalFillOrder(TableView::VerticalFillOrder::TOP_DOWN);

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ set(_AX_AUDIO_SRC`
`24`	`24`	`audio/AudioEngineImpl.cpp`
`25`	`25`	`)`
`26`	`26`
`27`		`-if (AX_USE_ALSOFT)`
	`27`	`+if (NOT EMSCRIPTEN)`
`28`	`28`	`set(_AX_AUDIO_HEADER ${_AX_AUDIO_HEADER}`
`29`	`29`	`audio/AudioEffectsExtension.h`
`30`	`30`	`)`
Original file line number	Diff line number	Diff line change
`@@ -998,6 +998,9 @@ Scene* Director::popPreviousSceneOut()`
`998`	`998`
`999`	`999`	`void Director::end()`
`1000`	`1000`	`{`
	`1001`	`+ auto app = Application::getInstance();`
	`1002`	`+ if (app)`
	`1003`	`+ app->applicationWillQuit();`
`1001`	`1004`	`_cleanupDirectorInNextLoop = true;`
`1002`	`1005`	`}`
`1003`	`1006`