Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SCons: Fix RES race condition #92325

Merged
merged 1 commit into from
May 28, 2024

Conversation

Repiteo
Copy link
Contributor

@Repiteo Repiteo commented May 24, 2024

@MBCX
Copy link
Contributor

MBCX commented May 24, 2024

Can confirm this has fix the issue! It now goes through the build correctly with SCons running through PyPy 3.10!

scons: Reading SConscript files ...
Using MinGW, arch x86_64
Building for platform "windows", architecture "x86_64", target "editor".
Checking for C header file mntent.h... no
scons: done reading SConscript files.
scons: Building targets ...
[Initial build] Compiling platform/windows/console_wrapper_windows.cpp ...
[Initial build] Generating core/version_generated.gen.h ...
[Initial build] Generating core/disabled_classes.gen.h ...
[Initial build] build_res_file(["platform/windows/godot_res_wrap.windows.editor.x86_64.llvm.o"], ["platform/windows/godot_res_wrap.rc"])
[Initial build] Generating modules/modules_enabled.gen.h ...
[Initial build] Generating core/object/gdvirtual.gen.inc ...
[Initial build] Generating servers/rendering/renderer_rd/shaders/blit.glsl.gen.h ...
[Initial build] Compiling platform/windows/godot_windows.cpp ...
[Initial build] Generating servers/rendering/renderer_rd/shaders/environment/volumetric_fog.glsl.gen.h ...
[Initial build] Generating servers/rendering/renderer_rd/shaders/environment/volumetric_fog_process.glsl.gen.h ...
[Initial build] Generating servers/rendering/renderer_rd/shaders/forward_clustered/best_fit_normal.glsl.gen.h ...
[Initial build] Generating servers/rendering/renderer_rd/shaders/forward_clustered/scene_forward_clustered.glsl.gen.h ...
[Initial build] Generating servers/rendering/renderer_rd/shaders/canvas.glsl.gen.h ...
[Initial build] Generating servers/rendering/renderer_rd/shaders/canvas_occlusion.glsl.gen.h ...
[Initial build] Generating servers/rendering/renderer_rd/shaders/skeleton.glsl.gen.h ...
[Initial build] Generating servers/rendering/renderer_rd/shaders/particles.glsl.gen.h ...
[Initial build] Generating servers/rendering/renderer_rd/shaders/particles_copy.glsl.gen.h ...
[Initial build] Generating servers/rendering/renderer_rd/shaders/canvas_sdf.glsl.gen.h ...
[Initial build] Generating servers/rendering/renderer_rd/shaders/cluster_debug.glsl.gen.h ...
[Initial build] Generating servers/rendering/renderer_rd/shaders/cluster_render.glsl.gen.h ...
[Initial build] Generating servers/rendering/renderer_rd/shaders/cluster_store.glsl.gen.h ...
[Initial build] Generating servers/rendering/renderer_rd/shaders/environment/gi.glsl.gen.h ...
[Initial build] Generating servers/rendering/renderer_rd/shaders/environment/sdfgi_debug.glsl.gen.h ...
[Initial build] Generating servers/rendering/renderer_rd/shaders/environment/sdfgi_debug_probes.glsl.gen.h ...
[Initial build] Generating servers/rendering/renderer_rd/shaders/environment/sdfgi_direct_light.glsl.gen.h ...
# ...

@fire
Copy link
Member

fire commented May 26, 2024

I tested it and it works for me on cicd too.

@akien-mga akien-mga merged commit 576d9a5 into godotengine:master May 28, 2024
16 checks passed
@akien-mga
Copy link
Member

Thanks!

@Repiteo Repiteo deleted the scons/res-race-condition-fix branch May 29, 2024 16:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Build failure compiling Godot for Windows with LLVM MinGW (missing file)
4 participants