[nostalgia] Collapse NostalgiaCore down to a single library and cleanup impl data access

2022-02-03 19:57:43 -06:00
parent d4e903b593
commit 8174d04b06
20 changed files with 152 additions and 182 deletions
--- a/src/nostalgia/studio/CMakeLists.txt
+++ b/src/nostalgia/studio/CMakeLists.txt
@@ -14,7 +14,7 @@ target_link_libraries(
 		OxClArgs
 		OxFS
 		NostalgiaCore-Studio
-		NostalgiaCore-Userspace
+		NostalgiaCore
 		NostalgiaStudio
 		NostalgiaPack
 )
--- a/src/nostalgia/studio/lib/CMakeLists.txt
+++ b/src/nostalgia/studio/lib/CMakeLists.txt
@@ -45,8 +45,7 @@ target_link_libraries(
 		OxEvent
 		OxFS
 		OxClaw
-		NostalgiaCore-Userspace
-		NostalgiaCore-GLFW
+		NostalgiaCore
 )

 install(
--- a/src/nostalgia/studio/studioapp.cpp
+++ b/src/nostalgia/studio/studioapp.cpp
@@ -83,7 +83,7 @@ void StudioUI::drawMenu() noexcept {
 			if (ImGui::MenuItem("Save", "Ctrl+S", false, m_saveEnabled)) {
 			}
 			if (ImGui::MenuItem("Quit", "Ctrl+Q")) {
-				core::shutdown(m_ctx);
+				oxIgnoreError(core::shutdown(m_ctx));
 			}
 			ImGui::EndMenu();
 		}