mirror of
https://github.com/godotengine/godot
synced 2024-09-05 17:41:41 +00:00
Merge pull request #92026 from Repiteo/scons/web-fixes
SCons: Minor fixes/adjustments for web compilation
This commit is contained in:
commit
ca708b5706
|
@ -218,7 +218,7 @@ opts.Add(BoolVariable("brotli", "Enable Brotli for decompresson and WOFF2 fonts
|
|||
opts.Add(BoolVariable("xaudio2", "Enable the XAudio2 audio driver", False))
|
||||
opts.Add(BoolVariable("vulkan", "Enable the vulkan rendering driver", True))
|
||||
opts.Add(BoolVariable("opengl3", "Enable the OpenGL/GLES3 rendering driver", True))
|
||||
opts.Add(BoolVariable("d3d12", "Enable the Direct3D 12 rendering driver (Windows only)", False))
|
||||
opts.Add(BoolVariable("d3d12", "Enable the Direct3D 12 rendering driver", False))
|
||||
opts.Add(BoolVariable("openxr", "Enable the OpenXR driver", True))
|
||||
opts.Add(BoolVariable("use_volk", "Use the volk library to load the Vulkan loader dynamically", True))
|
||||
opts.Add(BoolVariable("disable_exceptions", "Force disabling exception handling code", True))
|
||||
|
|
|
@ -3279,7 +3279,7 @@ void FileSystemDock::_file_and_folders_fill_popup(PopupMenu *p_popup, const Vect
|
|||
if (p_paths.size() == 1) {
|
||||
const String &fpath = p_paths[0];
|
||||
|
||||
bool added_separator = false;
|
||||
[[maybe_unused]] bool added_separator = false;
|
||||
|
||||
if (favorites_list.has(fpath)) {
|
||||
TreeItem *favorites_item = tree->get_root()->get_first_child();
|
||||
|
|
|
@ -531,6 +531,7 @@ def no_verbose(env):
|
|||
link_shared_library_message = "{}Linking Shared Library {}$TARGET{} ...{}".format(*colors)
|
||||
java_library_message = "{}Creating Java Archive {}$TARGET{} ...{}".format(*colors)
|
||||
compiled_resource_message = "{}Creating Compiled Resource {}$TARGET{} ...{}".format(*colors)
|
||||
zip_archive_message = "{}Archiving {}$TARGET{} ...{}".format(*colors)
|
||||
generated_file_message = "{}Generating {}$TARGET{} ...{}".format(*colors)
|
||||
|
||||
env["CXXCOMSTR"] = compile_source_message
|
||||
|
@ -544,6 +545,7 @@ def no_verbose(env):
|
|||
env["JARCOMSTR"] = java_library_message
|
||||
env["JAVACCOMSTR"] = java_compile_source_message
|
||||
env["RCCOMSTR"] = compiled_resource_message
|
||||
env["ZIPCOMSTR"] = zip_archive_message
|
||||
env["GENCOMSTR"] = generated_file_message
|
||||
|
||||
|
||||
|
|
|
@ -181,7 +181,7 @@ def configure(env: "SConsEnvironment"):
|
|||
# Use TempFileMunge since some AR invocations are too long for cmd.exe.
|
||||
# Use POSIX-style paths, required with TempFileMunge.
|
||||
env["ARCOM_POSIX"] = env["ARCOM"].replace("$TARGET", "$TARGET.posix").replace("$SOURCES", "$SOURCES.posix")
|
||||
env["ARCOM"] = "${TEMPFILE(ARCOM_POSIX)}"
|
||||
env["ARCOM"] = "${TEMPFILE('$ARCOM_POSIX','$ARCOMSTR')}"
|
||||
|
||||
# All intermediate files are just object files.
|
||||
env["OBJPREFIX"] = ""
|
||||
|
|
|
@ -123,7 +123,6 @@ def create_template_zip(env, js, wasm, worker, side):
|
|||
zip_files,
|
||||
ZIPROOT=zip_dir,
|
||||
ZIPSUFFIX="${PROGSUFFIX}${ZIPSUFFIX}",
|
||||
ZIPCOMSTR="Archiving $SOURCES as $TARGET",
|
||||
)
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue