Fix epaper build

Eeems-Org · Jan 16, 2024 · bcebe32 · bcebe32
1 parent 50e98dc
commit bcebe32
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 9 deletions.
diff --git a/applications/system-service/application.cpp b/applications/system-service/application.cpp
@@ -10,11 +10,13 @@
 #include "systemapi.h"
 #include "digitizerhandler.h"
 #include "notificationapi.h"
-#include "mxcfb.h"
 #include "screenapi.h"
 #include "buttonhandler.h"
 
-#ifndef EPAPER
+#ifdef EPAPER
+#include "mxcfb.h"
+#include <epframebuffer.h>
+#else
 #define FRAMEBUFFER new QImage(200, 200, QImage::Format_ARGB32_Premultiplied)
 #endif
 

diff --git a/applications/system-service/appsapi.cpp b/applications/system-service/appsapi.cpp
@@ -4,7 +4,9 @@
 #include "notificationapi.h"
 #include "systemapi.h"
 
-#ifndef EPAPER
+#ifdef EPAPER
+#include <epframebuffer.h>
+#else
 #define FRAMEBUFFER new QImage(200, 200, QImage::Format_ARGB32_Premultiplied)
 #endif
 

diff --git a/applications/system-service/notification.cpp b/applications/system-service/notification.cpp
@@ -5,7 +5,9 @@
 #include "appsapi.h"
 #include "screenapi.h"
 
-#ifndef EPAPER
+#ifdef EPAPER
+#include <epframebuffer.h>
+#else
 #define FRAMEBUFFER new QImage(200, 200, QImage::Format_ARGB32_Premultiplied)
 #endif
 

diff --git a/applications/system-service/notificationapi.cpp b/applications/system-service/notificationapi.cpp
@@ -2,7 +2,9 @@
 
 #include "notificationapi.h"
 #include "systemapi.h"
-#ifndef EPAPER
+#ifdef EPAPER
+#include <epframebuffer.h>
+#else
 #define FRAMEBUFFER new QImage(200, 200, QImage::Format_ARGB32_Premultiplied)
 #endif
 

diff --git a/qmake/epaper.pri b/qmake/epaper.pri
@@ -1,4 +1,5 @@
 linux-oe-g++{
     LIBS += -L$$OUT_PWD/../../shared/epaper -lqsgepaper
     INCLUDEPATH += $$OUT_PWD/../../shared/epaper
+    DEFINES += EPAPER
 }
diff --git a/shared/liboxide/liboxide.h b/shared/liboxide/liboxide.h
@@ -25,12 +25,10 @@
 #include "oxide_sentry.h"
 #else
 #include "sentry.h"
-#ifdef __arm__
 #ifdef EPAPER
 Q_IMPORT_PLUGIN(QsgEpaperPlugin)
 #endif
 #endif
-#endif
 
 #include <QDebug>
 #include <QScopeGuard>

diff --git a/shared/shared.pro b/shared/shared.pro
@@ -4,8 +4,11 @@ SUBDIRS = \
     liboxide
 
 linux-oe-g++{
-    SUBDIRS += sentry
     SUBDIRS += epaper
-    liboxide.depends = sentry epaper
+    liboxide.depends += epaper
+    contains(DEFINES, SENTRY){
+        SUBDIRS += sentry
+        liboxide.depends += sentry
+    }
 }
 INSTALLS += $$SUBDIRS