Browse Source

Fixes to initial commit

pull/175/head
Alice 10 years ago
parent
commit
6cf4901fb4
  1. 4
      src/Magnum/Audio/Test/CMakeLists.txt
  2. 9
      src/MagnumExternal/OpenAL/extensions.h
  3. 2
      src/MagnumPlugins/WavAudioImporter/Test/CMakeLists.txt

4
src/Magnum/Audio/Test/CMakeLists.txt

@ -36,9 +36,9 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake
corrade_add_test(AudioAbstractImporterTest AbstractImporterTest.cpp LIBRARIES MagnumAudio)
target_include_directories(AudioAbstractImporterTest PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
corrade_add_test(AudioBufferTest BufferTest.cpp LIBRARIES MagnumAudio)
#corrade_add_test(AudioContextTest ContextTest.cpp LIBRARIES MagnumAudio)
corrade_add_test(AudioContextTest ContextTest.cpp LIBRARIES MagnumAudio)
corrade_add_test(AudioRendererTest RendererTest.cpp LIBRARIES MagnumAudio)
#corrade_add_test(AudioSourceTest SourceTest.cpp LIBRARIES MagnumAudio)
corrade_add_test(AudioSourceTest SourceTest.cpp LIBRARIES MagnumAudio)
if(BUILD_AL_TESTS)
corrade_add_test(AudioBufferALTest BufferALTest.cpp LIBRARIES MagnumAudio)

9
src/MagnumExternal/OpenAL/extensions.h vendored

@ -33,6 +33,11 @@
extern "C" {
#endif
/* For compatibility with Emscripten that does not define this macro */
#ifndef AL_APIENTRY
#define AL_APIENTRY
#endif
/* AL_EXT_float32 */
#ifndef AL_EXT_float32
#define AL_EXT_float32 1
@ -106,8 +111,8 @@ extern "C" {
#define ALC_HRTF_HEADPHONES_DETECTED_SOFT 0x0004
#define ALC_HRTF_UNSUPPORTED_FORMAT_SOFT 0x0005
//typedef ALCchar* (AL_APIENTRY*LPALGETSTRINGISOFT)(ALCdevice*,ALCenum,ALCsizei);
//typedef ALCboolean (AL_APIENTRY*LPALRESETDEVICESOFT)(ALCdevice*,const ALCint*);
typedef ALCchar* (AL_APIENTRY*LPALGETSTRINGISOFT)(ALCdevice*,ALCenum,ALCsizei);
typedef ALCboolean (AL_APIENTRY*LPALRESETDEVICESOFT)(ALCdevice*,const ALCint*);
#endif
#ifdef __cplusplus

2
src/MagnumPlugins/WavAudioImporter/Test/CMakeLists.txt

@ -50,6 +50,8 @@ if(CORRADE_TARGET_EMSCRIPTEN)
emscripten_embed_file(WavAudioImporterTest mono32f.wav "/mono32f.wav")
emscripten_embed_file(WavAudioImporterTest stereo32f.wav "/stereo32f.wav")
emscripten_embed_file(WavAudioImporterTest surround616.wav "/surround616.wav")
emscripten_embed_file(WavAudioImporterTest unsupportedChannelCount.wav "/unsupportedChannelCount.wav")
emscripten_embed_file(WavAudioImporterTest unsupportedFormat.wav "/unsupportedFormat.wav")
emscripten_embed_file(WavAudioImporterTest wrongSignature.wav "/wrongSignature.wav")

Loading…
Cancel
Save