From 8ff51ca1296a26d70dc7aef4a7e19ebe189c18cb Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Tue, 1 Oct 2019 12:06:24 +0300 Subject: [PATCH] - fixed build issues with POSIX targets --- libraries/music_common/fileio.h | 1 + libraries/timidity/timidity.cpp | 1 + libraries/zmusic/CMakeLists.txt | 2 +- libraries/zmusic/mididevices/music_adlmidi_mididevice.cpp | 2 ++ libraries/zmusic/mididevices/music_timidity_mididevice.cpp | 2 ++ libraries/zmusic/midisources/midisource.h | 2 ++ libraries/zmusic/musicformats/music_cd.cpp | 2 ++ 7 files changed, 11 insertions(+), 1 deletion(-) diff --git a/libraries/music_common/fileio.h b/libraries/music_common/fileio.h index ebf740cda..dab3b3b27 100644 --- a/libraries/music_common/fileio.h +++ b/libraries/music_common/fileio.h @@ -24,6 +24,7 @@ #pragma once #include +#include #include #include diff --git a/libraries/timidity/timidity.cpp b/libraries/timidity/timidity.cpp index 1608dd92e..afd36a9d1 100644 --- a/libraries/timidity/timidity.cpp +++ b/libraries/timidity/timidity.cpp @@ -20,6 +20,7 @@ timidity.c */ +#include #include #include #include diff --git a/libraries/zmusic/CMakeLists.txt b/libraries/zmusic/CMakeLists.txt index 071eeb20d..f7da61a5b 100644 --- a/libraries/zmusic/CMakeLists.txt +++ b/libraries/zmusic/CMakeLists.txt @@ -91,7 +91,7 @@ add_library( zmusic STATIC zmusic/zmusic.cpp ${PLAT_SOURCES} ) -target_link_libraries( zmusic ) +target_link_libraries( zmusic adl dumb gme oplsynth opn timidity timidityplus wildmidi ) source_group("MIDI Devices" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/mididevices/.+") diff --git a/libraries/zmusic/mididevices/music_adlmidi_mididevice.cpp b/libraries/zmusic/mididevices/music_adlmidi_mididevice.cpp index acb0c695b..e6fb89b29 100644 --- a/libraries/zmusic/mididevices/music_adlmidi_mididevice.cpp +++ b/libraries/zmusic/mididevices/music_adlmidi_mididevice.cpp @@ -34,6 +34,8 @@ // HEADER FILES ------------------------------------------------------------ +#include + #include "mididevice.h" #include "adlmidi.h" diff --git a/libraries/zmusic/mididevices/music_timidity_mididevice.cpp b/libraries/zmusic/mididevices/music_timidity_mididevice.cpp index 44837462f..b460a74a8 100644 --- a/libraries/zmusic/mididevices/music_timidity_mididevice.cpp +++ b/libraries/zmusic/mididevices/music_timidity_mididevice.cpp @@ -34,6 +34,8 @@ // HEADER FILES ------------------------------------------------------------ +#include + #include "mididevice.h" #include "timidity/timidity.h" #include "timidity/playmidi.h" diff --git a/libraries/zmusic/midisources/midisource.h b/libraries/zmusic/midisources/midisource.h index 42f7690d8..b8792f60a 100644 --- a/libraries/zmusic/midisources/midisource.h +++ b/libraries/zmusic/midisources/midisource.h @@ -8,6 +8,8 @@ #ifndef midisources_h #define midisources_h +#include +#include #include #include #include diff --git a/libraries/zmusic/musicformats/music_cd.cpp b/libraries/zmusic/musicformats/music_cd.cpp index daedcd370..e8534cc0d 100644 --- a/libraries/zmusic/musicformats/music_cd.cpp +++ b/libraries/zmusic/musicformats/music_cd.cpp @@ -196,6 +196,8 @@ MusInfo* CDDA_OpenSong(MusicIO::FileInterface* reader) #else +#include + MusInfo* CD_OpenSong(int track, int id) { throw std::runtime_error("CD Audio playback not supported");