mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-16 20:29:57 +00:00
Code Issues Releases Wiki Activity

Get build working on Apple Silicon

Browse source 
Will validate issues with Intel OSX later
This commit is contained in:
Andrew Dunn 2022-08-17 02:18:48 +10:00
parent 856fcb7742
commit 1d7d3d5765
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/openmw/CMakeLists.txt
View file

@ -223,7 +223,10 @@ if(APPLE)
if (FFmpeg_FOUND) if (FFmpeg_FOUND)
find_library(COREVIDEO_FRAMEWORK CoreVideo) find_library(COREVIDEO_FRAMEWORK CoreVideo)
find_library(VDA_FRAMEWORK VideoDecodeAcceleration) find_library(VDA_FRAMEWORK VideoDecodeAcceleration)
target_link_libraries(openmw z ${COREVIDEO_FRAMEWORK} ${VDA_FRAMEWORK}) target_link_libraries(openmw z ${COREVIDEO_FRAMEWORK} ${VDA_FRAMEWORK}
"-framework VideoToolbox"
"-framework AudioToolbox"
"-framework CoreMedia")
endif() endif()
endif(APPLE) endif(APPLE)

2
components/esm/luascripts.cpp
View file

@ -104,7 +104,7 @@ void ESM::LuaScriptsCfg::adjustRefNums(const ESMReader& esm)
throw std::runtime_error("Incorrect contentFile index"); throw std::runtime_error("Incorrect contentFile index");
}; };
lua_State* L = lua_open(); lua_State* L = luaL_newstate();
LuaUtil::BasicSerializer serializer(adjustRefNumFn); LuaUtil::BasicSerializer serializer(adjustRefNumFn);
auto adjustLuaData = [&](std::string& data) auto adjustLuaData = [&](std::string& data)