diff options
| author | Anton Yabchinskiy <arn@bestmx.ru> | 2014-11-22 17:43:20 +0300 |
|---|---|---|
| committer | Anton Yabchinskiy <arn@bestmx.ru> | 2014-11-22 17:43:20 +0300 |
| commit | e696dba522b3f4b9a3d3bc8ec3d6a09123d9ee50 (patch) | |
| tree | 5330cf56871f8c5ba593a502739ce1c6cbfc2d94 /platform/x11 | |
| parent | 7ed9a8a007044bf90cb7e6677598e20fc1abc121 (diff) | |
| parent | e58731ee0146be1ccc365ff0e6dadafcdacb0c0e (diff) | |
Merge branch 'libao'
Diffstat (limited to 'platform/x11')
| -rw-r--r-- | platform/x11/detect.py | 5 | ||||
| -rw-r--r-- | platform/x11/os_x11.cpp | 4 | ||||
| -rw-r--r-- | platform/x11/os_x11.h | 5 |
3 files changed, 14 insertions, 0 deletions
diff --git a/platform/x11/detect.py b/platform/x11/detect.py index e2c84182b4..2faaf51716 100644 --- 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': diff --git a/platform/x11/os_x11.cpp b/platform/x11/os_x11.cpp index 1e6b7dc90e..278950ba3a 100644 --- a/platform/x11/os_x11.cpp +++ b/platform/x11/os_x11.cpp @@ -1385,6 +1385,10 @@ OS_X11::OS_X11() { AudioDriverManagerSW::add_driver(&driver_alsa); #endif +#ifdef AO_ENABLED + AudioDriverManagerSW::add_driver(&driver_ao); +#endif + minimized = false; xim_style=NULL; mouse_mode=MOUSE_MODE_VISIBLE; diff --git a/platform/x11/os_x11.h b/platform/x11/os_x11.h index 2ffca0e042..815896bc37 100644 --- a/platform/x11/os_x11.h +++ b/platform/x11/os_x11.h @@ -43,6 +43,7 @@ #include "servers/spatial_sound_2d/spatial_sound_2d_server_sw.h" #include "drivers/rtaudio/audio_driver_rtaudio.h" #include "drivers/alsa/audio_driver_alsa.h" +#include "drivers/ao/audio_driver_ao.h" #include "servers/physics_2d/physics_2d_server_sw.h" #include <X11/keysym.h> @@ -129,6 +130,10 @@ class OS_X11 : public OS_Unix { AudioDriverALSA driver_alsa; #endif +#ifdef AO_ENABLED + AudioDriverAO driver_ao; +#endif + enum { JOYSTICKS_MAX = 8, MAX_JOY_AXIS = 32768, // I've no idea |