diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | qmidiplayer-desktop/qmidiplayer-desktop.pro | 7 | ||||
| -rw-r--r-- | qmidiplayer-lite/qmidiplayer-lite.pro | 9 | ||||
| -rw-r--r-- | visualization/visualization.pro | 2 |
4 files changed, 20 insertions, 2 deletions
@@ -1,3 +1,7 @@ +2016-05-14 0.8.1 alpha +This _should_ fix building under arch linux. +(Linking order problems and include problems). + 2016-05-13 0.8.1 alpha Added enumerate integer options support. Workaroud for different fonts locations in arch linux. diff --git a/qmidiplayer-desktop/qmidiplayer-desktop.pro b/qmidiplayer-desktop/qmidiplayer-desktop.pro index 01ad0cc..1aa1a27 100644 --- a/qmidiplayer-desktop/qmidiplayer-desktop.pro +++ b/qmidiplayer-desktop/qmidiplayer-desktop.pro @@ -68,6 +68,12 @@ unix{ message(Building in packaging mode...) DEFINES += QMP_BUILD_UNIX_PACKAGE } + exists("/usr/include/RtMidi.h") { + DEFINES += RT_MIDI_H=\\\"/usr/include/RtMidi.h\\\" + } + exists("/usr/include/rtmidi/RtMidi.h") { + DEFINES += RT_MIDI_H=\\\"/usr/include/rtmidi/RtMidi.h\\\" + } QMAKE_CXXFLAGS_RELEASE -= -O2 QMAKE_CXXFLAGS_RELEASE += -O3 QMAKE_LFLAGS_RELEASE -= -O1 @@ -96,6 +102,7 @@ unix{ LIBS += -lfluidsynth -lrtmidi -ldl } win32{ + DEFINES += RT_MIDI_H=\\\"RtMidi.h\\\" #change these before building... LIBS += e:/libs/fluidsynth/fluidsynth.lib winmm.lib Release:LIBS += e:/libs/rtmidi/rtmidi.lib diff --git a/qmidiplayer-lite/qmidiplayer-lite.pro b/qmidiplayer-lite/qmidiplayer-lite.pro index 7ee4771..1534d53 100644 --- a/qmidiplayer-lite/qmidiplayer-lite.pro +++ b/qmidiplayer-lite/qmidiplayer-lite.pro @@ -22,12 +22,19 @@ HEADERS += \ ../core/qmpmidiplay.hpp \ qmpcorewrapper.hpp \ ../core/qmpmidimappers.hpp \ - ../include/qmpcorepublic.hpp + ../include/qmpcorepublic.hpp unix{ LIBS += -lfluidsynth -lrtmidi +exists("/usr/include/RtMidi.h") { + DEFINES += RT_MIDI_H=\\\"/usr/include/RtMidi.h\\\" +} +exists("/usr/include/rtmidi/RtMidi.h") { + DEFINES += RT_MIDI_H=\\\"/usr/include/rtmidi/RtMidi.h\\\" +} } win32{ + DEFINES += RT_MIDI_H=\\\"RtMidi.h\\\" #change these before building... LIBS += e:/libs/fluidsynth/fluidsynth.lib winmm.lib Release:LIBS += e:/libs/rtmidi/rtmidi.lib diff --git a/visualization/visualization.pro b/visualization/visualization.pro index af454b4..a0f1f96 100644 --- a/visualization/visualization.pro +++ b/visualization/visualization.pro @@ -37,4 +37,4 @@ unix { INCLUDEPATH += /home/chrisoft/devel/BulletLabRemixIII/include/ /usr/include/freetype2 LIBS += -L/home/chrisoft/devel/BulletLabRemixIII/smelt/sdl/ LIBS += -L/home/chrisoft/devel/BulletLabRemixIII/extensions/ -LIBS += -lstdc++ -lSDL2 -ljpeg -lpng -lfreetype -lz -lsmeltext -lsmelt-dumb -lCxImage +LIBS += -lstdc++ -lfreetype -lz -lsmeltext -lsmelt-dumb -lCxImage -ljpeg -lpng -lSDL2 |