aboutsummaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorGravatar Chris Xiong <chirs241097@gmail.com> 2019-09-13 00:52:25 +0800
committerGravatar Chris Xiong <chirs241097@gmail.com> 2019-09-13 00:52:25 +0800
commit9fecb429a37bcaa577aaa972139f6db3ce17ac50 (patch)
tree046a2a47b6e5aa67ad65121387781a4ea191210c /core
parentaec5e972e8968255e8843eb22314b96a8f23b041 (diff)
downloadQMidiPlayer-9fecb429a37bcaa577aaa972139f6db3ce17ac50.tar.xz
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.
Diffstat (limited to 'core')
-rw-r--r--core/CMakeLists.txt19
-rw-r--r--core/qmpmidioutrtmidi.cpp2
-rw-r--r--core/qmpmidioutrtmidi.hpp2
3 files changed, 21 insertions, 2 deletions
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 <algorithm>
#include <deque>
#include <vector>
-#include RT_MIDI_H
+#include "rtmidi/RtMidi.h"
#include "qmpmidioutrtmidi.hpp"
void split(std::string s,char c,std::deque<std::string>& 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 <vector>
#define QMP_MAIN
#include "../include/qmpcorepublic.hpp"
-#include RT_MIDI_H
+#include "rtmidi/RtMidi.h"
struct qmpDeviceInitializer
{
CMidiTrack initseq;