Merge branch 'release/2.x' into dev/v3

Author: halx99

.gitignore

@@ -202,7 +202,7 @@ temp/
 **/SharedLoader.java
 
 # ignore downloaded tools
-tools/external/
+tools/external
 
 # ignore lua-tests res folder which is copy from cpp-tests
 tests/lua-tests/res/

1k/build.profiles

@@ -10,7 +10,7 @@ axslcc=1.13.2+
 
 # The cmake, @gradle @axmol-cmdline
 # as latest as possible
-cmake=3.30.0~4.1.0+
+cmake=3.30.0~4.1.1+
 
 # The ninja
 ninja=1.10.0~1.12.1+

3rdparty/CMakeLists.txt

@@ -189,18 +189,7 @@ if(AX_WITH_JPEG AND NOT WINRT AND NOT EMSCRIPTEN)
   ax_add_3rd(jpeg-turbo)
 endif()
 
-add_subdirectory(openssl)
-
-if(ANDROID OR LINUX)
-  target_link_libraries(OpenSSL::SSL INTERFACE OpenSSL::Crypto)
-  target_link_libraries(3rdparty INTERFACE OpenSSL::SSL)
-else()
-  target_link_libraries(3rdparty
-    INTERFACE OpenSSL::Crypto
-    INTERFACE OpenSSL::SSL)
-endif()
-
-target_compile_definitions(3rdparty INTERFACE OPENSSL_SUPPRESS_DEPRECATED=1)
+ax_add_3rd(openssl TARGETS OpenSSL::SSL)
 
 if(AX_WITH_WEBP)
   ax_add_3rd(webp)
@@ -244,10 +233,6 @@ endif()
 
 if(AX_WITH_CURL AND NOT EMSCRIPTEN)
   ax_add_3rd(curl)
-
-  if(ANDROID OR LINUX)
-    target_link_libraries(curl INTERFACE OpenSSL::SSL)
-  endif()
 endif()
 
 if(AX_ENABLE_AUDIO)

3rdparty/curl/CMakeLists.txt

@@ -29,3 +29,7 @@ else()
     IMPORTED_LOCATION "${curl_LIB_DIR}/lib${lib_name}.a"
   )
 endif()
+
+if(ANDROID OR LINUX)
+  target_link_libraries(curl INTERFACE OpenSSL::SSL)
+endif()

3rdparty/openssl/CMakeLists.txt

@@ -55,3 +55,7 @@ set_openssl_sub_target(${target_name})
 # -----sub target 2: crypto-----
 set(target_name OpenSSL::Crypto crypto)
 set_openssl_sub_target(${target_name})
+
+# Ensure OpenSSL::SSL automatically propagates its dependency on OpenSSL::Crypto
+target_link_libraries(OpenSSL::SSL INTERFACE OpenSSL::Crypto)
+target_compile_definitions(OpenSSL::SSL INTERFACE OPENSSL_SUPPRESS_DEPRECATED=1)

3rdparty/yasio/CMakeLists.txt

@@ -1,4 +1,3 @@
-
 set(lib_name yasio)
 set(target_name ${lib_name})
 
@@ -40,3 +39,7 @@ if(kcp_SOURCE_DIR)
   target_compile_definitions(${target_name} PUBLIC YASIO_ENABLE_KCP=1)
   target_include_directories(${target_name} PUBLIC ${kcp_SOURCE_DIR})
 endif()
+
+if(ANDROID OR LINUX)
+    target_link_libraries(yasio INTERFACE OpenSSL::SSL)
+endif()

CHANGELOG.md

@@ -1,20 +1,26 @@
-# axmol-2.8.0 ?? 2025
+# axmol-2.8.0 Sep.1 2025
 
 ## Bug fixes
 
+- Fix #2669: Windows UWP not running on Windows 11 due to DriverGL initialization failure by @halx99
+- Fix #2655: Multi-touch not work on android scene contains imgui layer by @halx99
+- Fix #2674: OpenSSL not linkage for final app on Linux by @halx99 in https://github.com/axmolengine/axmol/pull/2675
 - Fix incorrect FontAtlas when switching label rendering mode from normal to SDF by @halx99 in https://github.com/axmolengine/axmol/pull/2629
 - Fix wasm Device::getTextureDataForText will report exception when process whitespace text by @halx99
 - Fix linux label color incorrect when LabelType is STRING_TEXTURE by @halx99
 - Fix incorrect fmt::format_to use case by @halx99 in https://github.com/axmolengine/axmol/pull/2612
 - Fix llvm ver trim in genbindings.ps1 by @halx99
 - Fix Label SDF rendering issues with font resizing and other bugs by @halx99 in https://github.com/axmolengine/axmol/pull/2625
+- Fix compile error when project contains swift code by @halx99 in https://github.com/axmolengine/axmol/pull/2632
+- Fix wasm Downloader open file with wrong permision (#2666) by @AlexandreK38 in https://github.com/axmolengine/axmol/pull/2666
+- Fix failure in CMake 4.1 when targeting Windows: assembler not found by @halx99
 
 ## Improvements
 
 - Improve apple ios platform render view creation by @halx99 in https://github.com/axmolengine/axmol/pull/2600
 - Rename GLView to RenderView by @halx99 in https://github.com/axmolengine/axmol/pull/2602
 - Mention emsdk downgrading notice in version 2.6.0 release notes by @halx99
-- Improve wasm dev setup description by @halx99
+- Improve wasm dev setup notice by @halx99
 - Rename `GLContextAttrs` to `GfxContextAttrs` by @halx99
 - Update pull_request_template.md by @aismann in https://github.com/axmolengine/axmol/pull/2609
 - Improve utf8 chars counting, remove strlen call by @halx99 in https://github.com/axmolengine/axmol/pull/2614
@@ -24,12 +30,17 @@
 - Use pragma once for more header files by @halx99 in https://github.com/axmolengine/axmol/pull/2616
 - Add support set window size limits by @NgVThangBz in https://github.com/axmolengine/axmol/pull/2618
 - Renamed cpp-tests "Node: Label - New API" to "Node: Label" by @aismann in https://github.com/axmolengine/axmol/pull/2627
+- Update ImGui mult-viewports hint message by @halx99
+- Improve tests (Naming of menu entries on cpp-/lua- tests) by @aismann in https://github.com/axmolengine/axmol/pull/2640
+- Move SIMD availability detection into its own CMake file by @j-jorge in https://github.com/axmolengine/axmol/pull/2642
+- Setting CMAKE_MSVC_DEBUG_INFORMATION_FORMAT to Embedded to resolve pdb too large problem by @halx99
+- Improve NuGet package management by @halx99 in https://github.com/axmolengine/axmol/pull/2671
 
 ## SDK & Tools updates
 
 - agp: 8.11.0 => 8.11.1
 - gradle: 8.14.3 => 9.0.0
-- cmake: 4.0.3 => 4.1.0
+- cmake: 4.0.3 => 4.1.1
 
 ## 3rdparty updates
 

CMakeOptions.md

@@ -39,7 +39,7 @@
 - AX_WITH_XXX: usually user don't need care it
 - AX_RENDER_API: specify render api: gl, mtl, d3d, default: `auto`
 - AX_GLES_PROFILE: specify GLES profile version, only works when selected render api is `gl`, default: `300`, valid value `300`, `310`
-- AX_CORE_PROFILE: whether strip all deprecated features, default `FALSE`, it's useful to pre-upgrade your game project to adapte future axmol versions
+- AX_CORE_PROFILE: whether strip all deprecated features, default `FALSE`, Setting this to `TRUE` before upgrading your game project helps ensure compatibility with future Axmol versions.
 - AX_ISA_LEVEL: specifiy SIMD Instructions Acceleration Level: 0~4, 0: disabled, 1: SSE2, 2: SSE4.1/NEON, 3: SSE4.2, 4: AVX2, default: 2
 - AX_WASM_THREADS: specify wasm thread count, valid value: number: `>=0` , string: must be: `auto` or `navigator.hardwareConcurrency`(default), 
    - number: explicit set thread count, `0` means disable wasm thread support

INFRA.md

@@ -1,16 +1,24 @@
 # The axmol sdk & tools references
 
-## cppwinrt
+## Microsoft.Windows.CppWinRT
 
-- [![Upstream](https://img.shields.io/github/v/release/microsoft/cppwinrt?label=Upstream)](https://github.com/microsoft/cppwinrt)
+- [![nuget](https://img.shields.io/nuget/v/Microsoft.Windows.CppWinRT?label=Upstream)](https://www.nuget.org/packages/Microsoft.Windows.CppWinRT)
 - Version: 2.0.250303.1
 - License: MIT
 - Platform: WinRT/WinUWP
 - Manged by: `cmake/Modules/AXConfigDefine.cmake`
 
+## 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.3045.78
+- License: https://www.nuget.org/packages/Microsoft.Web.WebView2/1.0.3405.78/License
+- Platform: Win32
+- Managed by: `cmake/Modules/AXConfigDefine.cmake`
+
 ## gradle
 
-- [![Upstream](https://img.shields.io/github/v/release/gradle/gradle?label=Upstream)](https://github.com/gradle/gradle)
+- [![github](https://img.shields.io/github/v/release/gradle/gradle?label=Upstream)](https://github.com/gradle/gradle)
 - Version: 9.0.0
 - License: Apache-2.0
 - Platform: Android

axmol/CMakeLists.txt

@@ -32,7 +32,7 @@
 # include_guard (GLOBAL)
 
 # The version number
-set(_AX_VERSION 2.7)
+set(_AX_VERSION 2.8)
 
 if(NOT DEFINED _AX_CORE_LIB)
   set(_AX_CORE_LIB axmol CACHE INTERNAL "The axmol engine lib name")
@@ -430,27 +430,26 @@ if(WINDOWS)
   endif()
 
   if(WINDOWS_STORE)
-    file(TO_NATIVE_PATH ${CMAKE_BINARY_DIR} AX_TOP_SOLUTION_DIR)
     configure_file(${_AX_ROOT}/cmake/CppWinRT.props.in ${CMAKE_BINARY_DIR}/CppWinRT.props @ONLY)
 
     # intsall cppwinrt package for xaml apps
     execute_process(COMMAND "${NUGET_EXE}"
-      install "Microsoft.Windows.CppWinRT" -Version ${AX_CPPWINRT_VERSION} -ExcludeVersion -OutputDirectory "${CMAKE_BINARY_DIR}/packages")
+      install "Microsoft.Windows.CppWinRT" -Version ${AX_CPPWINRT_VERSION} -ExcludeVersion -OutputDirectory "${_NUGET_PACKAGE_DIR}")
     set_target_properties(${_AX_CORE_LIB} PROPERTIES
-      VS_PROJECT_IMPORT ${CMAKE_BINARY_DIR}/packages/Microsoft.Windows.CppWinRT/build/native/Microsoft.Windows.CppWinRT.props
+      VS_PROJECT_IMPORT ${_NUGET_PACKAGE_DIR}/Microsoft.Windows.CppWinRT/build/native/Microsoft.Windows.CppWinRT.props
     )
-    target_link_libraries(${_AX_CORE_LIB} ${CMAKE_BINARY_DIR}/packages/Microsoft.Windows.CppWinRT/build/native/Microsoft.Windows.CppWinRT.targets)
+    target_link_libraries(${_AX_CORE_LIB} ${_NUGET_PACKAGE_DIR}/Microsoft.Windows.CppWinRT/build/native/Microsoft.Windows.CppWinRT.targets)
   endif()
 
   if(AX_ENABLE_MSEDGE_WEBVIEW2)
     execute_process(COMMAND "${NUGET_EXE}"
-      install "Microsoft.Web.WebView2" -Version 1.0.992.28 -ExcludeVersion -OutputDirectory "${CMAKE_BINARY_DIR}/packages")
+      install "Microsoft.Web.WebView2" -Version ${AX_MSEDGE_WEBVIEW2_VERSION} -ExcludeVersion -OutputDirectory "${_NUGET_PACKAGE_DIR}")
 
     if(CMAKE_GENERATOR MATCHES "Ninja")
-      target_link_libraries(${_AX_CORE_LIB} ${CMAKE_BINARY_DIR}/packages/Microsoft.Web.WebView2/build/native/${ARCH_ALIAS}/WebView2Loader.dll.lib)
-      target_include_directories(${_AX_CORE_LIB} PUBLIC ${CMAKE_BINARY_DIR}/packages/Microsoft.Web.WebView2/build/native/include)
+      target_link_libraries(${_AX_CORE_LIB} ${_NUGET_PACKAGE_DIR}/Microsoft.Web.WebView2/build/native/${ARCH_ALIAS}/WebView2Loader.dll.lib)
+      target_include_directories(${_AX_CORE_LIB} PUBLIC ${_NUGET_PACKAGE_DIR}/Microsoft.Web.WebView2/build/native/include)
     else()
-      target_link_libraries(${_AX_CORE_LIB} ${CMAKE_BINARY_DIR}/packages/Microsoft.Web.WebView2/build/native/Microsoft.Web.WebView2.targets)
+      target_link_libraries(${_AX_CORE_LIB} ${_NUGET_PACKAGE_DIR}/Microsoft.Web.WebView2/build/native/Microsoft.Web.WebView2.targets)
     endif()
   endif()
 endif()