builds godot
-rw-r--r--.github/2d-build-modules.py63
-rw-r--r--.github/actions/build-godot/action.yml9
-rw-r--r--.github/actions/build-upload-image/action.yml2
-rw-r--r--.github/actions/release/action.yml8
-rw-r--r--.github/normal-build-modules.py5
-rw-r--r--.github/workflows/manual-build.yml2
-rw-r--r--.github/workflows/reusable-build.yml90
-rwxr-xr-xREADME.md10
-rw-r--r--patches/no-arg-handling.patch163
9 files changed, 190 insertions, 162 deletions
diff --git a/.github/2d-build-modules.py b/.github/2d-build-modules.py
index 2502a1c..0c3fb29 100644
--- a/.github/2d-build-modules.py
+++ b/.github/2d-build-modules.py
@@ -1,22 +1,69 @@
module_bmp_enabled = "no"
-module_bullet_enabled = "no"
module_csg_enabled = "no"
module_enet_enabled = "no"
module_etc_enabled = "no"
-module_fbx_enabled = "no"
-module_etc_enabled = "no"
-module_gdnative_enabled = "no"
module_gltf_enabled = "no"
module_gridmap_enabled = "no"
module_hdr_enabled = "no"
module_jpg_enabled = "no"
-module_jsonrpc_enabled = "no"
module_lightmapper_cpu_enabled = "no"
+module_webm_enabled = "no"
+debug_symbols = "no"
+optimize = "size"
+lto = "auto"
+production = "yes"
+deprecated = "no"
+minizip = "yes"
+vulkan = "yes"
+opengl3 = "yes"
+openxr = "no"
+pulseaudio = "yes"
+dbus = "yes"
+speechd = "no"
+fontconfig = "yes"
+udev = "yes"
+x11 = "yes"
+touch = "yes"
+execinfo = "no"
+module_basis_universal_enabled = "yes"
+module_camera_enabled = "yes"
+module_cvtt_enabled = "no"
+module_dds_enabled = "no"
+module_denoise_enabled = "no"
+module_etcpak_enabled = "no"
+brotli = "yes"
+module_freetype_enabled = "yes"
+module_gdscript_enabled = "yes"
+module_glslang_enabled = "yes"
+module_jsonrpc_enabled = "no"
+module_lightmapper_rd_enabled = "no"
+module_mbedtls_enabled = "no"
+module_meshoptimizer_enabled = "no"
+module_minimp3_enabled = "no"
module_mobile_vr_enabled = "no"
+module_mono_enabled = "no"
+module_msdfgen_enabled = "no"
+module_multiplayer_enabled = "no"
+module_navigation_enabled = "yes"
+module_noise_enabled = "no"
+module_ogg_enabled = "yes"
+module_openxr_enabled = "no"
+module_raycast_enabled = "yes"
+module_regex_enabled = "yes"
+module_squish_enabled = "no"
+module_svg_enabled = "yes"
+graphite = "yes"
+module_text_server_adv_enabled = "yes"
+module_text_server_fb_enabled = "yes"
+module_tga_enabled = "no"
module_theora_enabled = "no"
-module_upnp_enabled = "no"
+module_tinyexr_enabled = "no"
+module_upnp_enabled = "no" # universal plug and play
module_vhacd_enabled = "no"
-module_visual_script_enabled = "no"
-module_webm_enabled = "no"
+module_vorbis_enabled = "yes"
+module_webp_enabled = "yes"
+module_webrtc_enabled = "no"
+module_websocket_enabled = "no"
module_webxr_enabled = "no"
module_xatlas_unwrap_enabled = "no"
+module_zip_enabled = "no"
diff --git a/.github/actions/build-godot/action.yml b/.github/actions/build-godot/action.yml
index 0224fb7..cf848da 100644
--- a/.github/actions/build-godot/action.yml
+++ b/.github/actions/build-godot/action.yml
@@ -13,7 +13,7 @@ inputs:
description: Flags to pass to the build script
required: false
target:
- description: Target (release, release_debug, debug)
+ description: Target (template_release, template_debug, editor)
required: true
runs:
@@ -25,7 +25,7 @@ runs:
ref: ${{ env.ref }}
- name: Install linux dependencies
- if: inputs.platform == 'x11'
+ if: inputs.platform == 'linuxbsd'
run: |
echo ::group::Dependencies
sudo apt-get update -q
@@ -48,9 +48,10 @@ runs:
cd godot
scons_flags=${{ env.flags }}
cores=$(nproc) || cores=$(sysctl -n hw.ncpu)
+ [[ ${{ inputs.platform }} == "web" ]] && cores=1
[[ -n "${{ inputs.flags }}" ]] && scons_flags="${{ inputs.flags }}"
- [[ $tools == "yes" ]] && scons_flags="${scons_flags//disable_3d=yes/}" # remove disable_3d=yes if tools=yes
- scons -j$((cores+2)) p=${{ inputs.platform }} tools=${{ env.tools }} target=${{ inputs.target }} use_lto=yes udev=yes $scons_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
ls bin
echo ::endgroup::
diff --git a/.github/actions/build-upload-image/action.yml b/.github/actions/build-upload-image/action.yml
index febb99f..c5264fa 100644
--- a/.github/actions/build-upload-image/action.yml
+++ b/.github/actions/build-upload-image/action.yml
@@ -28,7 +28,7 @@ runs:
with:
name: server-tools-release
- - run: mv godot_server.x11.opt.tools.64 godot && chmod -v +x godot
+ - run: mv godot_server.linuxbsd.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 da50012..43740ed 100644
--- a/.github/actions/release/action.yml
+++ b/.github/actions/release/action.yml
@@ -29,12 +29,11 @@ runs:
- name: Get editor
uses: actions/download-artifact@v3
with:
- name: x11-tools-release
+ name: linuxbsd-tools-release
- name: Compress
run: |
- mv godot.x11.opt.tools.64 ${{ env.fstart }}_x11.64
- mv godot_server.x11.opt.tools.64 ${{ env.fstart }}_linux_headless.64
+ mv godot.linuxbsd.editor.x86_64 ${{ env.fstart }}_linuxbsd.64
mv templates.tpz ${{ env.fstart }}_export_templates.tpz
shell: bash
env:
@@ -47,8 +46,7 @@ runs:
tag_name: ${{ env.release-name }}
files: |
${{ env.fstart }}_export_templates.tpz
- ${{ env.fstart }}_x11.64
- ${{ env.fstart }}_linux_headless.64
+ ${{ env.fstart }}_linuxbsd.64
token: ${{ inputs.github-token }}
prerelease: ${{ env.prerelease }}
env:
diff --git a/.github/normal-build-modules.py b/.github/normal-build-modules.py
index e69de29..189b130 100644
--- a/.github/normal-build-modules.py
+++ b/.github/normal-build-modules.py
@@ -0,0 +1,5 @@
+debug_symbols = "no"
+optimize = "size"
+lto = "auto"
+production = "yes"
+deprecated = "no"
diff --git a/.github/workflows/manual-build.yml b/.github/workflows/manual-build.yml
index c7dd107..137f340 100644
--- a/.github/workflows/manual-build.yml
+++ b/.github/workflows/manual-build.yml
@@ -17,7 +17,7 @@ jobs:
name: godot-2d
build-name: 2d
modules-path: ./.github/2d-build-modules.py
- flags: disable_3d=yes
+ flags: ""
secrets: inherit
all-dimensions:
name: Build ${{ inputs.ref }} (normal)
diff --git a/.github/workflows/reusable-build.yml b/.github/workflows/reusable-build.yml
index 97afc25..20d7b61 100644
--- a/.github/workflows/reusable-build.yml
+++ b/.github/workflows/reusable-build.yml
@@ -36,7 +36,7 @@ jobs:
runs-on: ubuntu-20.04
strategy:
matrix:
- target: [release, release_debug]
+ target: [template_release, template_debug]
bits: [64]
steps:
- name: Compilation
@@ -44,17 +44,17 @@ jobs:
with:
target: ${{ matrix.target }}
flags: bits=${{ matrix.bits }} ${{ env.flags }}
- platform: x11
+ platform: linuxbsd
- name: Upload artifact
uses: bend-n/godot-builds/.github/actions/upload-artifact@main
with:
- path: godot/bin/*.64
+ path: godot/bin/*.x86_64
windows:
strategy:
matrix:
- target: [release, release_debug]
+ target: [template_release, template_debug]
bits: [64]
name: Win temps
runs-on: windows-latest
@@ -76,7 +76,7 @@ jobs:
runs-on: ubuntu-20.04
strategy:
matrix:
- target: [release, release_debug]
+ target: [template_release, template_debug]
steps:
- name: Set up Java 11
uses: actions/setup-java@v3
@@ -111,11 +111,23 @@ jobs:
macos:
strategy:
matrix:
- target: [release, release_debug]
+ target: [template_release, template_debug]
- name: MacOS temps
+ name: macOS temps
runs-on: macos-latest
steps:
+ - name: Install MoltenVK
+ run: |
+ #https://github.com/godotengine/godot/blob/0ff8742919af72c7412e63ef0f646cb4e7bd7d8f/misc/scripts/install_vulkan_sdk_macos.sh
+ set -euo pipefail
+ IFS=$'\n\t'
+ 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
+ hdiutil detach /Volumes/vulkan-sdk
+ rm -f /tmp/vulkan-sdk.dmg
+
- name: Compilation(x86_64)
uses: bend-n/godot-builds/.github/actions/build-godot@main
with:
@@ -134,40 +146,39 @@ jobs:
run: |
[[ "${{ matrix.target }}" == *"debug"* ]] && target='.debug'
cd godot
- 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"
+ 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"
- name: Upload artifact
uses: bend-n/godot-builds/.github/actions/upload-artifact@main
with:
path: godot/bin/*.universal
- javascript:
+ web:
strategy:
matrix:
- target: [release, release_debug]
- flags: [gdnative_enabled=yes, threads_enabled=yes, ""]
+ target: [template_release, template_debug]
+ flags: [dlink_enabled=yes, ""]
name: JS temps
runs-on: ubuntu-20.04
steps:
- - name: Set up Emscripten 3.1.10
+ - name: Set up Emscripten 3.1.18
uses: mymindstorm/setup-emsdk@v11
with:
- version: 3.1.10
+ version: 3.1.18
- name: Verify Emscripten setup
- run: |
- emcc -v
+ run: emcc -v
- name: Compilation
uses: bend-n/godot-builds/.github/actions/build-godot@main
with:
target: ${{ matrix.target }}
flags: ${{ env.flags }} ${{ matrix.flags }}
- platform: javascript
+ platform: web
- name: Upload artifact
uses: bend-n/godot-builds/.github/actions/upload-artifact@main
@@ -175,7 +186,7 @@ jobs:
path: godot/bin/*.zip
templates:
- needs: [javascript, macos, windows, linux, android]
+ needs: [web, macos, windows, linux, android]
name: Bundle all templates
runs-on: ubuntu-latest
env:
@@ -188,9 +199,10 @@ jobs:
run: |
mkdir -vp ${tmps}
git clone --depth 1 'https://github.com/godotengine/godot' -b 3.x godot-repo
+ ls -R
echo "Preparing linux"
- mv linux/godot.x11.opt.64 ${tmps}/linux_x11_64_release
- mv linux/godot.x11.opt.debug.64 ${tmps}/linux_x11_64_debug
+ mv linux/godot.linuxbsd.opt.64 ${tmps}/linux_linuxbsd_64_release
+ mv linux/godot.linuxbsd.opt.debug.64 ${tmps}/linux_linuxbsd_64_debug
echo "Preparing windows"
mv windows/godot.windows.opt.64.exe ${tmps}/windows_64_release.exe
@@ -203,18 +215,16 @@ jobs:
echo "Preparing macos"
cp -r godot-repo/misc/dist/osx_template.app .
mkdir -p osx_template.app/Contents/MacOS
- cp macos/godot.osx.opt.universal osx_template.app/Contents/MacOS/godot_osx_release.64
- cp macos/godot.osx.opt.debug.universal osx_template.app/Contents/MacOS/godot_osx_debug.64
+ cp macos/godot.macos.opt.universal osx_template.app/Contents/MacOS/godot_osx_release.64
+ cp macos/godot.macos.opt.debug.universal osx_template.app/Contents/MacOS/godot_osx_debug.64
chmod +x osx_template.app/Contents/MacOS/godot_osx_*.64
zip -q -9 -r ${tmps}/osx.zip osx_template.app
echo "Preparing web"
- mv javascript/godot.javascript.opt.zip ${tmps}/webassembly_release.zip
- mv javascript/godot.javascript.opt.debug.zip ${tmps}/webassembly_debug.zip
- mv javascript/godot.javascript.opt.threads.zip ${tmps}/webassembly_threads_release.zip
- mv javascript/godot.javascript.opt.debug.threads.zip ${tmps}/webassembly_threads_debug.zip
- mv javascript/godot.javascript.opt.gdnative.zip ${tmps}/webassembly_gdnative_release.zip
- mv javascript/godot.javascript.opt.debug.gdnative.zip ${tmps}/webassembly_gdnative_debug.zip
+ mv web/godot.web.opt.zip ${tmps}/web_release.zip
+ mv web/godot.web.opt.debug.zip ${tmps}/web_debug.zip
+ mv web/godot.web.opt.dlink.zip ${tmps}/web_dlink_release.zip
+ mv web/godot.web.opt.debug.dlink.zip ${tmps}/web_dlink_debug.zip
- name: Prepare bundle
run: "cd ${tmps} && zip -q -9 -r templates.tpz ./*"
@@ -224,33 +234,27 @@ jobs:
with:
path: ${{ env.tmps }}/templates.tpz
- tools:
- strategy:
- matrix:
- platform: [server, x11]
-
+ editor:
name: Linux tools
runs-on: ubuntu-20.04
steps:
- name: Compilation
uses: bend-n/godot-builds/.github/actions/build-godot@main
with:
- platform: ${{ matrix.platform }}
- target: release_debug
- env:
- tools: yes
+ platform: linuxbsd
+ target: editor
- name: Upload artifact
uses: bend-n/godot-builds/.github/actions/upload-artifact@main
with:
- name: ${{ matrix.platform }}-tools-release
- path: godot/bin/*.64
+ name: linuxbsd-editor-release
+ path: godot/bin/*.x86_64
image:
permissions: write-all
name: Docker image
runs-on: ubuntu-latest
- needs: [tools, templates]
+ needs: [editor, templates]
steps:
- uses: bend-n/godot-builds/.github/actions/build-upload-image@main
with:
@@ -260,7 +264,7 @@ jobs:
release:
name: Create/update a release
runs-on: ubuntu-latest
- needs: [tools, templates]
+ needs: [editor, templates]
steps:
- uses: bend-n/godot-builds/.github/actions/release@main
with:
diff --git a/README.md b/README.md
index 078f931..2f2c5ec 100755
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
# godot builds
-[![version](https://img.shields.io/badge/3.5-blue?logo=godot-engine&logoColor=white&label=godot&style=for-the-badge)](https://godotengine.org)
+[![version](https://img.shields.io/badge/4.x-blue?logo=godot-engine&logoColor=white&label=godot&style=for-the-badge)](https://godotengine.org)
[![aur](https://img.shields.io/aur/version/godot2d?color=informative&logo=archlinux&logoColor=white&style=for-the-badge)](https://aur.archlinux.org/packages/godot2d "Aur package")
<a href='https://ko-fi.com/bendn' title='Buy me a coffee' target='_blank'><img height='28' src='https://ko-fi.com/img/githubbutton_sm.svg' alt='Buy me a coffee'> </a>
@@ -21,13 +21,13 @@ For a full example, see this [template](https://github.com/bend-n/godot-template
build-windows:
runs-on: ubuntu-latest
container:
- image: ghcr.io/bend-n/godot-2d:3.5
+ image: ghcr.io/bend-n/godot-2d:4.0.beta
name: Build windows
steps:
- name: Build (Windows)
uses: bend-n/godot-actions/.github/actions/export-windows@main
env:
- GODOT_VERSION: 3.5
+ GODOT_VERSION: 4.0
NAME: ${{ github.event.repository.name }}
```
@@ -43,7 +43,7 @@ build-windows:
build-windows:
runs-on: ubuntu-latest
container:
- image: ghcr.io/bend-n/godot-2d:3.5
+ image: ghcr.io/bend-n/godot-2d:4.0.beta
name: Build windows
steps:
- name: Checkout
@@ -51,7 +51,7 @@ build-windows:
- name: Setup godot
run: |
- RELEASE=stable; GODOT_VERSION=3.5;
+ RELEASE=stable; GODOT_VERSION=4.0;
mkdir -v -p ~/.local/share/godot/templates
mv /root/.local/share/godot/templates/${GODOT_VERSION}.${RELEASE} ~/.local/share/godot/templates/${GODOT_VERSION}.${RELEASE}
diff --git a/patches/no-arg-handling.patch b/patches/no-arg-handling.patch
index 1323545..be286df 100644
--- a/patches/no-arg-handling.patch
+++ b/patches/no-arg-handling.patch
@@ -1,18 +1,20 @@
diff --git a/main/main.cpp b/main/main.cpp
-index 37ef4332..ecc30d7e 100644
+index 2d0843a331..2f46159c45 100644
--- a/main/main.cpp
+++ b/main/main.cpp
-@@ -128,7 +128,9 @@ static int audio_driver_idx = -1;
- static bool editor = false;
+@@ -156,10 +156,10 @@ static bool editor = false;
static bool project_manager = false;
+ static bool cmdline_tool = false;
static String locale;
-+#ifdef TOOLS_ENABLED
- static bool show_help = false;
-+#endif
+-static bool show_help = false;
static bool auto_quit = false;
- static OS::ProcessID allow_focus_steal_pid = 0;
- static bool delta_sync_after_draw = false;
-@@ -239,6 +241,7 @@ void finalize_navigation_server() {
+ static OS::ProcessID editor_pid = 0;
+ #ifdef TOOLS_ENABLED
++static bool show_help = false;
+ static bool found_project = false;
+ static bool auto_build_solutions = false;
+ static String debug_server_uri;
+@@ -301,6 +301,7 @@ void finalize_theme_db() {
#define MAIN_PRINT(m_txt)
#endif
@@ -20,40 +22,42 @@ index 37ef4332..ecc30d7e 100644
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");
-@@ -256,11 +259,9 @@ void Main::print_help(const char *p_binary) {
- OS::get_singleton()->print("\n");
+@@ -319,11 +320,9 @@ void Main::print_help(const char *p_binary) {
OS::get_singleton()->print("Run options:\n");
+ OS::get_singleton()->print(" --, ++ Separator for user-provided arguments. Following arguments are not used by the engine, but can be read from `OS.get_cmdline_user_args()`.\n");
-#ifdef TOOLS_ENABLED
- OS::get_singleton()->print(" -e, --editor Start the editor instead of running the scene.\n");
- OS::get_singleton()->print(" -p, --project-manager Start the project manager, even if a project is auto-detected.\n");
- OS::get_singleton()->print(" --debug-server <address> Start the editor debug server (<IP>:<port>, e.g. 127.0.0.1:6007)\n");
+ OS::get_singleton()->print(" -e, --editor Start the editor instead of running the scene.\n");
+ OS::get_singleton()->print(" -p, --project-manager Start the project manager, even if a project is auto-detected.\n");
+ OS::get_singleton()->print(" --debug-server <uri> Start the editor debug server (<protocol>://<host/IP>[:<port>], e.g. tcp://127.0.0.1:6007)\n");
-#endif
- OS::get_singleton()->print(" -q, --quit Quit after the first iteration.\n");
- OS::get_singleton()->print(" -l, --language <locale> Use a specific locale (<locale> being a two-letter code).\n");
- OS::get_singleton()->print(" --path <directory> Path to a project (<directory> must contain a 'project.godot' file).\n");
-@@ -355,6 +356,7 @@ void Main::print_help(const char *p_binary) {
- OS::get_singleton()->print(").\n");
+ OS::get_singleton()->print(" --quit Quit after the first iteration.\n");
+ OS::get_singleton()->print(" -l, --language <locale> Use a specific locale (<locale> being a two-letter code).\n");
+ OS::get_singleton()->print(" --path <directory> Path to a project (<directory> must contain a 'project.godot' file).\n");
+@@ -429,6 +428,7 @@ void Main::print_help(const char *p_binary) {
#endif
+ OS::get_singleton()->print("\n");
}
+#endif
- /* Engine initialization
- *
-@@ -493,13 +495,22 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
+ #ifdef TESTS_ENABLED
+ // The order is the same as in `Main::setup()`, only core and some editor types
+@@ -669,7 +669,9 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
+ List<String> args;
+ List<String> main_args;
+ List<String> user_args;
++#ifdef TOOLS_ENABLED
+ bool adding_user_args = false;
++#endif
+ List<String> platform_args = OS::get_singleton()->get_cmdline_platform_args();
+
+ // Add command line arguments.
+@@ -764,6 +766,19 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
+ }
#endif
- List<String>::Element *N = I->next();
--
-+#ifdef TOOLS_ENABLED
- 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() == "--main-pack") { // needed for JS bindings
++#ifndef TOOLS_ENABLED
++ if (I->get() == "--main-pack") {
+ if (I->next()) {
+ main_pack = I->next()->get();
+ N = I->next()->next();
@@ -61,12 +65,14 @@ index 37ef4332..ecc30d7e 100644
+ OS::get_singleton()->print("Missing path to main pack file, aborting.\n");
+ goto error;
+ };
-+#endif
-+#ifdef TOOLS_ENABLED
- } 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.
-@@ -737,7 +748,6 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
++ } else {
++ user_args.push_back(I->get());
++ }
++#else
+ if (adding_user_args) {
+ user_args.push_back(I->get());
+ } else if (I->get() == "-h" || I->get() == "--help" || I->get() == "/?") { // display help
+@@ -1028,7 +1043,6 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
OS::get_singleton()->print("Missing render thread mode argument, aborting.\n");
goto error;
}
@@ -74,15 +80,15 @@ index 37ef4332..ecc30d7e 100644
} else if (I->get() == "-e" || I->get() == "--editor") { // starts editor
editor = true;
-@@ -773,7 +783,6 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
-
- editor = true;
+@@ -1116,7 +1130,6 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
+ audio_driver = "Dummy";
+ display_driver = "headless";
main_args.push_back(I->get());
-#endif
} else if (I->get() == "--path") { // set path of project to start or edit
if (I->next()) {
-@@ -806,9 +815,7 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
+@@ -1148,9 +1161,7 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
} else {
project_path = path;
}
@@ -92,39 +98,27 @@ index 37ef4332..ecc30d7e 100644
} else if (I->get() == "-b" || I->get() == "--breakpoints") { // add breakpoints
if (I->next()) {
-@@ -840,15 +847,6 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
- goto error;
- }
-
-- } else if (I->get() == "--main-pack") {
-- if (I->next()) {
-- main_pack = I->next()->get();
-- N = I->next()->next();
-- } else {
-- OS::get_singleton()->print("Missing path to main pack file, aborting.\n");
-- goto error;
-- };
--
- } else if (I->get() == "-d" || I->get() == "--debug") {
- debug_mode = "local";
- OS::get_singleton()->_debug_stdout = true;
-@@ -897,6 +895,7 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
- OS::get_singleton()->disable_crash_handler();
- } else if (I->get() == "--skip-breakpoints") {
- skip_breakpoints = true;
-+#endif
+@@ -1293,18 +1304,15 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
} else {
main_args.push_back(I->get());
}
-@@ -909,7 +908,6 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
- OS::get_singleton()->print("Error: Command line arguments implied opening both editor and project manager, which is not possible. Aborting.\n");
+-
++#endif
+ 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
-@@ -932,7 +930,7 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
+ FileAccessNetwork::configure();
+@@ -1326,7 +1334,7 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
FileAccess::make_default<FileAccessNetwork>(FileAccess::ACCESS_RESOURCES);
}
@@ -133,28 +127,7 @@ index 37ef4332..ecc30d7e 100644
if (globals->setup(project_path, main_pack, upwards, editor) == OK) {
#ifdef TOOLS_ENABLED
found_project = true;
-@@ -1001,12 +999,6 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
- if (editor) {
- packed_data->set_disabled(true);
- globals->set_disable_feature_overrides(true);
-- }
--
--#endif
--
--#ifdef TOOLS_ENABLED
-- if (editor) {
- Engine::get_singleton()->set_editor_hint(true);
- main_args.push_back("--editor");
- if (!init_windowed) {
-@@ -1281,7 +1273,6 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
- return OK;
-
- error:
--
- video_driver = "";
- audio_driver = "";
- tablet_driver = "";
-@@ -1290,9 +1281,11 @@ error:
+@@ -1886,9 +1894,11 @@ error:
args.clear();
main_args.clear();
@@ -164,14 +137,14 @@ index 37ef4332..ecc30d7e 100644
}
+#endif
- if (performance) {
- memdelete(performance);
-@@ -1338,7 +1331,7 @@ error:
+ EngineDebugger::deinitialize();
+
+@@ -1935,7 +1945,7 @@ error:
Error Main::setup2(Thread::ID p_main_tid_override) {
// Print engine name and version
- print_line(String(VERSION_NAME) + " v" + get_full_version_string() + " - " + String(VERSION_WEBSITE));
+ print_line("v" + get_full_version_string());
- #if !defined(NO_THREADS)
- if (p_main_tid_override) {
+ engine->startup_benchmark_begin_measure("servers");
+