Relocate files to fix build if not all GL libraries exist

vintagepc · Nov 11, 2021 · 511f882 · 511f882
1 parent b7957e8
commit 511f882
Show file tree

Hide file tree

Showing 11 changed files with 7 additions and 7 deletions.
diff --git a/hw/arm/prusa/meson.build b/hw/arm/prusa/meson.build
@@ -37,8 +37,11 @@ arm_ss.add(when: 'CONFIG_BUDDYBOARD', if_true: files(
         'parts/thermistor.c',
         'parts/tmc2209.c',
         'utility/ArgHelper.cpp',
+        'utility/IKeyClient.cpp',
         'utility/IScriptable.cpp',
+        'utility/KeyController.cpp',
         'utility/ScriptHost.cpp',
+        'utility/Scriptable.cpp',
         'utility/p404_script_console.c',
         'utility/p404scriptable.c',
         'utility/p404_keyclient.c',

diff --git a/hw/arm/prusa/opengl/MK3SGL.cpp b/hw/arm/prusa/opengl/MK3SGL.cpp
@@ -21,7 +21,7 @@
 
 #include "MK3SGL.h"
 #include "GLPrint.h"          // for GLPrint
-#include "KeyController.h"
+#include "../utility/KeyController.h"
 #include "Mini_Lite.h"        // for MK3S_Lite
 #include "Mini_Full.h"        // for MK3S_Lite
 #include "Macros.h"

diff --git a/hw/arm/prusa/opengl/MK3SGL.h b/hw/arm/prusa/opengl/MK3SGL.h
@@ -24,9 +24,9 @@
 //#include "GLHelper.h"
 #include "GLObj.h"           // for GLObj
 #include "GLPrint.h"         // for GLPrint
-#include "IKeyClient.h"
+#include "../utility/IKeyClient.h"
 #include "../utility/IScriptable.h"     // for IScriptable::LineStatus
-#include "Scriptable.h"      // for Scriptable
+#include "../utility/Scriptable.h"      // for Scriptable
 #include <GL/glew.h>         // NOLINT for glTranslatef
 #include <GL/freeglut_std.h> //
 #include <atomic>            // for atomic, atomic_bool, atomic_int

diff --git a/hw/arm/prusa/opengl/meson.build b/hw/arm/prusa/opengl/meson.build
@@ -9,8 +9,5 @@ arm_ss.add(when: ['CONFIG_BUDDYBOARD'],
 	'Mini_Lite.cpp',
 	'Mini_Full.cpp',
 	'Color.cpp',
-	'Scriptable.cpp',
 	'MK3SGL.cpp',
-	'KeyController.cpp',
-	'IKeyClient.cpp'
 ))
diff --git a/hw/arm/prusa/utility/ArgHelper.cpp b/hw/arm/prusa/utility/ArgHelper.cpp
@@ -26,7 +26,7 @@
 #include <iostream>
 #include <sstream>
 #include "../opengl/Config.h"
-#include "../opengl/KeyController.h"
+#include "KeyController.h"
 #include "../opengl/PrintVisualType.h"
 
 void ArgHelper::SetArgs(std::string strArgs){

diff --git a/hw/arm/prusa/opengl/IKeyClient.cpp → hw/arm/prusa/utility/IKeyClient.cpp b/hw/arm/prusa/opengl/IKeyClient.cpp → hw/arm/prusa/utility/IKeyClient.cpp
diff --git a/hw/arm/prusa/opengl/IKeyClient.h → hw/arm/prusa/utility/IKeyClient.h b/hw/arm/prusa/opengl/IKeyClient.h → hw/arm/prusa/utility/IKeyClient.h
diff --git a/hw/arm/prusa/opengl/KeyController.cpp → hw/arm/prusa/utility/KeyController.cpp b/hw/arm/prusa/opengl/KeyController.cpp → hw/arm/prusa/utility/KeyController.cpp
diff --git a/hw/arm/prusa/opengl/KeyController.h → hw/arm/prusa/utility/KeyController.h b/hw/arm/prusa/opengl/KeyController.h → hw/arm/prusa/utility/KeyController.h
diff --git a/hw/arm/prusa/opengl/Scriptable.cpp → hw/arm/prusa/utility/Scriptable.cpp b/hw/arm/prusa/opengl/Scriptable.cpp → hw/arm/prusa/utility/Scriptable.cpp
diff --git a/hw/arm/prusa/opengl/Scriptable.h → hw/arm/prusa/utility/Scriptable.h b/hw/arm/prusa/opengl/Scriptable.h → hw/arm/prusa/utility/Scriptable.h