godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-11 13:10:58 +00:00
Code Releases Wiki Activity

Merge branch 'master' of github.com:okamstudio/godot

Browse Source 
Conflicts:
	drivers/SCsub
	platform/x11/detect.py
	platform/x11/os_x11.h
This commit is contained in:
Anton Yabchinskiy
2014-12-23 23:44:07 +03:00
parent ff755f93eb 530d717a67
commit 4ab1bcde35
109 changed files with 4285 additions and 1364 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
platform/x11/detect.py
View File

@@ -122,6 +122,13 @@ def configure(env):
if platform.platform() == 'Linux':
env.Append(CPPFLAGS=["-DALSA_ENABLED"])
env.Append(LIBS=['asound'])
if not os.system("pkg-config --exists libpulse-simple"):
print("Enabling PulseAudio")
env.Append(CPPFLAGS=["-DPULSEAUDIO_ENABLED"])
env.ParseConfig('pkg-config --cflags --libs libpulse-simple')
else:
print("PulseAudio development libraries not found, disabling driver")
env.Append(CPPFLAGS=['-DX11_ENABLED','-DUNIX_ENABLED','-DGLES2_ENABLED','-DGLES1_ENABLED','-DGLES_OVER_GL'])
env.Append(LIBS=['GL', 'GLU', 'pthread', 'z'])
#env.Append(CPPFLAGS=['-DMPC_FIXED_POINT'])