Make isomd5sum a proper dependency

squimrel · Jun 10, 2017 · 991aad3 · 991aad3
1 parent 827729c
commit 991aad3
Show file tree

Hide file tree

Showing 13 changed files with 11 additions and 764 deletions.
diff --git a/README.md b/README.md
@@ -32,6 +32,7 @@ The main binary, `mediawriter`, will be writen to `$PREFIX/bin` and the helper b
 
 * `udisks2` or `storaged`
 * `xz-libs`
+* `isomd5sum-devel`
 
 ### Windows
 

diff --git a/app/app.pro b/app/app.pro
@@ -4,7 +4,7 @@ TARGET = mediawriter
 
 QT += qml quick widgets network
 
-LIBS += -lisomd5
+LIBS += -lcheckisomd5
 
 CONFIG += c++11
 

diff --git a/app/releasemanager.cpp b/app/releasemanager.cpp
@@ -20,7 +20,9 @@
 #include "releasemanager.h"
 #include "drivemanager.h"
 
-#include "isomd5/libcheckisomd5.h"
+extern "C" {
+#include <libcheckisomd5.h>
+}
 
 #include <QtQml>
 #include <QApplication>

diff --git a/deployment.pri b/deployment.pri
@@ -13,8 +13,6 @@ linux {
     DEFINES += DATADIR=\\\"$$DATADIR\\\"
     DEFINES += LIBEXECDIR=\\\"$$LIBEXECDIR\\\"
 }
-QMAKE_LIBDIR += $$top_builddir/lib
-INCLUDEPATH += $$top_srcdir/lib/
 isEmpty(MEDIAWRITER_VERSION) {
     DEFINES += MEDIAWRITER_VERSION="\\\"$(shell git -C \""$$_PRO_FILE_PWD_"\" describe --tags || echo N/A)\\\""
 } else {

diff --git a/helper/helper.pro b/helper/helper.pro
@@ -2,7 +2,7 @@ TEMPLATE = app
 
 QT += core
 
-LIBS += -lisomd5
+LIBS += -lcheckisomd5 -limplantisomd5
 
 CONFIG += c++11
 CONFIG += console

diff --git a/helper/write.cpp b/helper/write.cpp
@@ -29,7 +29,10 @@
 
 #include <lzma.h>
 
-#include "isomd5/libcheckisomd5.h"
+extern "C" {
+#include <libcheckisomd5.h>
+#include <libimplantisomd5.h>
+}
 
 #include "page_aligned_buffer.h"
 

diff --git a/lib/isomd5/isomd5.pro b/lib/isomd5/isomd5.pro