diff options
Diffstat (limited to 'visualization')
| -rw-r--r-- | visualization/qmpvisualization.cpp | 4 | ||||
| -rw-r--r-- | visualization/visualization.pro | 18 |
2 files changed, 15 insertions, 7 deletions
diff --git a/visualization/qmpvisualization.cpp b/visualization/qmpvisualization.cpp index ca7e8d6..193cde4 100644 --- a/visualization/qmpvisualization.cpp +++ b/visualization/qmpvisualization.cpp @@ -155,12 +155,12 @@ void qmpVisualization::showThread() tdparticles=sm->smTargetCreate(wwidth*wsupersample,wheight*wsupersample,wmultisample); if(!api->getOptionString("Visualization/font2").length()||!font.loadTTF(api->getOptionString("Visualization/font2").c_str(),fontsize)) if(!font.loadTTF("/usr/share/fonts/truetype/freefont/FreeMono.ttf",fontsize)) - if(!font.loadTTF("/usr/share/fonts/gnu-free-fonts/FreeMono.otf",fontsize)) + if(!font.loadTTF("/usr/share/fonts/gnu-free/FreeMono.otf",fontsize)) if(!font.loadTTF("C:/Windows/Fonts/cour.ttf",fontsize)) printf("W: Font load failed.\n"); if(!api->getOptionString("Visualization/font2").length()||!font.loadTTF(api->getOptionString("Visualization/font2").c_str(),180)) if(!fonthdpi.loadTTF("/usr/share/fonts/truetype/freefont/FreeMono.ttf",180)) - if(!fonthdpi.loadTTF("/usr/share/fonts/gnu-free-fonts/FreeMono.otf",180)) + if(!fonthdpi.loadTTF("/usr/share/fonts/gnu-free/FreeMono.otf",180)) if(!fonthdpi.loadTTF("C:/Windows/Fonts/cour.ttf",180)) printf("W: Font load failed.\n"); if(!api->getOptionString("Visualization/font1").length()||!font.loadTTF(api->getOptionString("Visualization/font1").c_str(),fontsize)) diff --git a/visualization/visualization.pro b/visualization/visualization.pro index fedd636..5bf08ea 100644 --- a/visualization/visualization.pro +++ b/visualization/visualization.pro @@ -22,7 +22,7 @@ HEADERS += qmpvisualization.hpp \ qmpvirtualpiano3d.hpp unix { - target.path = /usr/lib/qmidiplayer + target.path = $$PREFIX/lib/qmidiplayer DATADIR = $$PREFIX/share INSTALLS += target res QMAKE_CXXFLAGS += -pthread -fPIC @@ -33,10 +33,18 @@ unix { res.path = $$DATADIR/qmidiplayer/img res.files += ../img/chequerboard.png ../img/particle.png ../img/kb_128.png #well... - INCLUDEPATH += /home/chrisoft/devel/SMELT/include/ /usr/include/freetype2 - LIBS += -L/home/chrisoft/devel/SMELT/smelt/glfw/ - LIBS += -L/home/chrisoft/devel/SMELT/extensions/ - LIBS += -lstdc++ -lfreetype -lz -lsmeltext -lsmelt-dumb -lCxImage -ljpeg -lpng -lglfw -lGLEW -lGL + SMELTDIR = $$(SMELT_DIR) + isEmpty(SMELTDIR){ + INCLUDEPATH += /home/chrisoft/devel/SMELT/include/ /usr/include/freetype2 + LIBS += -L/home/chrisoft/devel/SMELT/smelt/glfw/ + LIBS += -L/home/chrisoft/devel/SMELT/extensions/ + LIBS += -lstdc++ -lfreetype -lz -lsmeltext -lsmelt-dumb -lCxImage -ljpeg -lpng -lglfw -lGLEW -lGL + }else{ + INCLUDEPATH += $$SMELTDIR/include/ /usr/include/freetype2 + LIBS += -L$$SMELTDIR/smelt/glfw/ + LIBS += -L$$SMELTDIR/extensions/ + LIBS += -lstdc++ -lfreetype -lz -lsmeltext -lsmelt-dumb -lCxImage -ljpeg -lpng -lglfw -lGLEW -lGL + } } win32 { #Change these before producing your own build! |