diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-05-11 14:20:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-11 14:20:50 +0200 |
| commit | eaa6613f0683bfc29767e9c4abc9f5b1435b5577 (patch) | |
| tree | 805487316188f73ca563162545c56165e115b79f | |
| parent | 5676ab368a0f739d5981e4980fd3c54b728a1ae7 (diff) | |
| parent | c4c7270cc7108e514b596dd7f4aac53810f0186d (diff) | |
Merge pull request #18770 from eska014/cmdline
Command line fixes
| -rw-r--r-- | editor/editor_node.cpp | 2 | ||||
| -rw-r--r-- | main/main.cpp | 9 | ||||
| -rw-r--r-- | misc/dist/linux/godot.6 | 4 |
3 files changed, 9 insertions, 6 deletions
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index fd5a6dffc9..3f0a09cfd9 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -483,7 +483,7 @@ void EditorNode::_fs_changed() { // come during the export export_defer.preset = ""; Error err = OK; - if (!preset->is_runnable() && (export_defer.path.ends_with(".pck") || export_defer.path.ends_with(".zip"))) { + if (export_defer.path.ends_with(".pck") || export_defer.path.ends_with(".zip")) { if (export_defer.path.ends_with(".zip")) { err = platform->export_zip(preset, export_defer.debug, export_defer.path); } else if (export_defer.path.ends_with(".pck")) { diff --git a/main/main.cpp b/main/main.cpp index 9c8474cb5b..36d27f19ec 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -262,8 +262,8 @@ void Main::print_help(const char *p_binary) { OS::get_singleton()->print("Standalone tools:\n"); OS::get_singleton()->print(" -s, --script <script> Run a script.\n"); #ifdef TOOLS_ENABLED - OS::get_singleton()->print(" --export <target> Export the project using the given export target.\n"); - OS::get_singleton()->print(" --export-debug Use together with --export, enables debug mode for the template.\n"); + OS::get_singleton()->print(" --export <target> Export the project using the given export target. Export only main pack if path ends with .pck or .zip'.\n"); + OS::get_singleton()->print(" --export-debug <target> Like --export, but use debug template.\n"); OS::get_singleton()->print(" --doctool <path> Dump the engine API reference to the given <path> in XML format, merging if existing files are found.\n"); OS::get_singleton()->print(" --no-docbase Disallow dumping the base types (used with --doctool).\n"); OS::get_singleton()->print(" --build-solutions Build the scripting solutions (e.g. for C# projects).\n"); @@ -337,7 +337,7 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph String video_driver = ""; String audio_driver = ""; - String game_path = "."; + String game_path; bool upwards = false; String debug_mode; String debug_host; @@ -693,6 +693,9 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph I = N; } + if (game_path.empty()) { + game_path = "."; + } if (globals->setup(game_path, main_pack, upwards) == OK) { found_project = true; } else { diff --git a/misc/dist/linux/godot.6 b/misc/dist/linux/godot.6 index 26ebe01af7..64495d817e 100644 --- a/misc/dist/linux/godot.6 +++ b/misc/dist/linux/godot.6 @@ -128,10 +128,10 @@ Print the frames per second to the stdout. Run a script. .TP \fB\-\-export\fR <target> -Export the project using the given export target. +Export the project using the given export target. Export only main pack if path ends with .pck or .zip. .TP \fB\-\-export\-debug\fR -Use together with \fB\-\-export\fR, enables debug mode for the template. +Like \-\-export, but use debug template. .TP \fB\-\-doctool\fR <path> Dump the engine API reference to the given <path> in XML format, merging if existing files are found. |