Add debian-12 support (#2946)

Author: halx99

1k/build.profiles

@@ -6,7 +6,7 @@
 # --- region platfom:common
 
 # The axmol shader compiler, legacy name is 'glslcc' before axmol-2.3.0
-axslcc=3.3.0+
+axslcc=3.3.1+
 
 # The cmake, @gradle @axmol-cmdline
 # as latest as possible

3rdparty/yasio/yasio/tlx/string.hpp

@@ -81,7 +81,7 @@ class basic_string {
   __compressed_pair<allocator_type, _Str_storage> _Mypair;
 
   basic_string() : _Mypair(__zero_then_variadic_args_t{}) {}
-  basic_string(nullptr_t) = delete;
+  basic_string(::std::nullptr_t) = delete;
   explicit basic_string(size_type count) : _Mypair(__one_then_variadic_args_t{}, _Alloc{}) { resize(static_cast<size_type>(count)); }
   basic_string(size_type count, const_reference val) : _Mypair(__one_then_variadic_args_t{}, _Alloc{}) { resize(static_cast<size_type>(count), val); }
   template <typename _Iter, _TLX enable_if_t<_TLX is_iterator<_Iter>::value, int> = 0>

axmol/CMakeLists.txt

@@ -50,6 +50,25 @@ endif()
 
 include(CMakeDependentOption)
 
+# check linux system libraries
+if(LINUX)
+  find_package(X11 REQUIRED)
+  
+  # including GTK3.0 and WebKit2Gtk4.x
+  find_package(PkgConfig REQUIRED)
+  pkg_check_modules(GTK3 REQUIRED gtk+-3.0)
+
+  set(_webkit2gtk_vers "4.1;4.0")
+
+  foreach(_ver ${_webkit2gtk_vers})
+    pkg_check_modules(WEBKIT2GTK webkit2gtk-${_ver})
+
+    if(WEBKIT2GTK_LIBRARY_DIRS)
+      break()
+    endif()
+  endforeach()
+endif()
+
 set(AX_RENDER_API "auto" CACHE STRING "Specify axmol graphics render API")
 set_property(CACHE AX_RENDER_API PROPERTY STRINGS d3d11 d3d12 vk mtl gl)
 
@@ -406,6 +425,10 @@ ax_config_pred(${_AX_CORE_LIB} AX_ENABLE_VR)
 ax_config_pred(${_AX_CORE_LIB} AX_CORE_PROFILE)
 ax_config_pred(${_AX_CORE_LIB} AX_ENABLE_WAYLAND)
 
+if(LINUX AND WEBKIT2GTK_FOUND)
+  target_compile_definitions(${_AX_CORE_LIB} PUBLIC AX_HAVE_WEBKIT2GTK=1)
+endif()
+
 # add base macro define and compile options
 use_ax_compile_define(${_AX_CORE_LIB})
 use_ax_compile_options(${_AX_CORE_LIB})
@@ -548,29 +571,29 @@ if(ANDROID)
       target_link_libraries(${_AX_CORE_LIB} ${AX_LUA_ENGINE})
     endif()
   endif()
-endif()
-
-if(LINUX)
-  find_package(X11 REQUIRED)
+elseif(LINUX)
   target_include_directories(${_AX_CORE_LIB} PUBLIC "${X11_X11_INCLUDE_PATH}")
 
-  # X11 gets linked by cmake/Modules/AXLinkHelpers.cmake
-
-  # including GTK3.0 and WebKit2Gtk4.x
-  find_package(PkgConfig REQUIRED)
-  pkg_check_modules(GTK3 REQUIRED gtk+-3.0)
-
-  set(_webkit2gtk_vers "4.1;4.0")
-
-  foreach(_ver ${_webkit2gtk_vers})
-    pkg_check_modules(WEBKIT2GTK webkit2gtk-${_ver})
-
-    if(WEBKIT2GTK_LIBRARY_DIRS)
-      break()
+  # remove system freetype2 due to we already embed freetype
+  set(_gtk_includes "")
+  set(_filtered_freetype FALSE)
+  foreach(dir IN LISTS GTK3_INCLUDE_DIRS)
+    if(NOT dir MATCHES "freetype2")
+      list(APPEND _gtk_includes "${dir}")
+    else()
+      set(_filtered_freetype TRUE)
     endif()
   endforeach()
 
-  target_include_directories(${_AX_CORE_LIB} PUBLIC ${GTK3_INCLUDE_DIRS} ${WEBKIT2GTK_INCLUDE_DIRS})
-  target_link_directories(${_AX_CORE_LIB} PRIVATE ${GTK3_LIBRARY_DIRS} ${WEBKIT2GTK_LIBRARY_DIRS})
-  target_link_libraries(${_AX_CORE_LIB} ${GTK3_LIBRARIES} ${WEBKIT2GTK_LIBRARIES})
-endif()
+  if(_filtered_freetype)
+    message(STATUS "GTK3: filtered out system freetype include directory")
+  endif()
+
+  target_include_directories(${_AX_CORE_LIB} PUBLIC ${_gtk_includes})
+  target_link_directories(${_AX_CORE_LIB} PRIVATE ${GTK3_LIBRARY_DIRS})
+
+  if(WEBKIT2GTK_FOUND)
+    target_include_directories(${_AX_CORE_LIB} PUBLIC ${WEBKIT2GTK_INCLUDE_DIRS})
+    target_link_libraries(${_AX_CORE_LIB} ${WEBKIT2GTK_LIBRARIES})
+  endif()
+endif()

axmol/ui/UIWebView/UIWebView.cpp

@@ -35,7 +35,7 @@
 #    include "axmol/ui/UIWebView/UIWebViewImpl-win32.h"
 #    include "axmol/ui/UIWebView/UIWebView-inl.h"
 
-#elif (AX_TARGET_PLATFORM == AX_PLATFORM_LINUX)
+#elif (AX_TARGET_PLATFORM == AX_PLATFORM_LINUX) && defined(AX_HAVE_WEBKIT2GTK)
 
 #    include "axmol/ui/UIWebView/UIWebViewImpl-linux.h"
 #    include "axmol/ui/UIWebView/UIWebView-inl.h"

axmol/ui/UIWebView/UIWebView.h

@@ -31,7 +31,7 @@
 
 #if (defined(_WIN32) && defined(AX_ENABLE_MSEDGE_WEBVIEW2)) ||                             \
     (AX_TARGET_PLATFORM == AX_PLATFORM_ANDROID || AX_TARGET_PLATFORM == AX_PLATFORM_IOS || \
-     AX_TARGET_PLATFORM == AX_PLATFORM_LINUX)
+     (AX_TARGET_PLATFORM == AX_PLATFORM_LINUX && defined(AX_HAVE_WEBKIT2GTK)))
 /**
  * @addtogroup ui
  * @{

axmol/ui/UIWebView/UIWebViewImpl-linux.cpp

@@ -28,7 +28,7 @@
 
 #include "axmol/ui/UIWebView/UIWebViewImpl-linux.h"
 
-#if (AX_TARGET_PLATFORM == AX_PLATFORM_LINUX)
+#if (AX_TARGET_PLATFORM == AX_PLATFORM_LINUX) && defined(AX_HAVE_WEBKIT2GTK)
 
 #    include <sys/stat.h>
 #    include <chrono>  // chrono_literals

axmol/ui/UIWebView/UIWebViewImpl-linux.h

@@ -26,7 +26,7 @@
 
 #include "axmol/platform/PlatformMacros.h"
 
-#if (AX_TARGET_PLATFORM == AX_PLATFORM_LINUX)
+#if (AX_TARGET_PLATFORM == AX_PLATFORM_LINUX) && defined(AX_HAVE_WEBKIT2GTK)
 
 #    include <string>
 #    include "axmol/platform/StdC.h"

manifest.json

@@ -15,7 +15,7 @@
       "kcp": "skywind3000/kcp.git",
       "lz4": "lz4/lz4.git",
       "sample-assets": "axmolengine/axmol-sample-assets.git",
-      "axslcc": "axmolengine/axslcc/releases/download"
+      "axslcc": "simdsoft/axslcc/releases/download"
     },
     "gitee":
     {

setup.ps1

@@ -325,7 +325,7 @@ else {
             if ($LinuxDistro -eq 'Debian') {
                 println "It will take few minutes"
                 $os_name = $PSVersionTable.OS
-                $os_ver = [Regex]::Match($os_name, '(\d+\.)+(\*|\d+)(\-[a-z0-9]+)?').Value
+                $os_ver = [Regex]::Match($os_name, '\d+(\.\d+)*(-[a-z0-9]+)?').Value
                 if (($os_name -match 'Ubuntu' -and [VersionEx]$os_ver -ge [VersionEx]'24.04') -or
                     ($os_name -match 'Debian' -and [VersionEx]$os_ver -ge [VersionEx]'13')) {
                     $webkit2gtk_dev = 'libwebkit2gtk-4.1-dev'

tests/cpp-tests/CMakeLists.txt

@@ -363,7 +363,7 @@ if(AX_ENABLE_MEDIA)
     Source/UITest/CocoStudioGUITest/UIVideoPlayerTest/UIVideoPlayerTest.cpp)
 endif()
 
-if(ANDROID OR IOS OR LINUX OR(WINDOWS AND AX_ENABLE_MSEDGE_WEBVIEW2))
+if(ANDROID OR IOS OR (LINUX AND WEBKIT2GTK_FOUND) OR(WINDOWS AND AX_ENABLE_MSEDGE_WEBVIEW2))
   list(APPEND GAME_HEADER
     Source/UITest/CocoStudioGUITest/UIWebViewTest/UIWebViewTest.h
   )