Skip to content

Commit b151968

Browse files
johncurleycoelckers
authored andcommitted
Added core midi support to ZMusic
1 parent 0fb7f18 commit b151968

File tree

4 files changed

+666
-1
lines changed

4 files changed

+666
-1
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
/build*
22
*.user*
3+
.DS_Store

source/CMakeLists.txt

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,17 @@ if(WIN32)
107107
target_compile_definitions(zmusic-obj INTERFACE HAVE_SYSTEM_MIDI)
108108
target_link_libraries(zmusic-obj INTERFACE winmm)
109109
target_sources(zmusic-obj INTERFACE mididevices/music_win_mididevice.cpp)
110-
elseif(NOT APPLE)
110+
elseif(APPLE)
111+
target_compile_definitions(zmusic-obj INTERFACE HAVE_SYSTEM_MIDI)
112+
target_sources(zmusic-obj INTERFACE
113+
mididevices/music_coremidi_mididevice.mm
114+
)
115+
target_link_libraries(zmusic-obj INTERFACE
116+
"-framework CoreMIDI"
117+
"-framework CoreFoundation"
118+
"-framework CoreAudio"
119+
)
120+
else()
111121
find_package(ALSA)
112122
if(ALSA_FOUND)
113123
target_compile_definitions(zmusic-obj INTERFACE HAVE_SYSTEM_MIDI)

source/mididevices/mididevice.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,3 +158,7 @@ MIDIDevice* CreateWinMIDIDevice(int mididevice);
158158
#ifdef __linux__
159159
MIDIDevice* CreateAlsaMIDIDevice(int mididevice);
160160
#endif
161+
162+
#ifdef __APPLE__
163+
MIDIDevice* CreateCoreMIDIDevice(int mididevice);
164+
#endif

0 commit comments

Comments
 (0)