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/SCsub | |
| 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/SCsub')
| -rw-r--r-- | platform/server/SCsub | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/platform/server/SCsub b/platform/server/SCsub index c9082f9b3a..51fd05a87e 100644 --- a/platform/server/SCsub +++ b/platform/server/SCsub @@ -1,10 +1,21 @@ #!/usr/bin/env python +import os +import platform +import sys + Import('env') common_server = [\ "os_server.cpp",\ - "#platform/x11/crash_handler_x11.cpp", - "#platform/x11/power_x11.cpp", ] + +if sys.platform == "darwin": + common_server.append("#platform/osx/crash_handler_osx.mm") + common_server.append("#platform/osx/power_osx.cpp") + common_server.append("#platform/osx/sem_osx.cpp") +else: + common_server.append("#platform/x11/crash_handler_x11.cpp") + common_server.append("#platform/x11/power_x11.cpp") + prog = env.add_program('#bin/godot_server', ['godot_server.cpp'] + common_server) |