godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use libao driver on X11 platform

Browse Source
This commit is contained in:
Anton Yabchinskiy 2014-11-20 03:15:45 +03:00
parent 540b95f5b0
commit c26a1b9d7b
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
platform/x11/detect.py
View File

@ -112,6 +112,11 @@ def configure(env):
env.Append(CCFLAGS=['-DFREETYPE_ENABLED']) 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']) env.Append(CPPFLAGS=['-DOPENGL_ENABLED','-DGLEW_ENABLED'])
env.Append(CPPFLAGS=["-DALSA_ENABLED"]) env.Append(CPPFLAGS=["-DALSA_ENABLED"])
env.Append(CPPFLAGS=['-DX11_ENABLED','-DUNIX_ENABLED','-DGLES2_ENABLED','-DGLES1_ENABLED','-DGLES_OVER_GL']) env.Append(CPPFLAGS=['-DX11_ENABLED','-DUNIX_ENABLED','-DGLES2_ENABLED','-DGLES1_ENABLED','-DGLES_OVER_GL'])

4
platform/x11/os_x11.cpp
View File

@ -1384,6 +1384,10 @@ OS_X11::OS_X11() {
AudioDriverManagerSW::add_driver(&driver_alsa); AudioDriverManagerSW::add_driver(&driver_alsa);
#endif #endif
#ifdef AO_ENABLED
AudioDriverManagerSW::add_driver(&driver_ao);
#endif
minimized = false; minimized = false;
xim_style=NULL; xim_style=NULL;
mouse_mode=MOUSE_MODE_VISIBLE; mouse_mode=MOUSE_MODE_VISIBLE;

5
platform/x11/os_x11.h
View File

@ -43,6 +43,7 @@
#include "servers/spatial_sound_2d/spatial_sound_2d_server_sw.h" #include "servers/spatial_sound_2d/spatial_sound_2d_server_sw.h"
#include "drivers/rtaudio/audio_driver_rtaudio.h" #include "drivers/rtaudio/audio_driver_rtaudio.h"
#include "drivers/alsa/audio_driver_alsa.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 "servers/physics_2d/physics_2d_server_sw.h"
#include <X11/keysym.h> #include <X11/keysym.h>
@ -129,6 +130,10 @@ class OS_X11 : public OS_Unix {
AudioDriverALSA driver_alsa; AudioDriverALSA driver_alsa;
#endif #endif
#ifdef AO_ENABLED
AudioDriverAO driver_ao;
#endif
enum { enum {
JOYSTICKS_MAX = 8, JOYSTICKS_MAX = 8,
MAX_JOY_AXIS = 32768, // I've no idea MAX_JOY_AXIS = 32768, // I've no idea