From 742fa225f2b69544ad19ce3757069ec488c5b05b Mon Sep 17 00:00:00 2001 From: Heather Anderson Date: Tue, 14 Dec 2021 19:55:13 -0800 Subject: [PATCH] not sure what would have broken this but... adding required windows dependencies for MIDI to operate --- libraries/midi/CMakeLists.txt | 4 ++++ libraries/midi/src/Midi.cpp | 5 ++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libraries/midi/CMakeLists.txt b/libraries/midi/CMakeLists.txt index a698dfc9bb..6675756640 100644 --- a/libraries/midi/CMakeLists.txt +++ b/libraries/midi/CMakeLists.txt @@ -2,3 +2,7 @@ set(TARGET_NAME midi) setup_hifi_library(Network) link_hifi_libraries(shared networking) include_hifi_library_headers(script-engine) + +if (WIN32) + target_link_libraries(${TARGET_NAME} winmm.lib) +endif () diff --git a/libraries/midi/src/Midi.cpp b/libraries/midi/src/Midi.cpp index d88f31394e..8544a80981 100644 --- a/libraries/midi/src/Midi.cpp +++ b/libraries/midi/src/Midi.cpp @@ -19,10 +19,9 @@ #include #if defined Q_OS_WIN32 -#include "Windows.h" -#endif +#include +#include -#if defined Q_OS_WIN32 const int MIDI_BYTE_MASK = 0x0FF; const int MIDI_NIBBLE_MASK = 0x00F; const int MIDI_PITCH_BEND_MASK = 0x3F80;