summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArno <arno@disconnect.de>2019-11-23 01:03:17 +0100
committerArno <arno@disconnect.de>2019-11-23 01:03:17 +0100
commitaba0fd0107830a354e94d0404dd0cfb538df6ecb (patch)
tree5dafe273117ebd484d66f45841cb0e0d12b432b8
parent08b627c59c98d67d057e061612f165b4ff3cb966 (diff)
downloadSheMov-aba0fd0107830a354e94d0404dd0cfb538df6ecb.tar.gz
SheMov-aba0fd0107830a354e94d0404dd0cfb538df6ecb.tar.bz2
SheMov-aba0fd0107830a354e94d0404dd0cfb538df6ecb.zip
Build fixes
Remove unnecessary libs for linking. Update to ImageMagick++7 and fix includepath for MSYS2 builds.
-rw-r--r--shemov.pro9
1 files changed, 7 insertions, 2 deletions
diff --git a/shemov.pro b/shemov.pro
index 9b98bd6..a5d25fd 100644
--- a/shemov.pro
+++ b/shemov.pro
@@ -118,6 +118,11 @@ HEADERS = \
moviemetadatapage.h \
moviemappingpage.h \
movieinfopage.h
-LIBS += -lmagic -lXfixes -lX11 -lMagick++-6.Q16HDRI
-INCLUDEPATH += /usr/include/ImageMagick-6/
+LIBS += -lMagick++-7.Q16HDRI
+win32 {
+ INCLUDEPATH += ..\..\..\mingw64\include\ImageMagick-7
+}
+unix {
+ INCLUDEPATH += /usr/include/ImageMagick-7/
+}
RESOURCES = shemov.qrc