mirror of
https://github.com/OpenMW/openmw.git
synced 2025-06-01 06:41:32 +00:00
Merge branch 'landfalloutbutnothingtodowithfallout' into 'master'
Fix terrain CMake and testing fallout (unbreaks CI) See merge request OpenMW/openmw!4170
This commit is contained in:
commit
b001deeff7
2 changed files with 3 additions and 3 deletions
|
@ -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;
|
||||
|
|
|
@ -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()
|
||||
|
|
Loading…
Reference in a new issue