diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-11-19 20:05:37 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-11-19 20:05:37 -0300 |
| commit | b519e32e660ed4e4cf8945df798ad30b0abfeaae (patch) | |
| tree | b7b12111f270e4bbe01aef1b9a01ee78dab18818 /platform/x11/detect.py | |
| parent | 06d842566c8c10d99c74d232775989ba3100459d (diff) | |
| parent | dd09215c9070e70f8af8c24e4319c7267fddcfa2 (diff) | |
Merge pull request #2840 from godotengine/revert-903-libao
Revert "libao audio driver"
Diffstat (limited to 'platform/x11/detect.py')
| -rw-r--r-- | platform/x11/detect.py | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/platform/x11/detect.py b/platform/x11/detect.py index 6b1347a3cc..9a52a7c92b 100644 --- a/platform/x11/detect.py +++ b/platform/x11/detect.py @@ -1,7 +1,6 @@ import os import sys -import platform def is_active(): @@ -144,14 +143,10 @@ def configure(env): - + env.Append(CPPFLAGS=['-DOPENGL_ENABLED','-DGLEW_ENABLED']) - if platform.platform() == 'Linux': - env.Append(CPPFLAGS=["-DALSA_ENABLED"]) - env.Append(LIBS=['asound']) - if env['ao'] == 'yes': - env.ParseConfig('pkg-config ao --cflags --libs') - env.Append(CPPFLAGS=['-DAO_ENABLED']) + env.Append(CPPFLAGS=["-DALSA_ENABLED"]) + if (env["pulseaudio"]=="yes"): if not os.system("pkg-config --exists libpulse-simple"): print("Enabling PulseAudio") @@ -161,7 +156,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', 'z']) + env.Append(LIBS=['GL', 'GLU', 'pthread','asound','z']) #TODO detect linux/BSD! #env.Append(CPPFLAGS=['-DMPC_FIXED_POINT']) #host compiler is default.. |