godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-09 12:50:35 +00:00
Code Releases Wiki Activity

Fix uiautomationcore linking in 32-bit x86 MinGW builds.

Browse Source
This commit is contained in:
Pāvels Nadtočajevs
2025-04-26 10:01:45 +03:00
parent e37c6261ea
commit 3e8c99b346
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
platform/windows/SCsub
View File

@@ -61,6 +61,7 @@ env.add_source_files(sources, common_win)
sources += res_obj sources += res_obj
if env["accesskit"] and not env.msvc: if env["accesskit"] and not env.msvc:
env["BUILDERS"]["DEF"].emitter = redirect_emitter
def_file = "uiautomationcore." + env["arch"] + ".def" def_file = "uiautomationcore." + env["arch"] + ".def"
def_target = "libuiautomationcore." + env["arch"] + ".a" def_target = "libuiautomationcore." + env["arch"] + ".a"
def_obj = env.DEF(def_target, def_file) def_obj = env.DEF(def_target, def_file)

5
platform/windows/detect.py
View File

@@ -254,7 +254,9 @@ def build_def_file(target, source, env: "SConsEnvironment"):
} }
cmdbase = "dlltool -m " + arch_aliases[env["arch"]] cmdbase = "dlltool -m " + arch_aliases[env["arch"]]
if env["arch"] != "x86_32": if env["arch"] == "x86_32":
cmdbase += " -k"
else:
cmdbase += " --no-leading-underscore" cmdbase += " --no-leading-underscore"
mingw_bin_prefix = get_mingw_bin_prefix(env["mingw_prefix"], env["arch"]) mingw_bin_prefix = get_mingw_bin_prefix(env["mingw_prefix"], env["arch"])
@@ -857,6 +859,7 @@ def configure_mingw(env: "SConsEnvironment"):
env.Append(LIBPATH=[env["accesskit_sdk_path"] + "/lib/windows/x86_64/mingw/static/"]) env.Append(LIBPATH=[env["accesskit_sdk_path"] + "/lib/windows/x86_64/mingw/static/"])
elif env["arch"] == "x86_32": elif env["arch"] == "x86_32":
env.Append(LIBPATH=[env["accesskit_sdk_path"] + "/lib/windows/x86/mingw/static/"]) env.Append(LIBPATH=[env["accesskit_sdk_path"] + "/lib/windows/x86/mingw/static/"])
env.Append(LIBPATH=["#bin/obj/platform/windows"])
env.Append( env.Append(
LIBS=[ LIBS=[
"accesskit", "accesskit",