godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #72537 from akien-mga/fix-no-deprecated-build

Browse Source 
Fix build with `deprecated=no` not exclude ProjectConverter3To4 options
This commit is contained in:
Rémi Verschelde 2023-02-02 16:30:19 +01:00
commit db8c85a75f
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
main/main.cpp
View File

@ -2366,8 +2366,10 @@ bool Main::start() {
String _export_preset; String _export_preset;
bool export_debug = false; bool export_debug = false;
bool export_pack_only = false; bool export_pack_only = false;
#ifndef DISABLE_DEPRECATED
bool converting_project = false; bool converting_project = false;
bool validating_converting_project = false; bool validating_converting_project = false;
#endif // DISABLE_DEPRECATED
#endif #endif
main_timer_sync.init(OS::get_singleton()->get_ticks_usec()); main_timer_sync.init(OS::get_singleton()->get_ticks_usec());
@ -2383,10 +2385,12 @@ bool Main::start() {
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED
} else if (args[i] == "--no-docbase") { } else if (args[i] == "--no-docbase") {
doc_base = false; doc_base = false;
#ifndef DISABLE_DEPRECATED
} else if (args[i] == "--convert-3to4") { } else if (args[i] == "--convert-3to4") {
converting_project = true; converting_project = true;
} else if (args[i] == "--validate-conversion-3to4") { } else if (args[i] == "--validate-conversion-3to4") {
validating_converting_project = true; validating_converting_project = true;
#endif // DISABLE_DEPRECATED
} else if (args[i] == "-e" || args[i] == "--editor") { } else if (args[i] == "-e" || args[i] == "--editor") {
editor = true; editor = true;
} else if (args[i] == "-p" || args[i] == "--project-manager") { } else if (args[i] == "-p" || args[i] == "--project-manager") {
@ -2547,6 +2551,7 @@ bool Main::start() {
return false; return false;
} }
#ifndef DISABLE_DEPRECATED
if (converting_project) { if (converting_project) {
int exit_code = ProjectConverter3To4(converter_max_kb_file, converter_max_line_length).convert(); int exit_code = ProjectConverter3To4(converter_max_kb_file, converter_max_line_length).convert();
OS::get_singleton()->set_exit_code(exit_code); OS::get_singleton()->set_exit_code(exit_code);
@ -2557,6 +2562,7 @@ bool Main::start() {
OS::get_singleton()->set_exit_code(exit_code); OS::get_singleton()->set_exit_code(exit_code);
return false; return false;
} }
#endif // DISABLE_DEPRECATED
#endif #endif