diff options
| -rw-r--r-- | .github/workflows/web_builds.yml | 2 | ||||
| -rw-r--r-- | platform/macos/os_macos.h | 1 | ||||
| -rw-r--r-- | platform/macos/os_macos.mm | 12 |
3 files changed, 1 insertions, 14 deletions
diff --git a/.github/workflows/web_builds.yml b/.github/workflows/web_builds.yml index add5fa8154..d3a6b5b8b8 100644 --- a/.github/workflows/web_builds.yml +++ b/.github/workflows/web_builds.yml @@ -7,7 +7,7 @@ env: # Used for the cache key. Add version suffix to force clean build. GODOT_BASE_BRANCH: master SCONSFLAGS: verbose=yes warnings=extra werror=yes debug_symbols=no use_closure_compiler=yes - EM_VERSION: 3.1.59 + EM_VERSION: 3.1.64 EM_CACHE_FOLDER: "emsdk-cache" concurrency: diff --git a/platform/macos/os_macos.h b/platform/macos/os_macos.h index df3a4009a3..303fc112bf 100644 --- a/platform/macos/os_macos.h +++ b/platform/macos/os_macos.h @@ -109,7 +109,6 @@ public: virtual String get_executable_path() const override; virtual Error create_process(const String &p_path, const List<String> &p_arguments, ProcessID *r_child_id = nullptr, bool p_open_console = false) override; virtual Error create_instance(const List<String> &p_arguments, ProcessID *r_child_id = nullptr) override; - virtual Error kill(const ProcessID &p_pid) override; virtual bool is_process_running(const ProcessID &p_pid) const override; virtual String get_unique_id() const override; diff --git a/platform/macos/os_macos.mm b/platform/macos/os_macos.mm index 495246344b..3a82514766 100644 --- a/platform/macos/os_macos.mm +++ b/platform/macos/os_macos.mm @@ -675,18 +675,6 @@ bool OS_MacOS::is_process_running(const ProcessID &p_pid) const { return ![app isTerminated]; } -Error OS_MacOS::kill(const ProcessID &p_pid) { - NSRunningApplication *app = [NSRunningApplication runningApplicationWithProcessIdentifier:(pid_t)p_pid]; - if (!app) { - return OS_Unix::kill(p_pid); - } - bool terminated = [app terminate]; - if (!terminated) { - terminated = [app forceTerminate]; - } - return terminated ? OK : ERR_INVALID_PARAMETER; -} - String OS_MacOS::get_unique_id() const { static String serial_number; |