aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Giannuzzi <jgiannuzzi@users.noreply.github.com>2020-02-29 05:42:47 +0000
committerGitHub <noreply@github.com>2020-02-28 21:42:47 -0800
commit0babb7549b0bb5bb51debb428ac94a480892d96d (patch)
treec3f2ea8fdf3b0759ce946d9180cf79f315158700
parentbf338dc947348a1d9708acb4cda344ca94b69ead (diff)
downloadvcpkg-0babb7549b0bb5bb51debb428ac94a480892d96d.tar.gz
vcpkg-0babb7549b0bb5bb51debb428ac94a480892d96d.zip
[sdl2-mixer] Enable native MIDI support on macOS (#10201)
-rw-r--r--ports/sdl2-mixer/CMakeLists.txt12
-rw-r--r--ports/sdl2-mixer/CONTROL2
2 files changed, 10 insertions, 4 deletions
diff --git a/ports/sdl2-mixer/CMakeLists.txt b/ports/sdl2-mixer/CMakeLists.txt
index 57c840ea1..b5b5eac61 100644
--- a/ports/sdl2-mixer/CMakeLists.txt
+++ b/ports/sdl2-mixer/CMakeLists.txt
@@ -91,10 +91,16 @@ add_library(SDL2_mixer
music_wav.c
version.rc)
-if(WIN32)
+if(WIN32 OR APPLE)
list(APPEND SDL_MIXER_DEFINES MUSIC_MID_NATIVE)
- target_sources(SDL2_mixer PRIVATE music_nativemidi.c native_midi/native_midi_common.c native_midi/native_midi_win32.c)
- target_link_libraries(SDL2_mixer ${SDL_MIXER_LIBRARIES} Winmm)
+ target_sources(SDL2_mixer PRIVATE music_nativemidi.c native_midi/native_midi_common.c)
+ target_link_libraries(SDL2_mixer ${SDL_MIXER_LIBRARIES})
+ if(WIN32)
+ target_sources(SDL2_mixer PRIVATE native_midi/native_midi_win32.c)
+ target_link_libraries(SDL2_mixer Winmm)
+ elseif(APPLE)
+ target_sources(SDL2_mixer PRIVATE native_midi/native_midi_macosx.c)
+ endif()
endif()
set_target_properties(SDL2_mixer PROPERTIES DEFINE_SYMBOL SDL2_EXPORTS)
diff --git a/ports/sdl2-mixer/CONTROL b/ports/sdl2-mixer/CONTROL
index c3c60d942..4ea51192e 100644
--- a/ports/sdl2-mixer/CONTROL
+++ b/ports/sdl2-mixer/CONTROL
@@ -1,5 +1,5 @@
Source: sdl2-mixer
-Version: 2.0.4-8
+Version: 2.0.4-9
Homepage: https://www.libsdl.org/projects/SDL_mixer
Description: Multi-channel audio mixer library for SDL.
Build-Depends: sdl2