From 9832e66ca91916beb29e0cbf50ae1f68dd80d45c Mon Sep 17 00:00:00 2001
From: Joshua Goins <josh@redstrate.com>
Date: Mon, 5 Sep 2022 16:54:05 -0400
Subject: [PATCH] Move asset updater to core, and remove the stupid dependency
 on desktop

It makes no sense for Core to depend on Desktop, and this removes that
circular dependency.
---
 launcher/core/CMakeLists.txt                      | 7 ++++---
 launcher/{desktop => core}/include/assetupdater.h | 0
 launcher/{desktop => core}/src/assetupdater.cpp   | 0
 launcher/core/src/launchercore.cpp                | 1 -
 launcher/desktop/CMakeLists.txt                   | 2 --
 5 files changed, 4 insertions(+), 6 deletions(-)
 rename launcher/{desktop => core}/include/assetupdater.h (100%)
 rename launcher/{desktop => core}/src/assetupdater.cpp (100%)

diff --git a/launcher/core/CMakeLists.txt b/launcher/core/CMakeLists.txt
index b585197..8675b9f 100644
--- a/launcher/core/CMakeLists.txt
+++ b/launcher/core/CMakeLists.txt
@@ -8,7 +8,8 @@ set(HEADERS
         include/squareboot.h
         include/squarelauncher.h
         include/patcher.h
-        include/steamapi.h)
+        include/steamapi.h
+        include/assetupdater.h)
 
 set(SRC
         src/encryptedarg.cpp
@@ -19,7 +20,8 @@ set(SRC
         src/squareboot.cpp
         src/squarelauncher.cpp
         src/patcher.cpp
-        src/steamapi.cpp)
+        src/steamapi.cpp
+        src/assetupdater.cpp)
 
 if (ENABLE_WATCHDOG)
     set(HEADERS ${HEADERS}
@@ -51,7 +53,6 @@ target_link_libraries(astra_core PUBLIC
         Qt5::Widgets  # widgets is required by watchdog, to be fixed/removed later
         Qt5::Quick # required for some type registrations
         PRIVATE
-        astra_desktop
         cotp
         crypto) # desktop is currently required by the core, to be fixed/removed later
 
diff --git a/launcher/desktop/include/assetupdater.h b/launcher/core/include/assetupdater.h
similarity index 100%
rename from launcher/desktop/include/assetupdater.h
rename to launcher/core/include/assetupdater.h
diff --git a/launcher/desktop/src/assetupdater.cpp b/launcher/core/src/assetupdater.cpp
similarity index 100%
rename from launcher/desktop/src/assetupdater.cpp
rename to launcher/core/src/assetupdater.cpp
diff --git a/launcher/core/src/launchercore.cpp b/launcher/core/src/launchercore.cpp
index 71124cb..0f181db 100755
--- a/launcher/core/src/launchercore.cpp
+++ b/launcher/core/src/launchercore.cpp
@@ -25,7 +25,6 @@
 #include "encryptedarg.h"
 #include "launchercore.h"
 #include "sapphirelauncher.h"
-#include "settingswindow.h"
 #include "squareboot.h"
 #include "squarelauncher.h"
 
diff --git a/launcher/desktop/CMakeLists.txt b/launcher/desktop/CMakeLists.txt
index ee94b4c..37ecbd6 100644
--- a/launcher/desktop/CMakeLists.txt
+++ b/launcher/desktop/CMakeLists.txt
@@ -1,6 +1,5 @@
 set(HEADERS
         include/aboutwindow.h
-        include/assetupdater.h
         include/bannerwidget.h
         include/desktopinterface.h
         include/gamescopesettingswindow.h
@@ -10,7 +9,6 @@ set(HEADERS
 
 set(SRC
         src/aboutwindow.cpp
-        src/assetupdater.cpp
         src/bannerwidget.cpp
         src/desktopinterface.cpp
         src/gamescopesettingswindow.cpp