From c286e3794d9d4cc571671548ad765ce370bcfcb4 Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Thu, 7 May 2026 01:18:59 -0500 Subject: [PATCH] Squashed 'deps/oxlib/' changes from 85f17c418..170d6e35a 170d6e35a [ox] Add dist to gitignore 83fd814d6 [ox] Bump required CMake version git-subtree-dir: deps/oxlib git-subtree-split: 170d6e35a67739b600aa95abfff7269972a45c00 --- .gitignore | 1 + CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index c184bd87..1d466278 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ build/gba build/*-asan build/*-debug build/*-release +dist .current_build tags compile_commands.json diff --git a/CMakeLists.txt b/CMakeLists.txt index a378f2a4..936ab13a 100644 --- a/CMakeLists.txt +++ b/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 project(Ox CXX)