builds godot
-rw-r--r--.github/2d-build-modules.py10
-rw-r--r--.github/actions/build-godot/action.yml15
-rw-r--r--.github/actions/build-upload-image/action.yml14
-rw-r--r--.github/actions/release/action.yml11
-rw-r--r--.github/actions/upload-artifact/action.yml4
-rw-r--r--.github/normal-build-modules.py5
-rw-r--r--.github/workflows/reusable-build.yml109
-rw-r--r--patches/fix_buffer_underrun.patch24
-rw-r--r--patches/no-arg-handling.patch290
9 files changed, 83 insertions, 399 deletions
diff --git a/.github/2d-build-modules.py b/.github/2d-build-modules.py
index 1dc359e..698b100 100644
--- a/.github/2d-build-modules.py
+++ b/.github/2d-build-modules.py
@@ -1,11 +1,9 @@
+debug_symbols = "no"
brotli = "yes" # compression and woff2
dbus = "no" # screensaver and portal
-debug_symbols = "no"
-deprecated = "no"
execinfo = "no"
fontconfig = "yes" # system fonts
graphite = "yes"
-lto = "auto"
minizip = "no" # zip support
module_astcenc_enabled = "no" # adaptive scalable data compression format
module_basis_universal_enabled = "yes"
@@ -25,7 +23,7 @@ module_gltf_enabled = "no" # gltf loading
module_gridmap_enabled = "no" # gridmap
module_hdr_enabled = "no" # hdr images
module_jpg_enabled = "no" # jpg images
-module_jsonrpc_enabled = "no" # godot/modules/jsonrpc/jsonrpc.cpp
+module_jsonrpc_enabled = "yes" # godot/modules/jsonrpc/jsonrpc.cpp (needed for editor)
module_lightmapper_rd_enabled = "no"
module_mbedtls_enabled = "no" # TLS and crypto
module_meshoptimizer_enabled = "no"
@@ -48,18 +46,18 @@ module_text_server_adv_enabled = "yes" # the cooler text server
module_tga_enabled = "no" # more image formats
module_theora_enabled = "no" # ogg theora video format
module_tinyexr_enabled = "no" # image
+module_ktx_enabled = "no" # why are there so many random image formats
module_upnp_enabled = "no" # universal plug and play
module_vhacd_enabled = "no" # 3d surface stuff
module_vorbis_enabled = "yes" # vorbis audio
module_webp_enabled = "yes" # lossy compression format
module_webrtc_enabled = "no"
-module_websocket_enabled = "no"
+module_websocket_enabled = "yes" # websockets are useful, and editor needs for LSP
module_webxr_enabled = "no"
module_xatlas_unwrap_enabled = "no" # lightmapping stuff
module_zip_enabled = "no"
opengl3 = "yes"
optimize = "size"
-production = "yes"
pulseaudio = "yes" # linux audio
speechd = "no" # tts
touch = "yes" # touchscreen
diff --git a/.github/actions/build-godot/action.yml b/.github/actions/build-godot/action.yml
index dc6e09d..88ec767 100644
--- a/.github/actions/build-godot/action.yml
+++ b/.github/actions/build-godot/action.yml
@@ -11,6 +11,9 @@ inputs:
target:
description: Target (template_release, template_debug, editor)
required: true
+ tools:
+ description: Tools!
+ default: "no"
runs:
using: "composite"
@@ -48,12 +51,14 @@ runs:
run: |
echo ::group::Compilation
cd godot
- scons_flags=${{ env.flags }}
+ scons_flags="${{ env.flags }} ${{ inputs.flags }} tools=${{ inputs.tools }}"
cores=$(nproc) || cores=$(sysctl -n hw.ncpu)
- [[ -n "${{ inputs.flags }}" ]] && scons_flags="${{ inputs.flags }}"
- [[ ${{ inputs.target }} == "editor" ]] && scons_flags="${scons_flags//disable_3d=yes/}" # remove disable_3d=yes if editor
- scons -j$((cores+2)) p=${{ inputs.platform }} target=${{ inputs.target }} use_lto=yes udev=yes $scons_flags
- strip bin/* || true
+ [[ ${{ inputs.tools }} == "yes" ]] && scons_flags="${scons_flags//disable_3d=yes/}" # remove disable_3d=yes if editor
+ [[ ${{ inputs.tools }} == "yes" ]] && scons_flags="$scons_flags debug_symbols=no"
+ [[ ${{ inputs.target }} ]] && scons_flags="$scons_flags deprecated=no"
+ scons -j$((cores+2)) p=${{ inputs.platform }} target=${{ inputs.target }} verbose=yes udev=yes dev_build=no lto=auto $scons_flags
+ echo "compile done"
+ [[ ${{ inputs.target}} != "editor" ]] && strip -v bin/* || true
ls bin
echo ::endgroup::
shell: bash
diff --git a/.github/actions/build-upload-image/action.yml b/.github/actions/build-upload-image/action.yml
index 4fbf2c5..aff9222 100644
--- a/.github/actions/build-upload-image/action.yml
+++ b/.github/actions/build-upload-image/action.yml
@@ -19,16 +19,20 @@ runs:
uses: bend-n/godot-builds/.github/actions/get-version@main
- name: Get templates
- uses: actions/download-artifact@v3
+ uses: actions/download-artifact@v4
with:
name: templates
- - name: Get editor
- uses: actions/download-artifact@v3
+ - name: Get headless editor
+ uses: actions/download-artifact@v4
with:
- name: linuxbsd-editor-release
+ name: server-editor-release
- - run: mv godot.linuxbsd.editor.x86_64 godot && chmod -v +x godot
+ - name: List all downloaded files
+ run: ls -R
+ shell: bash
+
+ - run: mv godot_server.x11.opt.tools.64 godot && chmod -v +x godot
shell: bash
- name: Login to GitHub Container Registry
diff --git a/.github/actions/release/action.yml b/.github/actions/release/action.yml
index ad49765..c5e8fca 100644
--- a/.github/actions/release/action.yml
+++ b/.github/actions/release/action.yml
@@ -17,18 +17,23 @@ runs:
uses: bend-n/godot-builds/.github/actions/get-version@main
- name: Get templates
- uses: actions/download-artifact@v3
+ uses: actions/download-artifact@v4
with:
name: templates
- name: Get editor
- uses: actions/download-artifact@v3
+ uses: actions/download-artifact@v4
with:
name: linuxbsd-editor-release
+ - name: List all downloaded files
+ run: ls -R
+ shell: bash
+
- name: Compress
run: |
- mv godot.linuxbsd.editor.x86_64 ${{ env.fstart }}_linux.x86_64
+ strip godot.x11.opt.tools.64 -v || true
+ mv godot.x11.opt.tools.64 ${{ env.fstart }}_linux.x86_64
mv templates.tpz ${{ env.fstart }}_export_templates.tpz
shell: bash
env:
diff --git a/.github/actions/upload-artifact/action.yml b/.github/actions/upload-artifact/action.yml
index 84bc56f..40b442b 100644
--- a/.github/actions/upload-artifact/action.yml
+++ b/.github/actions/upload-artifact/action.yml
@@ -5,7 +5,7 @@ description: Uploads the artifact
inputs:
name:
description: The artifact name.
- default: "${{ github.job }}"
+ default: "${{ github.job }}-${{ matrix.target }}"
required: true
path:
description: The path to upload.
@@ -16,7 +16,7 @@ runs:
using: "composite"
steps:
- name: Upload Godot Artifact
- uses: actions/upload-artifact@v3
+ uses: actions/upload-artifact@v4
with:
name: ${{ inputs.name }}
path: ${{ inputs.path }}
diff --git a/.github/normal-build-modules.py b/.github/normal-build-modules.py
index 189b130..75f14db 100644
--- a/.github/normal-build-modules.py
+++ b/.github/normal-build-modules.py
@@ -1,5 +1,2 @@
+optimize = "speed"
debug_symbols = "no"
-optimize = "size"
-lto = "auto"
-production = "yes"
-deprecated = "no"
diff --git a/.github/workflows/reusable-build.yml b/.github/workflows/reusable-build.yml
index fabd372..b8b09f2 100644
--- a/.github/workflows/reusable-build.yml
+++ b/.github/workflows/reusable-build.yml
@@ -40,7 +40,7 @@ jobs:
runs-on: ubuntu-20.04
strategy:
matrix:
- target: [template_release, template_debug]
+ target: [release, release_debug]
bits: [64]
steps:
- name: Compilation
@@ -53,12 +53,12 @@ jobs:
- name: Upload artifact
uses: bend-n/godot-builds/.github/actions/upload-artifact@main
with:
- path: godot/bin/*.x86_64
+ path: godot/bin/*.64
windows:
strategy:
matrix:
- target: [template_release, template_debug]
+ target: [release, release_debug]
bits: [64]
name: Win temps
runs-on: windows-latest
@@ -80,12 +80,12 @@ jobs:
runs-on: ubuntu-20.04
strategy:
matrix:
- target: [template_release, template_debug]
+ target: [release, release_debug]
steps:
- - name: Set up Java 11
+ - name: Set up Java 17
uses: actions/setup-java@v3
with:
- java-version: 11
+ java-version: 17
distribution: temurin
- name: Compilation (armv7)
@@ -115,30 +115,14 @@ jobs:
macos:
strategy:
matrix:
- target: [template_release, template_debug]
+ target: [release, release_debug]
name: macOS temps
runs-on: macos-latest
steps:
- name: Install MoltenVK
- run: | # curl https://raw.githubusercontent.com/godotengine/godot/master/misc/scripts/install_vulkan_sdk_macos.sh
- curl -L "https://sdk.lunarg.com/sdk/download/latest/mac/vulkan-sdk.dmg" -o /tmp/vulkan-sdk.dmg
- hdiutil attach /tmp/vulkan-sdk.dmg -mountpoint /Volumes/vulkan-sdk
- /Volumes/vulkan-sdk/InstallVulkan.app/Contents/MacOS/InstallVulkan \
- --accept-licenses --default-answer --confirm-command install
-
- cnt=5
- until hdiutil detach -force /Volumes/vulkan-sdk
- do
- [[ cnt -eq "0" ]] && break
- sleep 1
- ((cnt--))
- done
-
- rm -f /tmp/vulkan-sdk.dmg
-
- echo 'Vulkan SDK installed successfully! You can now build Godot by running "scons".'
-
+ run: curl https://raw.githubusercontent.com/godotengine/godot/master/misc/scripts/install_vulkan_sdk_macos.sh -s | sh
+
- name: Compilation(x86_64)
uses: bend-n/godot-builds/.github/actions/build-godot@main
with:
@@ -155,12 +139,12 @@ jobs:
- name: Create universal
run: |
- [[ "${{ matrix.target }}" == *"debug"* ]] && target='.debug'
+ [[ "${{ matrix.target }}" == *"release_debug"* ]] && target='.debug'
cd godot
- intel=bin/godot.macos.*.x86_64
- arm=bin/godot.macos.*.arm64
- lipo -create $intel $arm -output "bin/godot.macos.opt$target.universal"
- strip "bin/godot.macos.opt$target.universal"
+ intel=bin/godot.osx.*.x86_64
+ arm=bin/godot.osx.*.arm64
+ lipo -create $intel $arm -output "bin/godot.osx.opt$target.universal"
+ strip "bin/godot.osx.opt$target.universal"
- name: Upload artifact
uses: bend-n/godot-builds/.github/actions/upload-artifact@main
@@ -170,8 +154,8 @@ jobs:
web:
strategy:
matrix:
- target: [template_release, template_debug]
- flags: [dlink_enabled=yes, ""]
+ target: [release]
+ flags: [gdnative_enabled=yes, threads_enabled=yes, ""]
name: JS temps
runs-on: ubuntu-20.04
@@ -195,20 +179,24 @@ jobs:
uses: bend-n/godot-builds/.github/actions/upload-artifact@main
with:
path: godot/bin/*.zip
+ name: ${{ inputs.name }}-${{ matrix.target }}-${{ matrix.flags }}
templates:
needs: [web, macos, windows, linux, android]
name: Bundle all templates
- runs-on: ubuntu-latest
+ runs-on: ubuntu-20.04
env:
tmps: "templates"
steps:
- name: Download all artifacts
- uses: actions/download-artifact@v3
+ uses: actions/download-artifact@v4
- name: List all downloaded files
run: ls -R
+ - name: flatten
+ run: find . -mindepth 2 -type f -exec mv -t . -i '{}' +
+
- name: Getdot
uses: actions/checkout@v3
with:
@@ -222,36 +210,32 @@ jobs:
bug="template_debug"
mkdir -vp "$tmps"
echo "Preparing linux"
- linux="godot.linuxbsd"
- mv "linux/$linux.$bug.x86_64" "$tmps/linux_debug.x86_64"
- mv "linux/$linux.$rel.x86_64" "$tmps/linux_release.x86_64"
+ linux="godot.x11.opt"
+ mv "$linux.64" "$tmps/linux_x11_debug.x86_64"
+ mv "$linux.debug.64" "$tmps/linux_x11_release.x86_64"
echo "Preparing windows"
- windows="godot.windows"
- mv "windows/$windows.$bug.x86_64.console.exe" "$tmps/windows_debug_x86_64_console.exe"
- mv "windows/$windows.$bug.x86_64.exe" "$tmps/windows_debug_x86_64.exe"
- mv "windows/$windows.$rel.x86_64.console.exe" "$tmps/windows_release_x86_64_console.exe"
- mv "windows/$windows.$rel.x86_64.exe" "$tmps/windows_release_x86_64.exe"
+ windows="godot.windows.opt"
+ # mv "windows/$windows.debug.64.exe" "$tmps/windows_debug_x86_64.exe"
+ mv "$windows.64.exe" "$tmps/windows_release_x86_64.exe"
echo "Preparing android"
- mv "android/android_debug.apk" "$tmps/android_debug.apk"
- mv "android/android_release.apk" "$tmps/android_release.apk"
+ # mv "android/android_debug.apk" "$tmps/android_debug.apk"
+ mv "android_release.apk" "$tmps/android_release.apk"
echo "Preparing macos"
- mac="godot.macos.opt"
- cp -r "godot-repo/misc/dist/macos_template.app" "."
- mkdir -p "macos_template.app/Contents/MacOS"
- cp "macos/$mac.universal" "macos_template.app/Contents/MacOS/godot_macos_release.universal"
- cp "macos/$mac.debug.universal" "macos_template.app/Contents/MacOS/godot_macos_debug.universal"
- chmod +x macos_template.app/Contents/MacOS/godot_macos_*.universal
- zip -q -9 -r "$tmps/macos.zip" "macos_template.app"
+ mac="godot.osx.opt"
+ cp -r "godot-repo/misc/dist/osx_template.app" "."
+ mkdir -p "osx_template.app/Contents/MacOS"
+ cp "$mac.universal" "osx_template.app/Contents/MacOS/godot_osx_release.64"
+ # cp "macos/$mac.debug.universal" "osx_template.app/Contents/MacOS/godot_osx_debug.64"
+ chmod +x osx_template.app/Contents/MacOS/*.64
+ zip -q -9 -r "$tmps/osz.zip" "osx_template.app"
echo "Preparing web"
- web="godot.web"
- mv "web/$web.$rel.wasm32.zip" "$tmps/web_release.zip"
- mv "web/$web.$bug.wasm32.zip" "$tmps/web_debug.zip"
- mv "web/$web.$rel.wasm32.dlink.zip" "$tmps/web_dlink_release.zip"
- mv "web/$web.$bug.wasm32.dlink.zip" "$tmps/web_dlink_debug.zip"
+ web="godot.javascript.opt"
+ mv "$web.zip" "$tmps/webassembly_release.zip"
+ mv "$web.gdnative.zip" "$tmps/webassembly_gdnative_release.zip"
- name: Prepare bundle
run: cd "${tmps}" && zip -qr9 templates.tpz ./*
@@ -260,22 +244,27 @@ jobs:
uses: bend-n/godot-builds/.github/actions/upload-artifact@main
with:
path: ${{ env.tmps }}/templates.tpz
+ name: templates
editor:
+ strategy:
+ matrix:
+ platform: [server, linuxbsd]
name: Linux editor
runs-on: ubuntu-20.04
steps:
- name: Compilation
uses: bend-n/godot-builds/.github/actions/build-godot@main
with:
- platform: linuxbsd
- target: editor
+ platform: ${{ matrix.platform }}
+ target: release_debug
+ tools: "yes"
- name: Upload artifact
uses: bend-n/godot-builds/.github/actions/upload-artifact@main
with:
- name: linuxbsd-editor-release
- path: godot/bin/*.x86_64
+ name: ${{ matrix.platform }}-editor-release
+ path: godot/bin/*.64
image:
if: inputs.make-release == 'yes'
diff --git a/patches/fix_buffer_underrun.patch b/patches/fix_buffer_underrun.patch
deleted file mode 100644
index b429e09..0000000
--- a/patches/fix_buffer_underrun.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From ff6378a52bc81692d4f3552fbbe5ad628ef1ab20 Mon Sep 17 00:00:00 2001
-From: Ellen Poe <[email protected]>
-Date: Mon, 10 Apr 2023 13:38:10 +0700
-Subject: [PATCH] Fix AudioStreamGenerator stopping playback after a buffer
- underrun
-
----
- servers/audio_server.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/servers/audio_server.cpp b/servers/audio_server.cpp
-index 0344bf322d68..5e71d7af0550 100644
---- a/servers/audio_server.cpp
-+++ b/servers/audio_server.cpp
-@@ -354,7 +354,7 @@ void AudioServer::_mix_step() {
- playback->stream_playback->tag_used_streams();
- }
-
-- if (mixed_frames != buffer_size) {
-+ if (!playback->stream_playback->is_playing()) {
- // We know we have at least the size of our lookahead buffer for fade-out purposes.
-
- float fadeout_base = 0.94;
-
diff --git a/patches/no-arg-handling.patch b/patches/no-arg-handling.patch
deleted file mode 100644
index 027f95f..0000000
--- a/patches/no-arg-handling.patch
+++ /dev/null
@@ -1,290 +0,0 @@
-diff --git a/doc/classes/OS.xml b/doc/classes/OS.xml
-index 47f39aedf4..d020f52d74 100644
---- a/doc/classes/OS.xml
-+++ b/doc/classes/OS.xml
-@@ -176,7 +176,7 @@
- }
- [/csharp]
- [/codeblocks]
-- [b]Note:[/b] Passing custom user arguments directly is not recommended, as the engine may discard or modify them. Instead, the best way is to use the standard UNIX double dash ([code]--[/code]) and then pass custom arguments, which the engine itself will ignore. These can be read via [method get_cmdline_user_args].
-+ [b]Note:[/b] Most arguments will be ignored by godot in release templates, so passing custom user args will be safe. If you want to pass engine arguments like `--rendering-driver`, use the standard UNIX double dash ([code]--[/code]), and then pass your arguments, which the engine will then ignore. Arguments after [code]--[/code] are then accessible via [method get_cmdline_user_args].
- </description>
- </method>
- <method name="get_cmdline_user_args">
-@@ -185,9 +185,9 @@
- Similar to [method get_cmdline_args], but this returns the user arguments (any argument passed after the double dash [code]--[/code] or double plus [code]++[/code] argument). These are left untouched by Godot for the user. [code]++[/code] can be used in situations where [code]--[/code] is intercepted by another program (such as [code]startx[/code]).
- For example, in the command line below, [code]--fullscreen[/code] will not be returned in [method get_cmdline_user_args] and [code]--level 1[/code] will only be returned in [method get_cmdline_user_args]:
- [codeblock]
-- godot --fullscreen -- --level 1
-+ godot --display-driver vulkan -- --level 1
- # Or:
-- godot --fullscreen ++ --level 1
-+ godot --display-driver vulkan ++ --level 1
- [/codeblock]
- </description>
- </method>
-diff --git a/main/main.cpp b/main/main.cpp
-index 5e0187cc7f..1f3b8aec6f 100644
---- a/main/main.cpp
-+++ b/main/main.cpp
-@@ -166,19 +166,20 @@ static bool editor = false;
- static bool project_manager = false;
- static bool cmdline_tool = false;
- static String locale;
--static bool show_help = false;
--static uint64_t quit_after = 0;
- static OS::ProcessID editor_pid = 0;
-+#if defined(TOOLS_ENABLED) || defined(DEBUG_ENABLED)
-+static uint64_t quit_after = 0;
-+static bool show_help = false;
-+static String debug_server_uri;
-+#endif
- #ifdef TOOLS_ENABLED
-+HashMap<Main::CLIScope, Vector<String>> forwardable_cli_arguments;
- static bool found_project = false;
- static bool auto_build_solutions = false;
--static String debug_server_uri;
- #ifndef DISABLE_DEPRECATED
- static int converter_max_kb_file = 4 * 1024; // 4MB
- static int converter_max_line_length = 100000;
- #endif // DISABLE_DEPRECATED
--
--HashMap<Main::CLIScope, Vector<String>> forwardable_cli_arguments;
- #endif
- bool use_startup_benchmark = false;
- String startup_benchmark_file;
-@@ -331,6 +332,7 @@ void finalize_theme_db() {
- #define MAIN_PRINT(m_txt)
- #endif
-
-+#if defined(TOOLS_ENABLED) || defined(DEBUG_ENABLED)
- void Main::print_help(const char *p_binary) {
- print_line(String(VERSION_NAME) + " v" + get_full_version_string() + " - " + String(VERSION_WEBSITE));
- OS::get_singleton()->print("Free and open source software under the terms of the MIT license.\n");
-@@ -468,6 +470,7 @@ void Main::print_help(const char *p_binary) {
- #endif
- OS::get_singleton()->print("\n");
- }
-+#endif
-
- #ifdef TESTS_ENABLED
- // The order is the same as in `Main::setup()`, only core and some editor types
-@@ -818,25 +821,26 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
-
- if (adding_user_args) {
- user_args.push_back(I->get());
-- } else if (I->get() == "-h" || I->get() == "--help" || I->get() == "/?") { // display help
-+ }
-+#if defined(TOOLS_ENABLED) || defined(DEBUG_ENABLED)
-+ else if (I->get() == "-h" || I->get() == "--help" || I->get() == "/?") { // display help
-
- show_help = true;
- exit_code = ERR_HELP; // Hack to force an early exit in `main()` with a success code.
- goto error;
--
- } else if (I->get() == "--version") {
- print_line(get_full_version_string());
- exit_code = ERR_HELP; // Hack to force an early exit in `main()` with a success code.
- goto error;
--
- } else if (I->get() == "-v" || I->get() == "--verbose") { // verbose output
-
- OS::get_singleton()->_verbose_stdout = true;
- } else if (I->get() == "-q" || I->get() == "--quiet") { // quieter output
-
- quiet_stdout = true;
--
-- } else if (I->get() == "--audio-driver") { // audio driver
-+ }
-+#endif // important args
-+ else if (I->get() == "--audio-driver") { // audio driver
-
- if (I->next()) {
- audio_driver = I->next()->get();
-@@ -952,12 +956,6 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
- OS::get_singleton()->print("Missing GPU index argument, aborting.\n");
- goto error;
- }
-- } else if (I->get() == "--gpu-validation") {
-- Engine::singleton->use_validation_layers = true;
--#ifdef DEBUG_ENABLED
-- } else if (I->get() == "--gpu-abort") {
-- Engine::singleton->abort_on_gpu_errors = true;
--#endif
- } else if (I->get() == "--tablet-driver") {
- if (I->next()) {
- tablet_driver = I->next()->get();
-@@ -966,7 +964,16 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
- OS::get_singleton()->print("Missing tablet driver argument, aborting.\n");
- goto error;
- }
-- } else if (I->get() == "--single-window") { // force single window
-+ }
-+#if defined(TOOLS_ENABLED) || defined(DEBUG_ENABLED)
-+#ifdef DEBUG_ENABLED
-+ else if (I->get() == "--gpu-validation") {
-+ Engine::singleton->use_validation_layers = true;
-+ } else if (I->get() == "--gpu-abort") {
-+ Engine::singleton->abort_on_gpu_errors = true;
-+ }
-+#endif
-+ else if (I->get() == "--single-window") { // force single window
-
- single_window = true;
- } else if (I->get() == "-t" || I->get() == "--always-on-top") { // force always-on-top window
-@@ -1002,7 +1009,6 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
- OS::get_singleton()->print("Missing resolution argument, aborting.\n");
- goto error;
- }
--
- } else if (I->get() == "--screen") { // set window screen
-
- if (I->next()) {
-@@ -1014,7 +1020,6 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
- OS::get_singleton()->print("Missing screen argument, aborting.\n");
- goto error;
- }
--
- } else if (I->get() == "--position") { // set window position
-
- if (I->next()) {
-@@ -1038,16 +1043,13 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
- OS::get_singleton()->print("Missing position argument, aborting.\n");
- goto error;
- }
--
- } else if (I->get() == "--headless") { // enable headless mode (no audio, no rendering).
-
- audio_driver = NULL_AUDIO_DRIVER;
- display_driver = NULL_DISPLAY_DRIVER;
--
- } else if (I->get() == "--profiling") { // enable profiling
-
- use_debug_profiler = true;
--
- } else if (I->get() == "-l" || I->get() == "--language") { // language
-
- if (I->next()) {
-@@ -1057,7 +1059,6 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
- OS::get_singleton()->print("Missing language argument, aborting.\n");
- goto error;
- }
--
- } else if (I->get() == "--remote-fs") { // remote filesystem
-
- if (I->next()) {
-@@ -1238,7 +1239,6 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
- OS::get_singleton()->print("Missing list of breakpoints, aborting.\n");
- goto error;
- }
--
- } else if (I->get() == "--frame-delay") { // force frame delay
-
- if (I->next()) {
-@@ -1248,7 +1248,6 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
- OS::get_singleton()->print("Missing frame delay argument, aborting.\n");
- goto error;
- }
--
- } else if (I->get() == "--time-scale") { // force time scale
-
- if (I->next()) {
-@@ -1258,8 +1257,9 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
- OS::get_singleton()->print("Missing time scale argument, aborting.\n");
- goto error;
- }
--
-- } else if (I->get() == "--main-pack") {
-+ }
-+#endif // essential arg for html builds
-+ else if (I->get() == "--main-pack") {
- if (I->next()) {
- main_pack = I->next()->get();
- N = I->next()->next();
-@@ -1267,12 +1267,14 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
- OS::get_singleton()->print("Missing path to main pack file, aborting.\n");
- goto error;
- };
--
-- } else if (I->get() == "-d" || I->get() == "--debug") {
-+ }
-+#if defined(TOOLS_ENABLED) || defined(DEBUG_ENABLED)
-+ else if (I->get() == "-d" || I->get() == "--debug") {
- debug_uri = "local://";
- OS::get_singleton()->_debug_stdout = true;
-+ }
- #if defined(DEBUG_ENABLED)
-- } else if (I->get() == "--debug-collisions") {
-+ else if (I->get() == "--debug-collisions") {
- debug_collisions = true;
- } else if (I->get() == "--debug-paths") {
- debug_paths = true;
-@@ -1352,7 +1354,6 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
- OS::get_singleton()->print("Missing --xr-mode argument, aborting.\n");
- goto error;
- }
--
- } else if (I->get() == "--startup-benchmark") {
- use_startup_benchmark = true;
- } else if (I->get() == "--startup-benchmark-file") {
-@@ -1364,24 +1365,21 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
- OS::get_singleton()->print("Missing <path> argument for --startup-benchmark-file <path>.\n");
- goto error;
- }
--
-- } else if (I->get() == "--" || I->get() == "++") {
-+ }
-+#endif
-+ else if (I->get() == "--" || I->get() == "++") {
- adding_user_args = true;
- } else {
- main_args.push_back(I->get());
- }
--
- I = N;
- }
--
- #ifdef TOOLS_ENABLED
- if (editor && project_manager) {
- OS::get_singleton()->print(
- "Error: Command line arguments implied opening both editor and project manager, which is not possible. Aborting.\n");
- goto error;
- }
--#endif
--
- // Network file system needs to be configured before globals, since globals are based on the
- // 'project.godot' file which will only be available through the network if this is enabled
- FileAccessNetwork::configure();
-@@ -1403,7 +1401,7 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
-
- FileAccess::make_default<FileAccessNetwork>(FileAccess::ACCESS_RESOURCES);
- }
--
-+#endif
- if (globals->setup(project_path, main_pack, upwards, editor) == OK) {
- #ifdef TOOLS_ENABLED
- found_project = true;
-@@ -1910,9 +1908,11 @@ error:
- args.clear();
- main_args.clear();
-
-+#if defined(TOOLS_ENABLED) || defined(DEBUG_ENABLED)
- if (show_help) {
- print_help(execpath);
- }
-+#endif
-
- EngineDebugger::deinitialize();
-
-@@ -3311,9 +3311,11 @@ bool Main::iteration() {
- movie_writer->add_frame(vp_tex);
- }
-
-+#if defined(TOOLS_ENABLED) || defined(DEBUG_ENABLED)
- if ((quit_after > 0) && (Engine::get_singleton()->_process_frames >= quit_after)) {
- exit = true;
- }
-+#endif
-
- if (fixed_fps != -1) {
- return exit;