From 5c2c47a17449a69c24ab92804dbb7ca09fd920c9 Mon Sep 17 00:00:00 2001 From: Leon Krause Date: Mon, 29 Oct 2018 21:15:15 +0100 Subject: Add proper stubs for OS_JavaScript::execute(), get_process_id(), kill() Avoids linker warnings and errors about undefined references. --- drivers/unix/os_unix.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'drivers/unix/os_unix.cpp') diff --git a/drivers/unix/os_unix.cpp b/drivers/unix/os_unix.cpp index 7ff27be501..279274734f 100644 --- a/drivers/unix/os_unix.cpp +++ b/drivers/unix/os_unix.cpp @@ -288,6 +288,11 @@ uint64_t OS_Unix::get_ticks_usec() const { Error OS_Unix::execute(const String &p_path, const List &p_arguments, bool p_blocking, ProcessID *r_child_id, String *r_pipe, int *r_exitcode, bool read_stderr) { +#ifdef __EMSCRIPTEN__ + // Don't compile this code at all to avoid undefined references. + // Actual virtual call goes to OS_JavaScript. + ERR_FAIL_V(ERR_BUG); +#else if (p_blocking && r_pipe) { String argss; @@ -354,6 +359,7 @@ Error OS_Unix::execute(const String &p_path, const List &p_arguments, bo } return OK; +#endif } Error OS_Unix::kill(const ProcessID &p_pid) { -- cgit v1.2.3