From 86a80fbc610f7feda9deb40d4e41ebc16bcc2470 Mon Sep 17 00:00:00 2001
From: Hyper <34012267+hyperbx@users.noreply.github.com>
Date: Thu, 17 Oct 2024 14:36:02 +0100
Subject: [PATCH] Move gpu/Window.cpp to ui/window.cpp

---
 UnleashedRecomp/CMakeLists.txt                    | 6 +++++-
 UnleashedRecomp/gpu/video.cpp                     | 2 +-
 UnleashedRecomp/kernel/xam.cpp                    | 2 +-
 UnleashedRecomp/{gpu/Window.cpp => ui/window.cpp} | 0
 UnleashedRecomp/{gpu/Window.h => ui/window.h}     | 0
 5 files changed, 7 insertions(+), 3 deletions(-)
 rename UnleashedRecomp/{gpu/Window.cpp => ui/window.cpp} (100%)
 rename UnleashedRecomp/{gpu/Window.h => ui/window.h} (100%)

diff --git a/UnleashedRecomp/CMakeLists.txt b/UnleashedRecomp/CMakeLists.txt
index aedccab..da2552e 100644
--- a/UnleashedRecomp/CMakeLists.txt
+++ b/UnleashedRecomp/CMakeLists.txt
@@ -26,7 +26,6 @@ set(SWA_CPU_CXX_SOURCES
 )
 
 set(SWA_GPU_CXX_SOURCES
-    "gpu/window.cpp"
     "gpu/video.cpp"
     "gpu/rhi/rt64_d3d12.cpp"
     "gpu/rhi/rt64_vulkan.cpp"
@@ -42,6 +41,10 @@ set(SWA_HID_CXX_SOURCES
     "hid/driver/sdl_hid.cpp"
 )
 
+set(SWA_UI_CXX_SOURCES
+    "ui/window.cpp"
+)
+
 set(SWA_CXX_SOURCES
     "main.cpp"
     "misc_impl.cpp"
@@ -51,6 +54,7 @@ set(SWA_CXX_SOURCES
     ${SWA_GPU_CXX_SOURCES}
     ${SWA_APU_CXX_SOURCES}
     ${SWA_HID_CXX_SOURCES}
+    ${SWA_UI_CXX_SOURCES}
 )
 
 add_executable(UnleashedRecomp ${SWA_CXX_SOURCES})
diff --git a/UnleashedRecomp/gpu/video.cpp b/UnleashedRecomp/gpu/video.cpp
index aa88be6..8596851 100644
--- a/UnleashedRecomp/gpu/video.cpp
+++ b/UnleashedRecomp/gpu/video.cpp
@@ -8,7 +8,7 @@
 #include <xxHashMap.h>
 
 #include "video.h"
-#include "window.h"
+#include "ui/window.h"
 
 namespace RT64
 {
diff --git a/UnleashedRecomp/kernel/xam.cpp b/UnleashedRecomp/kernel/xam.cpp
index 37f2467..2aff748 100644
--- a/UnleashedRecomp/kernel/xam.cpp
+++ b/UnleashedRecomp/kernel/xam.cpp
@@ -2,7 +2,7 @@
 #include "xam.h"
 #include "xdm.h"
 #include <hid/hid.h>
-#include <gpu/window.h>
+#include <ui/window.h>
 #include <cpu/guest_thread.h>
 #include <ranges>
 #include <unordered_set>
diff --git a/UnleashedRecomp/gpu/Window.cpp b/UnleashedRecomp/ui/window.cpp
similarity index 100%
rename from UnleashedRecomp/gpu/Window.cpp
rename to UnleashedRecomp/ui/window.cpp
diff --git a/UnleashedRecomp/gpu/Window.h b/UnleashedRecomp/ui/window.h
similarity index 100%
rename from UnleashedRecomp/gpu/Window.h
rename to UnleashedRecomp/ui/window.h