From 9fecb429a37bcaa577aaa972139f6db3ce17ac50 Mon Sep 17 00:00:00 2001 From: Chris Xiong Date: Fri, 13 Sep 2019 00:52:25 +0800 Subject: CMake. It's happening. Added a new build system based on CMake. Minor code cleanups. This probably breaks building with QMake on multiple platforms. And of course the new CMake support isn't tested thoroughly. But it's finally happening. --- core/CMakeLists.txt | 19 +++++++++++++++++++ core/qmpmidioutrtmidi.cpp | 2 +- core/qmpmidioutrtmidi.hpp | 2 +- 3 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 core/CMakeLists.txt (limited to 'core') diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt new file mode 100644 index 0000000..2086a30 --- /dev/null +++ b/core/CMakeLists.txt @@ -0,0 +1,19 @@ +set(qmpcore_SOURCES + qmpmidioutfluid.hpp + qmpmidioutfluid.cpp + qmpmidioutrtmidi.hpp + qmpmidioutrtmidi.cpp + qmpmidiplay.hpp + qmpmidiplay.cpp + qmpmidiread.cpp +) + +set(CMAKE_POSITION_INDEPENDENT_CODE ON) + +include_directories(${fluidsynth_INCLUDE_DIRS}) +include_directories(${rtmidi_INCLUDE_DIRS}) +include_directories(${PROJECT_SOURCE_DIR}/include/) + +add_library(qmpcore STATIC + ${qmpcore_SOURCES} +) diff --git a/core/qmpmidioutrtmidi.cpp b/core/qmpmidioutrtmidi.cpp index 1a18e46..c37fadc 100644 --- a/core/qmpmidioutrtmidi.cpp +++ b/core/qmpmidioutrtmidi.cpp @@ -4,7 +4,7 @@ #include #include #include -#include RT_MIDI_H +#include "rtmidi/RtMidi.h" #include "qmpmidioutrtmidi.hpp" void split(std::string s,char c,std::deque& v) diff --git a/core/qmpmidioutrtmidi.hpp b/core/qmpmidioutrtmidi.hpp index 0c1843c..0a4fd60 100644 --- a/core/qmpmidioutrtmidi.hpp +++ b/core/qmpmidioutrtmidi.hpp @@ -4,7 +4,7 @@ #include #define QMP_MAIN #include "../include/qmpcorepublic.hpp" -#include RT_MIDI_H +#include "rtmidi/RtMidi.h" struct qmpDeviceInitializer { CMidiTrack initseq; -- cgit v1.2.3