diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2023-02-02 16:30:19 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2023-02-02 16:30:19 +0100 |
| commit | db8c85a75ff0a52eaa8b80d450dc6c1d84b4d631 (patch) | |
| tree | 0614f00f0eadecfd231e26d4f590c7cafd2046a8 | |
| parent | a43ec333c4be0272e9fed802a566b3d51aaa11ee (diff) | |
| parent | c197b398c38727c6cce3d2fec7aa07d2e1020e09 (diff) | |
Merge pull request #72537 from akien-mga/fix-no-deprecated-build
Fix build with `deprecated=no` not exclude ProjectConverter3To4 options
| -rw-r--r-- | main/main.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/main/main.cpp b/main/main.cpp index c5a9f94417..3aa9a44a21 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -2366,8 +2366,10 @@ bool Main::start() { String _export_preset; bool export_debug = false; bool export_pack_only = false; +#ifndef DISABLE_DEPRECATED bool converting_project = false; bool validating_converting_project = false; +#endif // DISABLE_DEPRECATED #endif main_timer_sync.init(OS::get_singleton()->get_ticks_usec()); @@ -2383,10 +2385,12 @@ bool Main::start() { #ifdef TOOLS_ENABLED } else if (args[i] == "--no-docbase") { doc_base = false; +#ifndef DISABLE_DEPRECATED } else if (args[i] == "--convert-3to4") { converting_project = true; } else if (args[i] == "--validate-conversion-3to4") { validating_converting_project = true; +#endif // DISABLE_DEPRECATED } else if (args[i] == "-e" || args[i] == "--editor") { editor = true; } else if (args[i] == "-p" || args[i] == "--project-manager") { @@ -2547,6 +2551,7 @@ bool Main::start() { return false; } +#ifndef DISABLE_DEPRECATED if (converting_project) { int exit_code = ProjectConverter3To4(converter_max_kb_file, converter_max_line_length).convert(); OS::get_singleton()->set_exit_code(exit_code); @@ -2557,6 +2562,7 @@ bool Main::start() { OS::get_singleton()->set_exit_code(exit_code); return false; } +#endif // DISABLE_DEPRECATED #endif |