From 640099f9db396b22feedbd933cce131c1da1a51e Mon Sep 17 00:00:00 2001 From: Joshua Goins Date: Sun, 21 Apr 2024 07:02:34 -0400 Subject: [PATCH] Fix compilation on Fedora --- renderer/CMakeLists.txt | 1 + renderer/src/rendersystem.cpp | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/renderer/CMakeLists.txt b/renderer/CMakeLists.txt index f34f2da..3ba8f5f 100644 --- a/renderer/CMakeLists.txt +++ b/renderer/CMakeLists.txt @@ -36,5 +36,6 @@ target_link_libraries(renderer spirv-cross-core spirv-cross-glsl) target_compile_definitions(renderer PUBLIC GLM_FORCE_RADIANS GLM_FORCE_DEPTH_ZERO_TO_ONE GLM_ENABLE_EXPERIMENTAL) +target_compile_options(renderer PUBLIC -fexceptions) # needed for spirv-cross and dxbc add_library(Novus::Renderer ALIAS renderer) \ No newline at end of file diff --git a/renderer/src/rendersystem.cpp b/renderer/src/rendersystem.cpp index 69a428a..551fbfd 100644 --- a/renderer/src/rendersystem.cpp +++ b/renderer/src/rendersystem.cpp @@ -67,8 +67,8 @@ RenderSystem::RenderSystem(Renderer &renderer, GameData *data) void RenderSystem::testInit(::RenderModel *m) { qInfo() << "initialzing render system with dummy data..."; - RenderModel model{.internal_model = new ::RenderModel(*m), - .shpk = physis_parse_shpk(physis_gamedata_extract_file(m_data, "shader/sm5/shpk/character.shpk"))}; + RenderModel model{.shpk = physis_parse_shpk(physis_gamedata_extract_file(m_data, "shader/sm5/shpk/character.shpk")), + .internal_model = new ::RenderModel(*m)}; m_renderModels.push_back(model); }