浏览代码

Merge pull request #95295 from bruvzg/macos_kill

[macOS] Remove kill override.
Rémi Verschelde 1 年之前
父节点
当前提交
088065c6cc
共有 3 个文件被更改,包括 1 次插入14 次删除
  1. 1 1
      .github/workflows/web_builds.yml
  2. 0 1
      platform/macos/os_macos.h
  3. 0 12
      platform/macos/os_macos.mm

+ 1 - 1
.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:

+ 0 - 1
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;

+ 0 - 12
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;