mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-01 03:21:41 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'landfalloutbutnothingtodowithfallout' into 'master'

Browse Source 
Fix terrain CMake and testing fallout (unbreaks CI)

See merge request OpenMW/openmw!4170
This commit is contained in:
psi29a 2024-06-12 18:26:05 +00:00
commit b001deeff7
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/components_tests/esm3/testsaveload.cpp
View File

@ -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;

4
apps/openmw/CMakeLists.txt
View File

@ -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()