Merge commit 'f5e4ccf53b1d3c97904590815fc892ddd0ce91bb'

deps/nostalgia/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.19)
+cmake_minimum_required(VERSION 3.25)
 set(CMAKE_POLICY_DEFAULT_CMP0110 NEW) # requires CMake 3.19
 
 if(BUILDCORE_TARGET STREQUAL "gba")
@@ -9,7 +9,7 @@ else()
 	project(nostalgia C CXX)
 endif()
 
-include(deps/buildcore/base.cmake)
+include(deps/oxlib/deps/buildcore/base.cmake)
 
 set(OX_ENABLE_TRACEHOOK OFF CACHE BOOL "Generate OxTraceHook shared library for uprobes")
 
@@ -35,10 +35,7 @@ else()
 	set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
 endif()
 
-add_subdirectory(deps/ox)
-include_directories(
-	deps/ox/src
-)
+add_subdirectory(deps/oxlib)
 add_subdirectory(deps/teagba)
 
 if(NOT BUILDCORE_TARGET STREQUAL "gba")
@@ -55,7 +52,7 @@ if(NOT BUILDCORE_TARGET STREQUAL "gba")
 	set(GLFW_BUILD_TESTS OFF)
 	set(GLFW_BUILD_DOCS OFF)
 	if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
-		set(GLFW_BUILD_WAYLAND OFF)
+		set(GLFW_BUILD_WAYLAND ON)
 	endif()
 	add_subdirectory(deps/glfw)
 	add_subdirectory(deps/glutils)