소스 검색

Haiku: move the audio driver to platform/haiku

Kostadin Damyanov 10 년 전
부모
커밋
2a757a6ad4
6개의 변경된 파일3개의 추가작업 그리고 8개의 파일을 삭제
  1. 0 1
      drivers/SCsub
  2. 0 5
      drivers/media_kit/SCsub
  3. 2 1
      platform/haiku/SCsub
  4. 0 0
      platform/haiku/audio_driver_media_kit.cpp
  5. 0 0
      platform/haiku/audio_driver_media_kit.h
  6. 1 1
      platform/haiku/os_haiku.h

+ 0 - 1
drivers/SCsub

@@ -12,7 +12,6 @@ SConscript('windows/SCsub');
 SConscript('gles2/SCsub');
 SConscript('gles2/SCsub');
 SConscript('gl_context/SCsub');
 SConscript('gl_context/SCsub');
 SConscript('openssl/SCsub');
 SConscript('openssl/SCsub');
-SConscript('media_kit/SCsub');
 
 
 if (env["png"]=="yes"):
 if (env["png"]=="yes"):
 	SConscript("png/SCsub");
 	SConscript("png/SCsub");

+ 0 - 5
drivers/media_kit/SCsub

@@ -1,5 +0,0 @@
-Import('env')
-
-env.add_source_files(env.drivers_sources,"*.cpp")
-
-Export('env')

+ 2 - 1
platform/haiku/SCsub

@@ -6,7 +6,8 @@ common_haiku = [
 	'haiku_application.cpp',
 	'haiku_application.cpp',
 	'haiku_direct_window.cpp',
 	'haiku_direct_window.cpp',
 	'haiku_gl_view.cpp',
 	'haiku_gl_view.cpp',
-	'key_mapping_haiku.cpp'
+	'key_mapping_haiku.cpp',
+	'audio_driver_media_kit.cpp'
 ]
 ]
 
 
 env.Program(
 env.Program(

+ 0 - 0
drivers/media_kit/audio_driver_media_kit.cpp → platform/haiku/audio_driver_media_kit.cpp


+ 0 - 0
drivers/media_kit/audio_driver_media_kit.h → platform/haiku/audio_driver_media_kit.h


+ 1 - 1
platform/haiku/os_haiku.h

@@ -11,8 +11,8 @@
 #include "servers/audio/sample_manager_sw.h"
 #include "servers/audio/sample_manager_sw.h"
 #include "servers/spatial_sound/spatial_sound_server_sw.h"
 #include "servers/spatial_sound/spatial_sound_server_sw.h"
 #include "servers/spatial_sound_2d/spatial_sound_2d_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 "context_gl_haiku.h"
 #include "haiku_application.h"
 #include "haiku_application.h"
 #include "haiku_direct_window.h"
 #include "haiku_direct_window.h"