diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-03-05 16:33:45 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-05 16:33:45 +0100 |
| commit | 42595085a5a22f3b5399844d06e89631c42e8981 (patch) | |
| tree | da1c7092d1b0960891b4634358b1150f679fa805 /platform/server | |
| parent | bd553d072b65fe5359ab76e64566ff316d35c62e (diff) | |
| parent | 9a3a2b03b8b718409eb26252d742d48091756ef7 (diff) | |
Merge pull request #36752 from RandomShaper/rework_semaphore
Drop old semaphore implementation
Diffstat (limited to 'platform/server')
| -rw-r--r-- | platform/server/SCsub | 1 | ||||
| -rw-r--r-- | platform/server/os_server.cpp | 4 |
2 files changed, 0 insertions, 5 deletions
diff --git a/platform/server/SCsub b/platform/server/SCsub index e8538f03a6..8364164114 100644 --- a/platform/server/SCsub +++ b/platform/server/SCsub @@ -10,7 +10,6 @@ common_server = [\ if sys.platform == "darwin": common_server.append("#platform/osx/crash_handler_osx.mm") - common_server.append("#platform/osx/semaphore_osx.cpp") else: common_server.append("#platform/x11/crash_handler_x11.cpp") diff --git a/platform/server/os_server.cpp b/platform/server/os_server.cpp index 8a66332ff1..3257ec261c 100644 --- a/platform/server/os_server.cpp +++ b/platform/server/os_server.cpp @@ -68,10 +68,6 @@ void OS_Server::initialize_core() { crash_handler.initialize(); OS_Unix::initialize_core(); - -#ifdef __APPLE__ - SemaphoreOSX::make_default(); -#endif } Error OS_Server::initialize(const VideoMode &p_desired, int p_video_driver, int p_audio_driver) { |