[nostalgia] Switch back to conan
This commit is contained in:
		
							
								
								
									
										3
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										3
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							@@ -1,10 +1,9 @@
 | 
				
			|||||||
.clangd
 | 
					.clangd
 | 
				
			||||||
.current_build
 | 
					.current_build
 | 
				
			||||||
.vcpkg
 | 
					 | 
				
			||||||
scripts/__pycache__
 | 
					scripts/__pycache__
 | 
				
			||||||
compile_commands.json
 | 
					compile_commands.json
 | 
				
			||||||
build
 | 
					build
 | 
				
			||||||
conanbuild
 | 
					.conanbuild
 | 
				
			||||||
dist
 | 
					dist
 | 
				
			||||||
tags
 | 
					tags
 | 
				
			||||||
nostalgia.gba
 | 
					nostalgia.gba
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -20,6 +20,11 @@ if(NOSTALGIA_BUILD_TYPE STREQUAL "GBA")
 | 
				
			|||||||
	set(OX_BARE_METAL ON)
 | 
						set(OX_BARE_METAL ON)
 | 
				
			||||||
endif()
 | 
					endif()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					set(NOSTALGIA_CONAN_PATHS ${CMAKE_SOURCE_DIR}/.conanbuild/conan_paths.cmake)
 | 
				
			||||||
 | 
					if(NOT NOSTALGIA_BUILD_TYPE STREQUAL "GBA" AND EXISTS ${NOSTALGIA_CONAN_PATHS})
 | 
				
			||||||
 | 
						include(${NOSTALGIA_CONAN_PATHS})
 | 
				
			||||||
 | 
					endif()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
if(OX_BARE_METAL)
 | 
					if(OX_BARE_METAL)
 | 
				
			||||||
	set(NOSTALGIA_BUILD_STUDIO OFF)
 | 
						set(NOSTALGIA_BUILD_STUDIO OFF)
 | 
				
			||||||
	set(OX_USE_STDLIB OFF)
 | 
						set(OX_USE_STDLIB OFF)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -19,8 +19,8 @@ Install and use gmake instead of the make that comes with the system.
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
Build options: release, debug, asan, gba, gba-debug
 | 
					Build options: release, debug, asan, gba, gba-debug
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	make vcpkg
 | 
						make setup-conan
 | 
				
			||||||
	make purge configure-{gba,release,debug} install
 | 
						make purge conan configure-{gba,release,debug} install
 | 
				
			||||||
 | 
					
 | 
				
			||||||
## Run
 | 
					## Run
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										9
									
								
								conanfile.py
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										9
									
								
								conanfile.py
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,9 @@
 | 
				
			|||||||
 | 
					from conans import ConanFile, CMake
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					class NostalgiaConan(ConanFile):
 | 
				
			||||||
 | 
					    settings = "os", "compiler", "build_type", "arch"
 | 
				
			||||||
 | 
					    requires = "jsoncpp/1.9.4", "sdl2/2.0.14@bincrafters/stable"
 | 
				
			||||||
 | 
					    generators = "cmake", "cmake_find_package", "cmake_paths"
 | 
				
			||||||
 | 
					    #default_options = {
 | 
				
			||||||
 | 
					    #    "sdl2:nas": False
 | 
				
			||||||
 | 
					    #}
 | 
				
			||||||
@@ -4,12 +4,11 @@ add_library(
 | 
				
			|||||||
		gfx.cpp
 | 
							gfx.cpp
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
find_package(SDL2 REQUIRED)
 | 
					find_package(sdl2 REQUIRED)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
target_link_libraries(
 | 
					target_link_libraries(
 | 
				
			||||||
	NostalgiaCore-SDL PUBLIC
 | 
						NostalgiaCore-SDL PUBLIC
 | 
				
			||||||
		SDL2::SDL2main
 | 
							SDL2::SDL2
 | 
				
			||||||
		SDL2::SDL2-static
 | 
					 | 
				
			||||||
		NostalgiaCore-Userspace
 | 
							NostalgiaCore-Userspace
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user