mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-04-03 05:06:41 +00:00
Code Issues Releases Wiki Activity

Merge branch 'fix_build' into 'master'

Browse source 
Fix build

See merge request OpenMW/openmw!3350
This commit is contained in:
psi29a 2023-08-18 15:42:53 +00:00
commit a1b7c0c3d5
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
apps/openmw/mwlua/soundbindings.cpp
View file

@ -1,16 +1,15 @@
#include "soundbindings.hpp" #include "soundbindings.hpp"
#include "luabindings.hpp"
#include "../mwbase/environment.hpp" #include "../mwbase/environment.hpp"
#include "../mwbase/soundmanager.hpp" #include "../mwbase/soundmanager.hpp"
#include "../mwbase/windowmanager.hpp" #include "../mwbase/world.hpp"
#include "../mwworld/esmstore.hpp"
#include <components/esm3/loadsoun.hpp> #include <components/esm3/loadsoun.hpp>
#include <components/misc/resourcehelpers.hpp> #include <components/misc/resourcehelpers.hpp>
#include <components/vfs/pathutil.hpp> #include <components/vfs/pathutil.hpp>
#include "../mwworld/esmstore.hpp"
#include "luamanagerimp.hpp" #include "luamanagerimp.hpp"
namespace MWLua namespace MWLua
@ -161,9 +160,7 @@ namespace MWLua
}, },
[]() { return MWBase::Environment::get().getSoundManager()->sayActive(MWWorld::ConstPtr()); }); []() { return MWBase::Environment::get().getSoundManager()->sayActive(MWWorld::ConstPtr()); });
// Sound store
using SoundStore = MWWorld::Store<ESM::Sound>; using SoundStore = MWWorld::Store<ESM::Sound>;
const SoundStore* soundStore = &MWBase::Environment::get().getWorld()->getStore().get<ESM::Sound>();
sol::usertype<SoundStore> soundStoreT = lua.new_usertype<SoundStore>("ESM3_SoundStore"); sol::usertype<SoundStore> soundStoreT = lua.new_usertype<SoundStore>("ESM3_SoundStore");
soundStoreT[sol::meta_function::to_string] soundStoreT[sol::meta_function::to_string]
= [](const SoundStore& store) { return "ESM3_SoundStore{" + std::to_string(store.getSize()) + " sounds}"; }; = [](const SoundStore& store) { return "ESM3_SoundStore{" + std::to_string(store.getSize()) + " sounds}"; };
@ -176,7 +173,7 @@ namespace MWLua
soundStoreT[sol::meta_function::pairs] = lua["ipairsForArray"].template get<sol::function>(); soundStoreT[sol::meta_function::pairs] = lua["ipairsForArray"].template get<sol::function>();
soundStoreT[sol::meta_function::ipairs] = lua["ipairsForArray"].template get<sol::function>(); soundStoreT[sol::meta_function::ipairs] = lua["ipairsForArray"].template get<sol::function>();
api["sounds"] = soundStore; api["sounds"] = &MWBase::Environment::get().getWorld()->getStore().get<ESM::Sound>();
// Sound record // Sound record
auto soundT = lua.new_usertype<ESM::Sound>("ESM3_Sound"); auto soundT = lua.new_usertype<ESM::Sound>("ESM3_Sound");

7
components/CMakeLists.txt
View file

@ -520,10 +520,15 @@ target_link_libraries(components
SQLite::SQLite3 SQLite::SQLite3
smhasher smhasher
${ICU_LIBRARIES} ${ICU_LIBRARIES}
yaml-cpp
ZLIB::ZLIB ZLIB::ZLIB
) )
if(yaml-cpp_VERSION VERSION_GREATER_EQUAL 0.8.0)
target_link_libraries(components yaml-cpp::yaml-cpp)
else()
target_link_libraries(components yaml-cpp)
endif()
if(Boost_VERSION_STRING VERSION_GREATER_EQUAL 1.77.0) if(Boost_VERSION_STRING VERSION_GREATER_EQUAL 1.77.0)
target_link_libraries(components ${Boost_ATOMIC_LIBRARY}) target_link_libraries(components ${Boost_ATOMIC_LIBRARY})
endif() endif()