Merge pull request #111 from Nheko-Reborn/better-build

Improve build system and dependency bundling.

4 files changed, 10 insertions, 1 deletions

diff --git a/src/Cache.h b/src/Cache.h

index da4e2040..a8991eb5 100644
--- a/src/Cache.h
+++ b/src/Cache.h
@@ -22,7 +22,11 @@
 #include <QImage>
 #include <QString>
 
+#if __has_include(<lmdbxx/lmdb++.h>)
+#include <lmdbxx/lmdb++.h>
+#else
 #include <lmdb++.h>
+#endif
 
 #include <mtx/responses.hpp>
 
diff --git a/src/Cache_p.h b/src/Cache_p.h

index 47dd945a..32f2a67d 100644
--- a/src/Cache_p.h
+++ b/src/Cache_p.h
@@ -26,7 +26,11 @@
 #include <QImage>
 #include <QString>
 
+#if __has_include(<lmdbxx/lmdb++.h>)
+#include <lmdbxx/lmdb++.h>
+#else
 #include <lmdb++.h>
+#endif
 #include <nlohmann/json.hpp>
 
 #include <mtx/responses.hpp>
diff --git a/src/timeline/TimelineModel.cpp b/src/timeline/TimelineModel.cpp

index f66099a0..fb8c0095 100644
--- a/src/timeline/TimelineModel.cpp
+++ b/src/timeline/TimelineModel.cpp
@@ -1,6 +1,7 @@
 #include "TimelineModel.h"
 
 #include <algorithm>
+#include <thread>
 #include <type_traits>
 
 #include <QFileDialog>
diff --git a/src/ui/SnackBar.cpp b/src/ui/SnackBar.cpp

index 8a05d937..5daa697e 100644
--- a/src/ui/SnackBar.cpp
+++ b/src/ui/SnackBar.cpp
@@ -1,6 +1,6 @@
 #include <QPainter>
 
-#include <tweeny/tweeny.h>
+#include <tweeny.h>
 
 #include "SnackBar.h"