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/detect.py | |
| 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/detect.py')
| -rw-r--r-- | platform/server/detect.py | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/platform/server/detect.py b/platform/server/detect.py index 597a2ff6a0..3ebfb4369a 100644 --- a/platform/server/detect.py +++ b/platform/server/detect.py @@ -11,9 +11,15 @@ def get_name(): return "Server" +def get_program_suffix(): + if (sys.platform == "darwin"): + return "osx" + return "x11" + + def can_build(): - if (os.name != "posix" or sys.platform == "darwin"): + if (os.name != "posix" or sys.platform != "darwin"): return False return True @@ -147,6 +153,10 @@ def configure(env): env.Append(CPPPATH=['#platform/server']) env.Append(CPPFLAGS=['-DSERVER_ENABLED', '-DUNIX_ENABLED']) + + if (platform.system() == "Darwin"): + env.Append(LINKFLAGS=['-framework', 'Cocoa', '-framework', 'Carbon', '-lz', '-framework', 'IOKit']) + env.Append(LIBS=['pthread']) if (platform.system() == "Linux"): |