Merge commit 'cc499028fb6b9a2138538c771d4de8fbf41a7835' as 'deps/ox'

git-subtree-dir: deps/ox
git-subtree-split: d4807cd2a0cd64843824959c24479e1ba54459f0

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.25)
+cmake_minimum_required(VERSION 3.19)
 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/oxlib/deps/buildcore/base.cmake)
+include(deps/buildcore/base.cmake)
 
 set(OX_ENABLE_TRACEHOOK OFF CACHE BOOL "Generate OxTraceHook shared library for uprobes")
 
@@ -35,7 +35,10 @@ else()
 	set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
 endif()
 
-add_subdirectory(deps/oxlib)
+add_subdirectory(deps/ox)
+include_directories(
+	deps/ox/src
+)
 add_subdirectory(deps/teagba)
 
 if(NOT BUILDCORE_TARGET STREQUAL "gba")
@@ -52,7 +55,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 ON)
+		set(GLFW_BUILD_WAYLAND OFF)
 	endif()
 	add_subdirectory(deps/glfw)
 	add_subdirectory(deps/glutils)

Makefile

@@ -1,7 +1,7 @@
 BC_VAR_PROJECT_NAME=nostalgia
 BC_VAR_PROJECT_NAME_CAP=Nostalgia
 BC_VAR_DEVENV_ROOT=util
-BUILDCORE_PATH=deps/oxlib/deps/buildcore
+BUILDCORE_PATH=deps/ox/deps/buildcore
 include ${BUILDCORE_PATH}/base.mk
 
 ifeq ($(BC_VAR_OS),darwin)
@@ -20,11 +20,11 @@ git-setup-ox-remote:
 .PHONY: git-pull-ox
 git-pull-ox:
 	git fetch ox-master master
-	git subtree pull --prefix deps/oxlib ox-master master --squash
+	git subtree pull --prefix deps/ox ox-master master --squash
 
 .PHONY: git-push-ox
 git-push-ox:
-	git subtree push --prefix=deps/oxlib ox-master master
+	git subtree push --prefix=deps/ox ox-master master
 
 .PHONY: pkg-gba
 pkg-gba: build-pack build-gba-player

deps/ox/.gitignore

@@ -3,7 +3,6 @@ build/gba
 build/*-asan
 build/*-debug
 build/*-release
-dist
 .current_build
 tags
 compile_commands.json

deps/ox/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.25)
+cmake_minimum_required(VERSION 3.19)
 set(CMAKE_POLICY_DEFAULT_CMP0110 NEW) # requires CMake 3.19
 
 project(Ox CXX)
@@ -78,6 +78,13 @@ include_directories(src)
 
 install(FILES OxConfig.cmake DESTINATION lib/cmake/ox)
 
+install(
+    DIRECTORY
+        include/ox
+    DESTINATION
+        include
+)
+
 if(OX_USE_STDLIB)
 	set(JSONCPP_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/deps/jsoncpp/include")
 	add_subdirectory(deps/jsoncpp)