[nostalgia] Get building with Conan

2019-12-30 22:51:35 -06:00
parent bd1fc01ca1
commit 0d46cee20d
6 changed files with 16 additions and 397 deletions
--- a/src/nostalgia/CMakeLists.txt
+++ b/src/nostalgia/CMakeLists.txt
@ -2,7 +2,6 @@
 #setup libraries

 if(NOSTALGIA_BUILD_TYPE STREQUAL "Native")
-	find_package(SDL2 REQUIRED)
 	if(NOSTALGIA_BUILD_STUDIO)
 		find_package(Qt5Widgets REQUIRED)
 		find_package(Qt5QuickWidgets REQUIRED)
--- a/src/nostalgia/core/sdl/CMakeLists.txt
+++ b/src/nostalgia/core/sdl/CMakeLists.txt
@ -4,9 +4,11 @@ add_library(
 		gfx.cpp
 )

+find_package(sdl2 REQUIRED)
+
 target_link_libraries(
 	NostalgiaCore-SDL PUBLIC
-		SDL2::Main
+		sdl2::sdl2
 		OxFS
 		OxStd
 		NostalgiaCore-Userspace