drinkingtea/jasper
2
0
Fork 0
Code Issues 2 Pull Requests Actions Releases Activity

[jasper] Fix build
Build / build (push) Failing after 13s
Details

Browse Source
This commit is contained in:
Gary Talent
2026-05-25 14:23:01 -05:00
parent 5bd1618374
commit c906ce4c0b
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+2 -2
View File
@@ -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 set(CMAKE_POLICY_DEFAULT_CMP0110 NEW) # requires CMake 3.19
if(BUILDCORE_TARGET STREQUAL "gba") if(BUILDCORE_TARGET STREQUAL "gba")
@@ -9,7 +9,7 @@ else()
project(jasper C CXX) project(jasper C CXX)
endif() 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 20)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
Makefile
+1 -1
View File
@@ -1,6 +1,6 @@
BC_VAR_PROJECT_NAME=jasper BC_VAR_PROJECT_NAME=jasper
BC_VAR_PROJECT_NAME_CAP=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 GBABUILDCORE_PATH=deps/nostalgia/deps/gbabuildcore
include ${BUILDCORE_PATH}/base.mk include ${BUILDCORE_PATH}/base.mk
src/jasper/modules/world/src/studio/worldeditor/worldeditor-imgui.cpp
+1 -1
View File
@@ -252,7 +252,7 @@ void WorldEditorImGui::drawPropEditor() noexcept {
if (m_sizeEditor.show) { if (m_sizeEditor.show) {
constexpr auto popupSz = ImVec2{285, 0}; constexpr auto popupSz = ImVec2{285, 0};
ig::IDStackItem const idStackItem("EditMapSize"); 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 Width", &m_sizeEditor.columns, 1);
ImGui::InputInt("Map Height", &m_sizeEditor.rows, 1); ImGui::InputInt("Map Height", &m_sizeEditor.rows, 1);
bool const changed = m_doc.columns != m_sizeEditor.columns bool const changed = m_doc.columns != m_sizeEditor.columns