From 4275779f8a1ffbb03922bf149a6228be21f64579 Mon Sep 17 00:00:00 2001
From: ThePixelCoder <thepixelmaster2354@gmail.com>
Date: Mon, 19 Dec 2022 06:12:15 -0600
Subject: Handle nn::gfx merge (#108)

* Fix build and document nn::gfx merge

* Update submodules and some extra labelling in csv

* Fix various issues

* Make versioning more flexible
---
 lib/NintendoSDK                     | 2 +-
 lib/agl                             | 2 +-
 lib/gsys/include/gsys/gsysModelNW.h | 3 ++-
 lib/sead                            | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'lib')

diff --git a/lib/NintendoSDK b/lib/NintendoSDK
index 00bb399f..2baac43e 160000
--- a/lib/NintendoSDK
+++ b/lib/NintendoSDK
@@ -1 +1 @@
-Subproject commit 00bb399f3c0169d77044f857f39ba9e04a896fde
+Subproject commit 2baac43e46d5fcd9c2a769606c97880ed78ff958
diff --git a/lib/agl b/lib/agl
index b31cfcd0..9731cfc5 160000
--- a/lib/agl
+++ b/lib/agl
@@ -1 +1 @@
-Subproject commit b31cfcd01e376e2fd4a2b45c2092a35c2c510847
+Subproject commit 9731cfc5017f798aeca80a37fba17f3af17b8076
diff --git a/lib/gsys/include/gsys/gsysModelNW.h b/lib/gsys/include/gsys/gsysModelNW.h
index 0a7c67e8..a6da4f27 100644
--- a/lib/gsys/include/gsys/gsysModelNW.h
+++ b/lib/gsys/include/gsys/gsysModelNW.h
@@ -2,7 +2,8 @@
 
 #include <gsys/gsysModelUnit.h>
 #include <nn/g3d/ModelObj.h>
-#include <nn/gfx/memory.h>
+#include <nn/gfx/gfx_MemoryPool.h>
+#include <nn/gfx/gfx_Types.h>
 #include <prim/seadDelegate.h>
 
 namespace agl {
diff --git a/lib/sead b/lib/sead
index 79f528be..52acb917 160000
--- a/lib/sead
+++ b/lib/sead
@@ -1 +1 @@
-Subproject commit 79f528be96a3d7c844847ab6371e0ae6b38c83c7
+Subproject commit 52acb917ca5b0271f3aaf3412fdde1ce9575ccbc
-- 
cgit v1.2.3