From c906ce4c0bcd216d3c5920c702bf8ba93ffd7e78 Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Mon, 25 May 2026 14:23:01 -0500 Subject: [PATCH] [jasper] Fix build --- CMakeLists.txt | 4 ++-- Makefile | 2 +- .../world/src/studio/worldeditor/worldeditor-imgui.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7c564a0..1799075 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.19) +cmake_minimum_required(VERSION 4.0) set(CMAKE_POLICY_DEFAULT_CMP0110 NEW) # requires CMake 3.19 if(BUILDCORE_TARGET STREQUAL "gba") @@ -9,7 +9,7 @@ else() project(jasper C CXX) endif() -include(deps/nostalgia/deps/buildcore/base.cmake) +include(deps/nostalgia/deps/oxlib/deps/buildcore/base.cmake) set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD_REQUIRED ON) diff --git a/Makefile b/Makefile index 0f2fbdd..b6f8d86 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ BC_VAR_PROJECT_NAME=jasper BC_VAR_PROJECT_NAME_CAP=Jasper -BUILDCORE_PATH=deps/nostalgia/deps/buildcore +BUILDCORE_PATH=deps/nostalgia/deps/oxlib/deps/buildcore GBABUILDCORE_PATH=deps/nostalgia/deps/gbabuildcore include ${BUILDCORE_PATH}/base.mk diff --git a/src/jasper/modules/world/src/studio/worldeditor/worldeditor-imgui.cpp b/src/jasper/modules/world/src/studio/worldeditor/worldeditor-imgui.cpp index 5d8e9ab..ac667d6 100644 --- a/src/jasper/modules/world/src/studio/worldeditor/worldeditor-imgui.cpp +++ b/src/jasper/modules/world/src/studio/worldeditor/worldeditor-imgui.cpp @@ -252,7 +252,7 @@ void WorldEditorImGui::drawPropEditor() noexcept { if (m_sizeEditor.show) { constexpr auto popupSz = ImVec2{285, 0}; ig::IDStackItem const idStackItem("EditMapSize"); - if (ig::BeginPopup(m_sctx.tctx, "Edit Map Size", m_sizeEditor.show, popupSz)) { + if (ig::BeginPopup("Edit Map Size", m_sizeEditor.show, popupSz)) { ImGui::InputInt("Map Width", &m_sizeEditor.columns, 1); ImGui::InputInt("Map Height", &m_sizeEditor.rows, 1); bool const changed = m_doc.columns != m_sizeEditor.columns