diff --git a/drivers/SCsub b/drivers/SCsub index bed1f22a64f..3028139f50d 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 9fbb467baa1..00000000000 --- 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 88c9b8b4649..859095fa5ad 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 similarity index 100% rename from drivers/media_kit/audio_driver_media_kit.cpp rename to 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 similarity index 100% rename from drivers/media_kit/audio_driver_media_kit.h rename to platform/haiku/audio_driver_media_kit.h diff --git a/platform/haiku/os_haiku.h b/platform/haiku/os_haiku.h index f88b8182f86..57b72df3cfc 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"