From 2c492f12138e647eaa6ffaa3eab77637f6da64de Mon Sep 17 00:00:00 2001
From: briaguya <briaguya@alice>
Date: Fri, 19 Aug 2022 20:03:09 -0400
Subject: [PATCH 1/5] add mac specific include

---
 libultraship/libultraship/Window.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libultraship/libultraship/Window.cpp b/libultraship/libultraship/Window.cpp
index 70a0feae0b9..9aaf807757c 100644
--- a/libultraship/libultraship/Window.cpp
+++ b/libultraship/libultraship/Window.cpp
@@ -31,6 +31,9 @@
 #include "spdlog/sinks/stdout_color_sinks.h"
 #include "spdlog/sinks/sohconsole_sink.h"
 #include "PR/ultra64/gbi.h"
+#ifdef __APPLE__
+#include "OSXFolderManager.h"
+#endif
 
 #define LOAD_TEX(texPath) static_cast<Ship::Texture*>(Ship::Window::GetInstance()->GetResourceManager()->LoadResource(texPath).get());
 

From 0806f8cd14e281b91088433071257cf8b6f9097d Mon Sep 17 00:00:00 2001
From: briaguya <briaguya@alice>
Date: Fri, 19 Aug 2022 20:14:15 -0400
Subject: [PATCH 2/5] sstream to get past "implicit instantiation of undefined
 template" error

---
 libultraship/libultraship/Console.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libultraship/libultraship/Console.cpp b/libultraship/libultraship/Console.cpp
index fe9c2897682..846e6e0a0d8 100644
--- a/libultraship/libultraship/Console.cpp
+++ b/libultraship/libultraship/Console.cpp
@@ -6,6 +6,7 @@
 #include "Utils/StringHelper.h"
 #include "Lib/ImGui/imgui_internal.h"
 #include "Utils.h"
+#include <sstream>
 
 namespace Ship {
 	std::string BuildUsage(const CommandEntry& entry) {

From 762e4260458b96c7335b046bec39925e43eec95f Mon Sep 17 00:00:00 2001
From: briaguya <briaguya@alice>
Date: Fri, 19 Aug 2022 20:26:49 -0400
Subject: [PATCH 3/5] switch/wiiu includes

---
 libultraship/libultraship/Window.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/libultraship/libultraship/Window.cpp b/libultraship/libultraship/Window.cpp
index 9aaf807757c..591d926e020 100644
--- a/libultraship/libultraship/Window.cpp
+++ b/libultraship/libultraship/Window.cpp
@@ -33,8 +33,13 @@
 #include "PR/ultra64/gbi.h"
 #ifdef __APPLE__
 #include "OSXFolderManager.h"
+#elif defined(__SWITCH__)
+#include "SwitchImpl.h"
+#elif defined(__WIIU__)
+#include "WiiUImpl.h"
 #endif
 
+
 #define LOAD_TEX(texPath) static_cast<Ship::Texture*>(Ship::Window::GetInstance()->GetResourceManager()->LoadResource(texPath).get());
 
 extern "C" {

From faa99d684f72fccd94cc59df17fa31eb11935080 Mon Sep 17 00:00:00 2001
From: briaguya <briaguya@alice>
Date: Fri, 19 Aug 2022 20:33:22 -0400
Subject: [PATCH 4/5] that file doesn't exist

---
 libultraship/libultraship/Lib/Fast3D/gfx_gx2.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/libultraship/libultraship/Lib/Fast3D/gfx_gx2.cpp b/libultraship/libultraship/Lib/Fast3D/gfx_gx2.cpp
index dddc0fa853c..876375169a5 100644
--- a/libultraship/libultraship/Lib/Fast3D/gfx_gx2.cpp
+++ b/libultraship/libultraship/Lib/Fast3D/gfx_gx2.cpp
@@ -16,7 +16,6 @@
 
 #include "gfx_cc.h"
 #include "gfx_rendering_api.h"
-#include "../../GlobalCtx2.h"
 #include "gfx_pc.h"
 #include "gfx_wiiu.h"
 

From be009f04e62e875c9273deaf30745f1cd79df3c7 Mon Sep 17 00:00:00 2001
From: briaguya <briaguya@alice>
Date: Fri, 19 Aug 2022 20:48:11 -0400
Subject: [PATCH 5/5] more wii u globalctx2 stuff

---
 libultraship/libultraship/WiiUController.cpp | 1 -
 libultraship/libultraship/WiiUGamepad.cpp    | 1 -
 libultraship/libultraship/WiiUImpl.cpp       | 2 +-
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/libultraship/libultraship/WiiUController.cpp b/libultraship/libultraship/WiiUController.cpp
index 19835a548c5..de5c33633d7 100644
--- a/libultraship/libultraship/WiiUController.cpp
+++ b/libultraship/libultraship/WiiUController.cpp
@@ -1,6 +1,5 @@
 #ifdef __WIIU__
 #include "WiiUController.h"
-#include "GlobalCtx2.h"
 #include "Window.h"
 #include "ImGuiImpl.h"
 
diff --git a/libultraship/libultraship/WiiUGamepad.cpp b/libultraship/libultraship/WiiUGamepad.cpp
index 64ef9e90f45..ac1558e0849 100644
--- a/libultraship/libultraship/WiiUGamepad.cpp
+++ b/libultraship/libultraship/WiiUGamepad.cpp
@@ -1,6 +1,5 @@
 #ifdef __WIIU__
 #include "WiiUGamepad.h"
-#include "GlobalCtx2.h"
 #include "ImGuiImpl.h"
 
 #include "WiiUImpl.h"
diff --git a/libultraship/libultraship/WiiUImpl.cpp b/libultraship/libultraship/WiiUImpl.cpp
index 06cd3ec60d3..41439542ab6 100644
--- a/libultraship/libultraship/WiiUImpl.cpp
+++ b/libultraship/libultraship/WiiUImpl.cpp
@@ -114,7 +114,7 @@ void Update() {
 
     // rescan devices if connection state changed
     if (rescan) {
-		Ship::GlobalCtx2::GetInstance()->GetWindow()->GetControlDeck()->ScanPhysicalDevices();
+        Window::GetInstance()->GetControlDeck()->ScanPhysicalDevices();
     }
 }