Remove AccessKit dynamic wrappers, add download script and build warning if libs are missing.

.github/workflows/linux_builds.yml

@@ -13,7 +13,6 @@ env:
   SCONS_FLAGS: >-
     dev_mode=yes
     module_text_server_fb_enabled=yes
-    "accesskit_sdk_path=${{ github.workspace }}/accesskit-c-0.21.1/"
   GODOT_CPP_BRANCH: 4.5
   DOTNET_NOLOGO: true
   DOTNET_CLI_TELEMETRY_OPTOUT: true
@@ -166,15 +165,15 @@ jobs:
           dotnet-version: 8.0.100
 
       - name: Download pre-built AccessKit
-        uses: dsaltares/fetch-gh-release-asset@1.1.2
-        with:
-          repo: godotengine/godot-accesskit-c-static
-          version: tags/0.21.1
-          file: accesskit-c-0.21.1.zip
-          target: accesskit-c-0.21.1/accesskit_c.zip
-
-      - name: Extract pre-built AccessKit
-        run: unzip -o accesskit-c-0.21.1/accesskit_c.zip
+        shell: sh
+        id: accesskit-sdk
+        run: |
+          if python ./misc/scripts/install_accesskit.py; then
+            echo "ACCESSKIT_ENABLED=yes" >> "$GITHUB_OUTPUT"
+          else
+            echo "::warning::AccessKit SDK installation failed, building without AccessKit support."
+            echo "ACCESSKIT_ENABLED=no" >> "$GITHUB_OUTPUT"
+          fi
 
       - name: Install mold linker
         if: matrix.proj-test
@@ -183,7 +182,7 @@ jobs:
       - name: Compilation
         uses: ./.github/actions/godot-build
         with:
-          scons-flags: ${{ env.SCONS_FLAGS }} ${{ matrix.scons-flags }}
+          scons-flags: ${{ env.SCONS_FLAGS }} ${{ matrix.scons-flags }} accesskit=${{ steps.accesskit-sdk.outputs.ACCESSKIT_ENABLED }}
           platform: linuxbsd
           target: ${{ matrix.target }}
 

.github/workflows/macos_builds.yml

@@ -8,7 +8,6 @@ env:
   SCONS_FLAGS: >-
     dev_mode=yes
     module_text_server_fb_enabled=yes
-    "accesskit_sdk_path=${{ github.workspace }}/accesskit-c-0.21.1/"
 
 jobs:
   build-macos:
@@ -51,15 +50,15 @@ jobs:
         uses: ./.github/actions/godot-deps
 
       - name: Download pre-built AccessKit
-        uses: dsaltares/fetch-gh-release-asset@1.1.2
-        with:
-          repo: godotengine/godot-accesskit-c-static
-          version: tags/0.21.1
-          file: accesskit-c-0.21.1.zip
-          target: accesskit-c-0.21.1/accesskit_c.zip
-
-      - name: Extract pre-built AccessKit
-        run: unzip -o accesskit-c-0.21.1/accesskit_c.zip
+        shell: sh
+        id: accesskit-sdk
+        run: |
+          if python3 ./misc/scripts/install_accesskit.py; then
+            echo "ACCESSKIT_ENABLED=yes" >> "$GITHUB_OUTPUT"
+          else
+            echo "::warning::AccessKit SDK installation failed, building without AccessKit support."
+            echo "ACCESSKIT_ENABLED=no" >> "$GITHUB_OUTPUT"
+          fi
 
       - name: Setup Vulkan SDK
         id: vulkan-sdk
@@ -75,14 +74,14 @@ jobs:
       - name: Compilation (x86_64)
         uses: ./.github/actions/godot-build
         with:
-          scons-flags: ${{ env.SCONS_FLAGS }} ${{ matrix.scons-flags }} arch=x86_64 vulkan=${{ steps.vulkan-sdk.outputs.VULKAN_ENABLED }}
+          scons-flags: ${{ env.SCONS_FLAGS }} ${{ matrix.scons-flags }} arch=x86_64 vulkan=${{ steps.vulkan-sdk.outputs.VULKAN_ENABLED }} accesskit=${{ steps.accesskit-sdk.outputs.ACCESSKIT_ENABLED }}
           platform: macos
           target: ${{ matrix.target }}
 
       - name: Compilation (arm64)
         uses: ./.github/actions/godot-build
         with:
-          scons-flags: ${{ env.SCONS_FLAGS }} ${{ matrix.scons-flags }} arch=arm64 vulkan=${{ steps.vulkan-sdk.outputs.VULKAN_ENABLED }}
+          scons-flags: ${{ env.SCONS_FLAGS }} ${{ matrix.scons-flags }} arch=arm64 vulkan=${{ steps.vulkan-sdk.outputs.VULKAN_ENABLED }} accesskit=${{ steps.accesskit-sdk.outputs.ACCESSKIT_ENABLED }}
           platform: macos
           target: ${{ matrix.target }}
 

.github/workflows/windows_builds.yml

@@ -10,7 +10,6 @@ env:
     module_text_server_fb_enabled=yes
     debug_symbols=no
     "angle_libs=${{ github.workspace }}/"
-    "accesskit_sdk_path=${{ github.workspace }}/accesskit-c-0.21.1/"
   SCONS_CACHE_MSVC_CONFIG: true
   PYTHONIOENCODING: utf8
 
@@ -96,20 +95,20 @@ jobs:
         run: Expand-Archive -Force angle/angle.zip ${{ github.workspace }}/
 
       - name: Download pre-built AccessKit
-        uses: dsaltares/fetch-gh-release-asset@1.1.2
-        with:
-          repo: godotengine/godot-accesskit-c-static
-          version: tags/0.21.1
-          file: accesskit-c-0.21.1.zip
-          target: accesskit-c-0.21.1/accesskit_c.zip
-
-      - name: Extract pre-built AccessKit
-        run: unzip -o accesskit-c-0.21.1/accesskit_c.zip
+        shell: sh
+        id: accesskit-sdk
+        run: |
+          if python ./misc/scripts/install_accesskit.py; then
+            echo "ACCESSKIT_ENABLED=yes" >> "$GITHUB_OUTPUT"
+          else
+            echo "::warning::AccessKit SDK installation failed, building without AccessKit support."
+            echo "ACCESSKIT_ENABLED=no" >> "$GITHUB_OUTPUT"
+          fi
 
       - name: Compilation
         uses: ./.github/actions/godot-build
         with:
-          scons-flags: ${{ env.SCONS_FLAGS }} ${{ matrix.scons-flags }} d3d12=${{ steps.d3d12-sdk.outputs.D3D12_ENABLED }}
+          scons-flags: ${{ env.SCONS_FLAGS }} ${{ matrix.scons-flags }} d3d12=${{ steps.d3d12-sdk.outputs.D3D12_ENABLED }} accesskit=${{ steps.accesskit-sdk.outputs.ACCESSKIT_ENABLED }}
           platform: windows
           target: ${{ matrix.target }}
 

SConstruct

@@ -199,8 +199,7 @@ opts.Add(BoolVariable("opengl3", "Enable the OpenGL/GLES3 rendering driver", Tru
 opts.Add(BoolVariable("d3d12", "Enable the Direct3D 12 rendering driver on supported platforms", False))
 opts.Add(BoolVariable("metal", "Enable the Metal rendering driver on supported platforms (Apple arm64 only)", False))
 opts.Add(BoolVariable("use_volk", "Use the volk library to load the Vulkan loader dynamically", True))
-opts.Add(BoolVariable("accesskit", "Use AccessKit C SDK", True))
-opts.Add(("accesskit_sdk_path", "Path to the AccessKit C SDK", ""))
+opts.Add(BoolVariable("accesskit", "Enable the AccessKit driver for screen reader support", True))
 opts.Add(BoolVariable("sdl", "Enable the SDL3 input driver", True))
 opts.Add(
     EnumVariable(

drivers/accesskit/SCsub

@@ -5,12 +5,3 @@ Import("env")
 
 # Driver source files
 env.add_source_files(env.drivers_sources, "accessibility_server_accesskit.cpp")
-
-if env["accesskit_sdk_path"] == "":
-    if env["platform"] == "windows":
-        env.add_source_files(env.drivers_sources, "dynwrappers/accesskit-dll_wrap.c")
-    if env["platform"] == "macos":
-        env.add_source_files(env.drivers_sources, "dynwrappers/accesskit-dylib_wrap.c")
-    if env["platform"] == "linuxbsd":
-        env.add_source_files(env.drivers_sources, "dynwrappers/accesskit-so_wrap.c")
-    env.Prepend(CPPPATH=["#thirdparty/accesskit/include"])

drivers/accesskit/accessibility_server_accesskit.cpp

@@ -32,12 +32,6 @@
 
 #include "accessibility_server_accesskit.h"
 
-#ifdef ACCESSKIT_DYNAMIC
-#include "core/config/engine.h"
-#include "core/io/file_access.h"
-#include "core/os/os.h"
-#endif
-
 #include "servers/text/text_server.h"
 
 _FORCE_INLINE_ accesskit_role AccessibilityServerAccessKit::_accessibility_role(AccessibilityServerEnums::AccessibilityRole p_role) const {
@@ -1707,64 +1701,6 @@ void AccessibilityServerAccessKit::update_set_foreground_color(const RID &p_id,
 }
 
 AccessibilityServer *AccessibilityServerAccessKit::create_func(Error &r_error) {
-#ifdef ACCESSKIT_DYNAMIC
-#ifdef DEBUG_ENABLED
-	int dylibloader_verbose = 1;
-#else
-	int dylibloader_verbose = 0;
-#endif
-	void *library_handle = nullptr;
-	String path;
-	String arch = Engine::get_singleton()->get_architecture_name();
-#ifdef LINUXBSD_ENABLED
-	path = OS::get_singleton()->get_executable_path().get_base_dir().path_join("libaccesskit." + arch + ".so");
-	if (!FileAccess::exists(path)) {
-		path = OS::get_singleton()->get_executable_path().get_base_dir().path_join("../lib").path_join("libaccesskit." + arch + ".so");
-	}
-	if (!FileAccess::exists(path)) {
-		path = OS::get_singleton()->get_executable_path().get_base_dir().path_join("libaccesskit.so");
-	}
-	if (!FileAccess::exists(path)) {
-		path = OS::get_singleton()->get_executable_path().get_base_dir().path_join("../lib").path_join("libaccesskit.so");
-	}
-	if (!FileAccess::exists(path)) {
-		r_error = ERR_CANT_CREATE;
-		return nullptr;
-	}
-#endif
-#ifdef MACOS_ENABLED
-	path = OS::get_singleton()->get_executable_path().get_base_dir().path_join("libaccesskit." + arch + ".dylib");
-	if (!FileAccess::exists(path)) {
-		path = OS::get_singleton()->get_executable_path().get_base_dir().path_join("../Frameworks").path_join("libaccesskit." + arch + ".dylib");
-	}
-	if (!FileAccess::exists(path)) {
-		path = OS::get_singleton()->get_executable_path().get_base_dir().path_join("libaccesskit.dylib");
-	}
-	if (!FileAccess::exists(path)) {
-		path = OS::get_singleton()->get_executable_path().get_base_dir().path_join("../Frameworks").path_join("libaccesskit.dylib");
-	}
-	if (!FileAccess::exists(path)) {
-		r_error = ERR_CANT_CREATE;
-		return nullptr;
-	}
-#endif
-#ifdef WINDOWS_ENABLED
-	path = OS::get_singleton()->get_executable_path().get_base_dir().path_join("accesskit." + arch + ".dll");
-	if (!FileAccess::exists(path)) {
-		path = OS::get_singleton()->get_executable_path().get_base_dir().path_join("accesskit.dll");
-	}
-	if (!FileAccess::exists(path)) {
-		r_error = ERR_CANT_CREATE;
-		return nullptr;
-	}
-#endif
-
-	Error err = OS::get_singleton()->open_dynamic_library(path, library_handle);
-	if (err != OK || initialize_libaccesskit(dylibloader_verbose, library_handle) != 0) {
-		r_error = ERR_CANT_CREATE;
-		return nullptr;
-	}
-#endif
 	print_verbose("Accessibility: AccessKit driver loaded.");
 	r_error = OK;
 	return memnew(AccessibilityServerAccessKit);

drivers/accesskit/accessibility_server_accesskit.h

@@ -35,19 +35,7 @@
 #include "core/templates/rid_owner.h"
 #include "servers/display/accessibility_server.h"
 
-#ifdef ACCESSKIT_DYNAMIC
-#ifdef LINUXBSD_ENABLED
-#include "drivers/accesskit/dynwrappers/accesskit-so_wrap.h"
-#endif
-#ifdef MACOS_ENABLED
-#include "drivers/accesskit/dynwrappers/accesskit-dylib_wrap.h"
-#endif
-#ifdef WINDOWS_ENABLED
-#include "drivers/accesskit/dynwrappers/accesskit-dll_wrap.h"
-#endif
-#else
 #include <accesskit.h>
-#endif
 
 class AccessibilityServerAccessKit : public AccessibilityServer {
 	GDSOFTCLASS(AccessibilityServerAccessKit, AccessibilityServer);