From 2156fdce4f963d4b404a623f2ebac939f48ebd19 Mon Sep 17 00:00:00 2001 From: Lynix Date: Mon, 12 Feb 2024 15:47:28 +0100 Subject: [PATCH] Update for latest Nazara version --- src/NazaraImgui/ImguiDrawer.cpp | 2 +- src/NazaraImgui/ImguiPipelinePass.cpp | 4 ++-- xmake.lua | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/NazaraImgui/ImguiDrawer.cpp b/src/NazaraImgui/ImguiDrawer.cpp index 96a76cb..de0337c 100644 --- a/src/NazaraImgui/ImguiDrawer.cpp +++ b/src/NazaraImgui/ImguiDrawer.cpp @@ -2,11 +2,11 @@ #include +#include #include #include #include #include -#include #include diff --git a/src/NazaraImgui/ImguiPipelinePass.cpp b/src/NazaraImgui/ImguiPipelinePass.cpp index 273f1e0..027871d 100644 --- a/src/NazaraImgui/ImguiPipelinePass.cpp +++ b/src/NazaraImgui/ImguiPipelinePass.cpp @@ -21,10 +21,10 @@ namespace Nz FramePass& ImguiPipelinePass::RegisterToFrameGraph(FrameGraph& frameGraph, const PassInputOuputs& inputOuputs) { - if (inputOuputs.inputCount != 1) + if (inputOuputs.inputAttachments.size() != 1) throw std::runtime_error("one input expected"); - if (inputOuputs.outputCount != 1) + if (inputOuputs.outputAttachments.size() != 1) throw std::runtime_error("one output expected"); FramePass& imguiPass = frameGraph.AddPass("Imgui pass"); diff --git a/xmake.lua b/xmake.lua index 1bc0187..c74078a 100644 --- a/xmake.lua +++ b/xmake.lua @@ -11,6 +11,7 @@ add_requires("nazaraengine", { alias = "nazara", debug = is_mode("debug") }) add_requires("imgui v1.87-docking", { alias = "imgui" }) add_includedirs("include", "src") +set_exceptions("cxx") set_languages("c89", "c++20") set_rundir("./bin/$(plat)_$(arch)_$(mode)") set_targetdir("./bin/$(plat)_$(arch)_$(mode)")