From 3a5a4894c0d7d6835379218bb90920e9a401561d Mon Sep 17 00:00:00 2001
From: Gary Talent <gary@drinkingtea.net>
Date: Sat, 12 Mar 2022 02:36:32 -0600
Subject: [PATCH] [nostalgia] Remove conan from main CMakeLists.txt, remove
 glfw & imgui includes from GBA build

---
 CMakeLists.txt | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8a251dec..f341e8c3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,11 @@
 cmake_minimum_required(VERSION 3.19)
 set(CMAKE_POLICY_DEFAULT_CMP0110 NEW) # requires CMake 3.19
 
-project(nostalgia)
+if(APPLE)
+	project(nostalgia CXX OBJCXX)
+else()
+	project(nostalgia CXX)
+endif()
 
 include(deps/buildcore/base.cmake)
 
@@ -15,10 +19,6 @@ if(BUILDCORE_TARGET STREQUAL "gba")
 	include(deps/gbabuildcore/base.cmake)
 else()
 	set(NOSTALGIA_BUILD_TYPE "Native")
-	set(NOSTALGIA_CONAN_PATHS ${CMAKE_SOURCE_DIR}/.conanbuild/conan_paths.cmake)
-	if(EXISTS ${NOSTALGIA_CONAN_PATHS})
-		include(${NOSTALGIA_CONAN_PATHS})
-	endif()
 	set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 endif()
 
@@ -42,14 +42,18 @@ endif()
 add_subdirectory(deps/ox)
 include_directories(
 	SYSTEM
-		deps/glfw/include
-		deps/imgui/src
 		deps/ox/src
 )
 
 if(BUILDCORE_TARGET STREQUAL "gba")
 	add_subdirectory(deps/gbastartup)
 else()
+	include_directories(
+		SYSTEM
+			deps/glfw/include
+			deps/imgui
+			deps/imgui/backends
+	)
 	add_subdirectory(deps/glfw)
 	add_subdirectory(deps/imgui)
 endif()