From c152bb9a66c5dc05d3ae7ef0a90178fbd07a8584 Mon Sep 17 00:00:00 2001
From: Gary Talent <gary@drinkingtea.net>
Date: Fri, 11 Mar 2022 22:16:59 -0600
Subject: [PATCH] [nostalgia] Switch from Conan to bundled dep glfw

---
 CMakeLists.txt                    | 2 ++
 conanfile.py                      | 2 +-
 src/nostalgia/core/CMakeLists.txt | 3 +--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e5320ba4..8a251dec 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,6 +42,7 @@ endif()
 add_subdirectory(deps/ox)
 include_directories(
 	SYSTEM
+		deps/glfw/include
 		deps/imgui/src
 		deps/ox/src
 )
@@ -49,6 +50,7 @@ include_directories(
 if(BUILDCORE_TARGET STREQUAL "gba")
 	add_subdirectory(deps/gbastartup)
 else()
+	add_subdirectory(deps/glfw)
 	add_subdirectory(deps/imgui)
 endif()
 
diff --git a/conanfile.py b/conanfile.py
index 0f5c1b8f..e0591479 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -2,7 +2,7 @@ from conans import ConanFile, CMake
 
 class NostalgiaConan(ConanFile):
     settings = 'os', 'compiler', 'build_type', 'arch'
-    requires = 'jsoncpp/1.9.4', 'glfw/3.3.4', 'imgui/1.86'
+    requires = 'jsoncpp/1.9.4', 'imgui/1.86'
     generators = 'cmake', 'cmake_find_package', 'cmake_paths'
     default_options = {
     }
diff --git a/src/nostalgia/core/CMakeLists.txt b/src/nostalgia/core/CMakeLists.txt
index 7ac386ff..1925776b 100644
--- a/src/nostalgia/core/CMakeLists.txt
+++ b/src/nostalgia/core/CMakeLists.txt
@@ -1,5 +1,4 @@
 if(NOT NOSTALGIA_BUILD_TYPE STREQUAL "GBA")
-	find_package(glfw3 REQUIRED)
 	find_package(imgui REQUIRED)
 	if(APPLE)
 		find_package(OpenGL REQUIRED)
@@ -18,7 +17,7 @@ if(NOT NOSTALGIA_BUILD_TYPE STREQUAL "GBA")
 	set(
 		NOSTALGIA_CORE_IMPL_LIBS
 			${OPENGL_gl_LIBRARY}
-			glfw::glfw
+			glfw
 			imgui::imgui
 			imgui-glfw
 			NostalgiaGlUtils