diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-10-29 21:25:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-29 21:25:46 +0100 |
| commit | 4d9b8a98ba1bdd2bc7d80f4ab61061c07298fd15 (patch) | |
| tree | 30800f17fcf1f229ce46a743320b5eb18177ba87 /platform/server/os_server.h | |
| parent | e647342140d8eb960b2a72d83b4b86e43aef4fc7 (diff) | |
| parent | fe93bb03fec293e3ef38c9b01dc0b10c857c1d21 (diff) | |
Merge pull request #23279 from marcelofg55/osx_server
Server platform works on OS X too
Diffstat (limited to 'platform/server/os_server.h')
| -rw-r--r-- | platform/server/os_server.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/platform/server/os_server.h b/platform/server/os_server.h index 07d70e5236..0367ec3db9 100644 --- a/platform/server/os_server.h +++ b/platform/server/os_server.h @@ -34,8 +34,14 @@ #include "drivers/rtaudio/audio_driver_rtaudio.h" #include "drivers/unix/os_unix.h" #include "main/input_default.h" +#ifdef __APPLE__ +#include "platform/osx/crash_handler_osx.h" +#include "platform/osx/power_osx.h" +#include "platform/osx/sem_osx.h" +#else #include "platform/x11/crash_handler_x11.h" #include "platform/x11/power_x11.h" +#endif #include "servers/audio_server.h" #include "servers/visual/rasterizer.h" #include "servers/visual_server.h" @@ -61,7 +67,11 @@ class OS_Server : public OS_Unix { InputDefault *input; +#ifdef __APPLE__ + power_osx *power_manager; +#else PowerX11 *power_manager; +#endif CrashHandler crash_handler; |