Updated configuration

This commit is contained in:
Eddoursul 2024-07-10 02:35:01 +02:00
parent 8325cf6a41
commit 5b54b71fd4
4 changed files with 7 additions and 25 deletions

View File

@ -44,7 +44,7 @@ include(FetchContent)
FetchContent_Declare( FetchContent_Declare(
CommonLibNG CommonLibNG
GIT_REPOSITORY https://github.com/alandtse/CommonLibVR GIT_REPOSITORY https://github.com/alandtse/CommonLibVR
GIT_TAG a62791cbcb68bd796b303ae7d1a25829d49c6b12 GIT_TAG 735fa6dae8ec72966ee02673dd689c6516d49f71
) )
set(ENABLE_SKYRIM_SE ON CACHE BOOL " " FORCE) set(ENABLE_SKYRIM_SE ON CACHE BOOL " " FORCE)
@ -53,7 +53,7 @@ set(ENABLE_SKYRIM_VR ON CACHE BOOL " " FORCE)
set(BUILD_TESTS OFF CACHE BOOL " " FORCE) set(BUILD_TESTS OFF CACHE BOOL " " FORCE)
#FetchContent_MakeAvailable(CommonLibNG) #FetchContent_MakeAvailable(CommonLibNG)
add_subdirectory("d:/Git/CommonLibSSE-NG" ${CMAKE_BINARY_DIR}/_deps/clib-build) add_subdirectory("d:/Git/CommonLibVR" ${CMAKE_BINARY_DIR}/_deps/clib-build)
get_target_property(commonlib_src_dir CommonLibSSE SOURCE_DIR) get_target_property(commonlib_src_dir CommonLibSSE SOURCE_DIR)
include(${commonlib_src_dir}/cmake/CommonLibSSE.cmake) include(${commonlib_src_dir}/cmake/CommonLibSSE.cmake)

View File

@ -282,8 +282,8 @@ inline bool FetchSupplies(RE::TESFurniture* a_furn)
if (GetSettings().at("LoadSuppliesEverywhere") || playerRef->GetParentCell()->GetFactionOwner() || playerRef->GetParentCell()->GetActorOwner() || a_furn->As<RE::BGSKeywordForm>()->HasKeywordString("_00E_Phasmalist_CraftingSummoningWorkbench")) { if (GetSettings().at("LoadSuppliesEverywhere") || playerRef->GetParentCell()->GetFactionOwner() || playerRef->GetParentCell()->GetActorOwner() || a_furn->As<RE::BGSKeywordForm>()->HasKeywordString("_00E_Phasmalist_CraftingSummoningWorkbench")) {
bAllowFetch = true; bAllowFetch = true;
} else { } else {
RE::TES::GetSingleton()->ForEachReferenceInRange(playerRef, 4000, [&chestAct, &bAllowFetch](RE::TESObjectREFR& b_ref) { RE::TES::GetSingleton()->ForEachReferenceInRange(playerRef, 4000, [&chestAct, &bAllowFetch](RE::TESObjectREFR* b_ref) {
if (chestAct == b_ref.GetBaseObject()) { if (chestAct == b_ref->GetBaseObject()) {
bAllowFetch = true; bAllowFetch = true;
return RE::BSContainer::ForEachResult::kStop; return RE::BSContainer::ForEachResult::kStop;
} }

View File

@ -2,19 +2,6 @@
"default-registry": { "default-registry": {
"kind": "git", "kind": "git",
"repository": "https://github.com/microsoft/vcpkg.git", "repository": "https://github.com/microsoft/vcpkg.git",
"baseline": "08c4e71048eb54733d9b180a28b9b1d7ce637454" "baseline": "f61a294e765b257926ae9e9d85f96468a0af74e7"
}, }
"registries": [
{
"kind": "git",
"repository": "https://gitlab.com/colorglass/vcpkg-colorglass",
"baseline": "6309841a1ce770409708a67a9ba5c26c537d2937",
"packages": [
"commonlibsse-ng",
"gluino",
"script-extender-common",
"skse"
]
}
]
} }

View File

@ -10,15 +10,10 @@
"plugin": { "plugin": {
"description": "Automatic use of crafting supplies for Enderal SE 2.0.12+.", "description": "Automatic use of crafting supplies for Enderal SE 2.0.12+.",
"dependencies": [ "dependencies": [
"fast-cpp-csv-parser",
"rsm-binary-io",
"simpleini", "simpleini",
"spdlog", "spdlog",
"xbyak",
"rapidcsv",
"directxmath",
"directxtk", "directxtk",
"simpleini" "rapidcsv"
] ]
} }
}, },