diff options
| author | Anton Yabchinskiy <arn@bestmx.ru> | 2014-11-28 17:16:55 +0300 |
|---|---|---|
| committer | Anton Yabchinskiy <arn@bestmx.ru> | 2014-11-28 17:16:55 +0300 |
| commit | fff056bdc5b030e39ecfa619c8f58b20305ebeae (patch) | |
| tree | 21144d306c51996435130a2ee20ea8e80a456baf | |
| parent | 6bfdfa041a0097db491e0d36ce9d41e125361298 (diff) | |
| parent | c29239a6f9b04f0050266b6c4ed8641500d9ed10 (diff) | |
Merge branch 'libao'
| -rw-r--r-- | drivers/ao/audio_driver_ao.cpp | 5 | ||||
| -rw-r--r-- | drivers/ao/audio_driver_ao.h | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/drivers/ao/audio_driver_ao.cpp b/drivers/ao/audio_driver_ao.cpp index b42e3af6bb..a484a5882e 100644 --- a/drivers/ao/audio_driver_ao.cpp +++ b/drivers/ao/audio_driver_ao.cpp @@ -6,6 +6,7 @@ /* http://www.godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2014 Anton Yabchinskiy. */ /* */ /* Permission is hereby granted, free of charge, to any person obtaining */ /* a copy of this software and associated documentation files (the */ @@ -28,6 +29,8 @@ /*************************************************************************/ #include "audio_driver_ao.h" +#ifdef AO_ENABLED + #include "globals.h" #include "os/os.h" @@ -154,3 +157,5 @@ AudioDriverAO::AudioDriverAO() { AudioDriverAO::~AudioDriverAO() { ao_shutdown(); }; + +#endif diff --git a/drivers/ao/audio_driver_ao.h b/drivers/ao/audio_driver_ao.h index b64b8dce9d..023e051c8b 100644 --- a/drivers/ao/audio_driver_ao.h +++ b/drivers/ao/audio_driver_ao.h @@ -6,6 +6,7 @@ /* http://www.godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2014 Anton Yabchinskiy. */ /* */ /* Permission is hereby granted, free of charge, to any person obtaining */ /* a copy of this software and associated documentation files (the */ |