From 65a9f789433954be1492cdfdd1ffa61e9beebf22 Mon Sep 17 00:00:00 2001 From: Alexei Kotov Date: Wed, 12 Jun 2024 12:50:20 +0300 Subject: [PATCH 1/2] Fix flags used in terrain saving/loading tests --- apps/components_tests/esm3/testsaveload.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/components_tests/esm3/testsaveload.cpp b/apps/components_tests/esm3/testsaveload.cpp index 08b4bf6de9..cffd852c95 100644 --- a/apps/components_tests/esm3/testsaveload.cpp +++ b/apps/components_tests/esm3/testsaveload.cpp @@ -706,7 +706,7 @@ namespace ESM data.mDataLoaded = Land::DATA_VNML | Land::DATA_VHGT | Land::DATA_VCLR | Land::DATA_VTEX; Land record; - record.mFlags = 42; + record.mFlags = Land::Flag_HeightsNormals | Land::Flag_Colors | Land::Flag_Textures; record.mX = 2; record.mY = 3; record.mDataTypes = Land::DATA_VNML | Land::DATA_VHGT | Land::DATA_WNAM | Land::DATA_VCLR | Land::DATA_VTEX; From 5c6fbc332f5f2ebd792b7f0856f53daffe9ce07f Mon Sep 17 00:00:00 2001 From: Alexei Kotov Date: Wed, 12 Jun 2024 12:51:03 +0300 Subject: [PATCH 2/2] Fix endif conditions in cmake --- apps/openmw/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt index c2293c9228..3c5a6423fd 100644 --- a/apps/openmw/CMakeLists.txt +++ b/apps/openmw/CMakeLists.txt @@ -251,7 +251,7 @@ if(APPLE AND BUILD_OPENMW) "LINKER:SHELL:-framework AudioToolbox" "LINKER:SHELL:-framework VideoDecodeAcceleration") endif() -endif(APPLE) +endif() if (BUILD_WITH_CODE_COVERAGE) target_compile_options(openmw-lib PRIVATE --coverage) @@ -264,4 +264,4 @@ endif() if (WIN32 AND BUILD_OPENMW) INSTALL(TARGETS openmw RUNTIME DESTINATION ".") -endif (WIN32) +endif()