From 645250e1cd8ce9bc1faea599df7a1b05836bfeb8 Mon Sep 17 00:00:00 2001
From: Bent Bisballe Nyeng <deva@aasimon.org>
Date: Tue, 29 Dec 2020 16:09:43 +0100
Subject: Split UI code into application/plugin UI and UI library.

---
 drumgizmo/Makefile.am    | 10 +++++-----
 drumgizmo/dgvalidator.cc | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'drumgizmo')

diff --git a/drumgizmo/Makefile.am b/drumgizmo/Makefile.am
index 2cb46bf..b3bca32 100644
--- a/drumgizmo/Makefile.am
+++ b/drumgizmo/Makefile.am
@@ -109,7 +109,7 @@ dgvalidator_CXXFLAGS = \
 	-I$(top_srcdir)/src -I$(top_srcdir)/getoptpp \
 	-I$(top_srcdir)/hugin -DWITH_HUG_MUTEX -DWITH_HUG_FILTER \
 	$(SSEFLAGS) \
-	-I$(top_srcdir)/plugingui \
+	-I$(top_srcdir)/ \
 	-DLODEPNG_NO_COMPILE_ENCODER \
 	-DLODEPNG_NO_COMPILE_DISK \
 	-DLODEPNG_NO_COMPILE_ANCILLARY_CHUNKS \
@@ -122,9 +122,9 @@ dgvalidator_SOURCES = \
 	dgvalidator.cc \
 	$(top_srcdir)/hugin/hugin.c \
 	$(top_srcdir)/hugin/hugin_filter.c \
-	$(top_srcdir)/plugingui/lodepng/lodepng.cpp \
-	$(top_srcdir)/plugingui/image.cc \
-	$(top_srcdir)/plugingui/resource.cc \
-	$(top_srcdir)/plugingui/colour.cc
+	$(top_srcdir)/dggui/lodepng/lodepng.cpp \
+	$(top_srcdir)/dggui/image.cc \
+	$(top_srcdir)/dggui/resource.cc \
+	$(top_srcdir)/dggui/colour.cc
 
 endif # ENABLE_CLI
diff --git a/drumgizmo/dgvalidator.cc b/drumgizmo/dgvalidator.cc
index 6a7c546..1b21c59 100644
--- a/drumgizmo/dgvalidator.cc
+++ b/drumgizmo/dgvalidator.cc
@@ -37,8 +37,6 @@
 #include <sstream>
 #include <climits>
 
-#include <lodepng/lodepng.h>
-
 #include <config.h>
 #include <platform.h>
 
@@ -48,11 +46,13 @@
 #include <unistd.h>
 #endif
 
-#include <image.h>
+#include <dggui/image.h>
 
 // Needed for Resource class
-#include <resource_data.h>
-const rc_data_t rc_data[] = {};
+#include <dggui/resource_data.h>
+
+const rc_data_t rc_dataX[] = {};
+const rc_data_t* rc_data = rc_dataX;
 
 namespace
 {
-- 
cgit v1.2.3