diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-12-08 17:48:03 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-12-08 17:48:03 -0300 |
| commit | c650d4e19c1f1fffc2f798db3d18a1ad1a58ab8b (patch) | |
| tree | 4b9280503112055e2431344547001db59702e69c /platform/x11/detect.py | |
| parent | 09ff4571859b012b64876883e186bb7dfaca0c8c (diff) | |
| parent | e176bb6a7c736e8f2fe7fb96f2a4ecbb296dced0 (diff) | |
Merge branch 'master' of https://github.com/godotengine/godot
Diffstat (limited to 'platform/x11/detect.py')
| -rw-r--r-- | platform/x11/detect.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/platform/x11/detect.py b/platform/x11/detect.py index d996587864..349e58cd7a 100644 --- a/platform/x11/detect.py +++ b/platform/x11/detect.py @@ -1,6 +1,7 @@ import os import sys +import platform def is_active(): @@ -147,7 +148,9 @@ def configure(env): env.Append(CPPFLAGS=['-DOPENGL_ENABLED','-DGLEW_ENABLED']) - env.Append(CPPFLAGS=["-DALSA_ENABLED"]) + if platform.platform() == 'Linux': + env.Append(CPPFLAGS=["-DALSA_ENABLED"]) + env.Append(LIBS=['asound']) if (env["pulseaudio"]=="yes"): if not os.system("pkg-config --exists libpulse-simple"): @@ -158,7 +161,7 @@ def configure(env): print("PulseAudio development libraries not found, disabling driver") env.Append(CPPFLAGS=['-DX11_ENABLED','-DUNIX_ENABLED','-DGLES2_ENABLED','-DGLES_OVER_GL']) - env.Append(LIBS=['GL', 'GLU', 'pthread','asound','z']) #TODO detect linux/BSD! + env.Append(LIBS=['GL', 'GLU', 'pthread', 'z']) #env.Append(CPPFLAGS=['-DMPC_FIXED_POINT']) #host compiler is default.. |