Merge branch 'libao'

2014-11-22 17:43:20 +03:00
parent 7ed9a8a007 e58731ee01
commit e696dba522
8 changed files with 252 additions and 0 deletions
--- a/platform/x11/detect.py
+++ b/platform/x11/detect.py
@ -112,6 +112,11 @@ def configure(env):
 	env.ParseConfig('pkg-config freetype2 --cflags --libs')
 	env.Append(CCFLAGS=['-DFREETYPE_ENABLED'])

+
+	if env['ao'] == 'yes':
+		env.ParseConfig('pkg-config ao --cflags --libs')
+		env.Append(CPPFLAGS=['-DAO_ENABLED'])
+
 	
 	env.Append(CPPFLAGS=['-DOPENGL_ENABLED','-DGLEW_ENABLED'])
 	if platform.platform() == 'Linux':