godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #94836 from bruvzg/win7_angle 

[Windows] Remove libSynchronization
This commit is contained in:
Rémi Verschelde 2024-07-28 17:46:59 +02:00
parent 036a3ef39c 5d5d51937f
commit 65e046159b
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
platform/windows/detect.py
View File

@ -589,7 +589,7 @@ def configure_msvc(env: "SConsEnvironment", vcvars_msvc_config):
"libEGL.windows." + env["arch"] + prebuilt_lib_extra_suffix, "libEGL.windows." + env["arch"] + prebuilt_lib_extra_suffix,
"libGLES.windows." + env["arch"] + prebuilt_lib_extra_suffix, "libGLES.windows." + env["arch"] + prebuilt_lib_extra_suffix,
] ]
LIBS += ["dxgi", "d3d9", "d3d11", "synchronization"] LIBS += ["dxgi", "d3d9", "d3d11"]
env.Prepend(CPPPATH=["#thirdparty/angle/include"]) env.Prepend(CPPPATH=["#thirdparty/angle/include"])
if env["target"] in ["editor", "template_debug"]: if env["target"] in ["editor", "template_debug"]:
@ -817,7 +817,7 @@ def configure_mingw(env: "SConsEnvironment"):
"ANGLE.windows." + env["arch"], "ANGLE.windows." + env["arch"],
] ]
) )
env.Append(LIBS=["dxgi", "d3d9", "d3d11", "synchronization"]) env.Append(LIBS=["dxgi", "d3d9", "d3d11"])
env.Prepend(CPPPATH=["#thirdparty/angle/include"]) env.Prepend(CPPPATH=["#thirdparty/angle/include"])
env.Append(CPPDEFINES=["MINGW_ENABLED", ("MINGW_HAS_SECURE_API", 1)]) env.Append(CPPDEFINES=["MINGW_ENABLED", ("MINGW_HAS_SECURE_API", 1)])