From d820153a619a0094806a0397262b161940bb8e6d Mon Sep 17 00:00:00 2001
From: jlitewski <hackhalotwo@gmail.com>
Date: Fri, 26 Apr 2024 07:23:38 -0400
Subject: [PATCH] Fix the issue of SKIPQT builds not working

---
 client/src/graph.c     | 3 +++
 client/src/graph.h     | 9 +++++++++
 client/src/proxgui.cpp | 3 ---
 client/src/proxgui.h   | 8 --------
 client/src/proxguiqt.h | 1 +
 5 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/client/src/graph.c b/client/src/graph.c
index c0679d19e..423593622 100644
--- a/client/src/graph.c
+++ b/client/src/graph.c
@@ -32,6 +32,9 @@ int32_t g_OverlayBuffer[MAX_GRAPH_TRACE_LEN];
 bool    g_useOverlays = false;
 size_t  g_GraphTraceLen;
 buffer_savestate_t g_saveState_gb;
+marker_t g_MarkerA, g_MarkerB, g_MarkerC, g_MarkerD;
+marker_t *g_TempMarkers;
+uint8_t g_TempMarkerSize = 0;
 
 /* write a manchester bit to the graph
 */
diff --git a/client/src/graph.h b/client/src/graph.h
index 5c51481f2..6ab45e74a 100644
--- a/client/src/graph.h
+++ b/client/src/graph.h
@@ -33,6 +33,11 @@ typedef struct {
     uint32_t clock;     //Not used by all buffers
 } buffer_savestate_t;
 
+typedef struct {
+    uint32_t pos;
+    char label[30];
+} marker_t;
+
 void AppendGraph(bool redraw, uint16_t clock, int bit);
 size_t ClearGraph(bool redraw);
 bool HasGraphData(void);
@@ -68,6 +73,10 @@ extern int32_t g_OverlayBuffer[MAX_GRAPH_TRACE_LEN];
 extern bool    g_useOverlays;
 extern size_t  g_GraphTraceLen;
 
+extern marker_t g_MarkerA, g_MarkerB, g_MarkerC, g_MarkerD;
+extern marker_t *g_TempMarkers;
+extern uint8_t g_TempMarkerSize;
+
 extern double g_GridOffset;
 
 extern buffer_savestate_t g_saveState_gb;
diff --git a/client/src/proxgui.cpp b/client/src/proxgui.cpp
index 29eb79d7a..528df4d5e 100644
--- a/client/src/proxgui.cpp
+++ b/client/src/proxgui.cpp
@@ -24,9 +24,6 @@
 #include "ui.h"  // for prints
 
 static ProxGuiQT *gui = NULL;
-marker_t g_MarkerA, g_MarkerB, g_MarkerC, g_MarkerD;
-marker_t *g_TempMarkers;
-uint8_t g_TempMarkerSize = 0;
 static WorkerThread *main_loop_thread = NULL;
 
 WorkerThread::WorkerThread(char *script_cmds_file, char *script_cmd, bool stayInCommandLoop) : script_cmds_file(script_cmds_file), script_cmd(script_cmd), stayInCommandLoop(stayInCommandLoop) {
diff --git a/client/src/proxgui.h b/client/src/proxgui.h
index daeed30b6..498c0a83f 100644
--- a/client/src/proxgui.h
+++ b/client/src/proxgui.h
@@ -27,11 +27,6 @@ extern "C" {
 #include <stddef.h>
 #include <stdbool.h>
 
-typedef struct {
-    uint32_t pos;
-    char label[30];
-} marker_t;
-
 void ShowGraphWindow(void);
 void HideGraphWindow(void);
 void RepaintGraphWindow(void);
@@ -53,9 +48,6 @@ extern void remove_temporary_markers(void);
 extern double g_CursorScaleFactor;
 extern char g_CursorScaleFactorUnit[11];
 extern double g_PlotGridX, g_PlotGridY, g_DefaultGridX, g_DefaultGridY;
-extern marker_t g_MarkerA, g_MarkerB, g_MarkerC, g_MarkerD;
-extern marker_t *g_TempMarkers;
-extern uint8_t g_TempMarkerSize;
 extern uint32_t g_GraphStart, g_GraphStart_old, g_GraphStop;
 extern int CommandFinished;
 extern int offline;
diff --git a/client/src/proxguiqt.h b/client/src/proxguiqt.h
index 2f4879495..6e7f8efb1 100644
--- a/client/src/proxguiqt.h
+++ b/client/src/proxguiqt.h
@@ -30,6 +30,7 @@
 #include <QtGui>
 
 #include "proxgui.h"
+#include "graph.h"
 #include "ui/ui_overlays.h"
 #include "ui/ui_image.h"