mirror of
https://github.com/Relintai/pandemonium_engine.git
synced 2025-04-09 21:32:37 +02:00
Fix non tools build.
This commit is contained in:
parent
00a199ab21
commit
7a6f6aa8ef
@ -537,6 +537,10 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
|
|||||||
bool quiet_stdout = false;
|
bool quiet_stdout = false;
|
||||||
int rtm = -1;
|
int rtm = -1;
|
||||||
|
|
||||||
|
#ifndef TOOLS_ENABLED
|
||||||
|
bool has_script = false;
|
||||||
|
#endif
|
||||||
|
|
||||||
String remotefs;
|
String remotefs;
|
||||||
String remotefs_pass;
|
String remotefs_pass;
|
||||||
|
|
||||||
@ -600,6 +604,12 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
|
|||||||
goto error;
|
goto error;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef TOOLS_ENABLED
|
||||||
|
} else if (I->get() == "-s" || I->get() == "--script") {
|
||||||
|
has_script = true;
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
} else if (I->get() == "-v" || I->get() == "--verbose") { // verbose output
|
} else if (I->get() == "-v" || I->get() == "--verbose") { // verbose output
|
||||||
|
|
||||||
OS::get_singleton()->_verbose_stdout = true;
|
OS::get_singleton()->_verbose_stdout = true;
|
||||||
@ -1054,7 +1064,7 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
|
|||||||
#ifdef TOOLS_ENABLED
|
#ifdef TOOLS_ENABLED
|
||||||
editor = false;
|
editor = false;
|
||||||
#else
|
#else
|
||||||
if (script.empty()) {
|
if (!has_script) {
|
||||||
const String error_msg = "Error: Couldn't load project data at path \"" + project_path + "\". Is the .pck file missing?\nIf you've renamed the executable, the associated .pck file should also be renamed to match the executable's name (without the extension).\n";
|
const String error_msg = "Error: Couldn't load project data at path \"" + project_path + "\". Is the .pck file missing?\nIf you've renamed the executable, the associated .pck file should also be renamed to match the executable's name (without the extension).\n";
|
||||||
OS::get_singleton()->print("%s", error_msg.utf8().get_data());
|
OS::get_singleton()->print("%s", error_msg.utf8().get_data());
|
||||||
OS::get_singleton()->alert(error_msg);
|
OS::get_singleton()->alert(error_msg);
|
||||||
|
Loading…
Reference in New Issue
Block a user