diff options
| author | Kostadin Damyanov | 2015-08-14 22:52:28 +0300 |
|---|---|---|
| committer | Kostadin Damyanov | 2015-08-14 22:52:28 +0300 |
| commit | 2a757a6ad4ef4e7767b7d3ef7e177ec6613ef6d1 (patch) | |
| tree | d0d5c4fff40fe548f6c3e35037b2eb373ad4d403 | |
| parent | b038a2c3c21b7be4cc1db0aca6c84ddaf57132cf (diff) | |
| download | godot-2a757a6ad4ef4e7767b7d3ef7e177ec6613ef6d1.tar.gz godot-2a757a6ad4ef4e7767b7d3ef7e177ec6613ef6d1.tar.zst godot-2a757a6ad4ef4e7767b7d3ef7e177ec6613ef6d1.zip | |
Haiku: move the audio driver to platform/haiku
| -rw-r--r-- | drivers/SCsub | 1 | ||||
| -rw-r--r-- | drivers/media_kit/SCsub | 5 | ||||
| -rw-r--r-- | platform/haiku/SCsub | 3 | ||||
| -rw-r--r-- | platform/haiku/audio_driver_media_kit.cpp (renamed from drivers/media_kit/audio_driver_media_kit.cpp) | 0 | ||||
| -rw-r--r-- | platform/haiku/audio_driver_media_kit.h (renamed from drivers/media_kit/audio_driver_media_kit.h) | 0 | ||||
| -rw-r--r-- | platform/haiku/os_haiku.h | 2 |
6 files changed, 3 insertions, 8 deletions
diff --git a/drivers/SCsub b/drivers/SCsub index bed1f22a6..3028139f5 100644 --- a/drivers/SCsub +++ b/drivers/SCsub @@ -12,7 +12,6 @@ SConscript('windows/SCsub'); SConscript('gles2/SCsub'); SConscript('gl_context/SCsub'); SConscript('openssl/SCsub'); -SConscript('media_kit/SCsub'); if (env["png"]=="yes"): SConscript("png/SCsub"); diff --git a/drivers/media_kit/SCsub b/drivers/media_kit/SCsub deleted file mode 100644 index 9fbb467ba..000000000 --- a/drivers/media_kit/SCsub +++ /dev/null @@ -1,5 +0,0 @@ -Import('env') - -env.add_source_files(env.drivers_sources,"*.cpp") - -Export('env') diff --git a/platform/haiku/SCsub b/platform/haiku/SCsub index 88c9b8b46..859095fa5 100644 --- a/platform/haiku/SCsub +++ b/platform/haiku/SCsub @@ -6,7 +6,8 @@ common_haiku = [ 'haiku_application.cpp', 'haiku_direct_window.cpp', 'haiku_gl_view.cpp', - 'key_mapping_haiku.cpp' + 'key_mapping_haiku.cpp', + 'audio_driver_media_kit.cpp' ] env.Program( diff --git a/drivers/media_kit/audio_driver_media_kit.cpp b/platform/haiku/audio_driver_media_kit.cpp index 3fabe4f96..3fabe4f96 100644 --- a/drivers/media_kit/audio_driver_media_kit.cpp +++ b/platform/haiku/audio_driver_media_kit.cpp diff --git a/drivers/media_kit/audio_driver_media_kit.h b/platform/haiku/audio_driver_media_kit.h index a23ec447f..a23ec447f 100644 --- a/drivers/media_kit/audio_driver_media_kit.h +++ b/platform/haiku/audio_driver_media_kit.h diff --git a/platform/haiku/os_haiku.h b/platform/haiku/os_haiku.h index f88b8182f..57b72df3c 100644 --- a/platform/haiku/os_haiku.h +++ b/platform/haiku/os_haiku.h @@ -11,8 +11,8 @@ #include "servers/audio/sample_manager_sw.h" #include "servers/spatial_sound/spatial_sound_server_sw.h" #include "servers/spatial_sound_2d/spatial_sound_2d_server_sw.h" -#include "drivers/media_kit/audio_driver_media_kit.h" +#include "audio_driver_media_kit.h" #include "context_gl_haiku.h" #include "haiku_application.h" #include "haiku_direct_window.h" |