From 5b54b71fd46599b7615fefb83f95468561a7bce7 Mon Sep 17 00:00:00 2001 From: Eddoursul Date: Wed, 10 Jul 2024 02:35:01 +0200 Subject: [PATCH] Updated configuration --- src/CMakeLists.txt | 4 ++-- src/src/Util.h | 4 ++-- src/vcpkg-configuration.json | 17 ++--------------- src/vcpkg.json | 7 +------ 4 files changed, 7 insertions(+), 25 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index eae4c79..d427975 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -44,7 +44,7 @@ include(FetchContent) FetchContent_Declare( CommonLibNG GIT_REPOSITORY https://github.com/alandtse/CommonLibVR - GIT_TAG a62791cbcb68bd796b303ae7d1a25829d49c6b12 + GIT_TAG 735fa6dae8ec72966ee02673dd689c6516d49f71 ) 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) #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) include(${commonlib_src_dir}/cmake/CommonLibSSE.cmake) diff --git a/src/src/Util.h b/src/src/Util.h index 0be08c2..f2122f5 100644 --- a/src/src/Util.h +++ b/src/src/Util.h @@ -282,8 +282,8 @@ inline bool FetchSupplies(RE::TESFurniture* a_furn) if (GetSettings().at("LoadSuppliesEverywhere") || playerRef->GetParentCell()->GetFactionOwner() || playerRef->GetParentCell()->GetActorOwner() || a_furn->As()->HasKeywordString("_00E_Phasmalist_CraftingSummoningWorkbench")) { bAllowFetch = true; } else { - RE::TES::GetSingleton()->ForEachReferenceInRange(playerRef, 4000, [&chestAct, &bAllowFetch](RE::TESObjectREFR& b_ref) { - if (chestAct == b_ref.GetBaseObject()) { + RE::TES::GetSingleton()->ForEachReferenceInRange(playerRef, 4000, [&chestAct, &bAllowFetch](RE::TESObjectREFR* b_ref) { + if (chestAct == b_ref->GetBaseObject()) { bAllowFetch = true; return RE::BSContainer::ForEachResult::kStop; } diff --git a/src/vcpkg-configuration.json b/src/vcpkg-configuration.json index 54bfde8..bff8343 100644 --- a/src/vcpkg-configuration.json +++ b/src/vcpkg-configuration.json @@ -2,19 +2,6 @@ "default-registry": { "kind": "git", "repository": "https://github.com/microsoft/vcpkg.git", - "baseline": "08c4e71048eb54733d9b180a28b9b1d7ce637454" - }, - "registries": [ - { - "kind": "git", - "repository": "https://gitlab.com/colorglass/vcpkg-colorglass", - "baseline": "6309841a1ce770409708a67a9ba5c26c537d2937", - "packages": [ - "commonlibsse-ng", - "gluino", - "script-extender-common", - "skse" - ] - } - ] + "baseline": "f61a294e765b257926ae9e9d85f96468a0af74e7" + } } diff --git a/src/vcpkg.json b/src/vcpkg.json index af5ab91..c95430b 100644 --- a/src/vcpkg.json +++ b/src/vcpkg.json @@ -10,15 +10,10 @@ "plugin": { "description": "Automatic use of crafting supplies for Enderal SE 2.0.12+.", "dependencies": [ - "fast-cpp-csv-parser", - "rsm-binary-io", "simpleini", "spdlog", - "xbyak", - "rapidcsv", - "directxmath", "directxtk", - "simpleini" + "rapidcsv" ] } },