Update dependencies

Author: powerof3

.github/workflows/main.yml

@@ -30,4 +30,4 @@ jobs:
       FOMOD_AE_DESCR: 'Select this if you are using Skyrim Anniversary Edition v1.6.1130 or higher (latest update).'
       FOMOD_AE_MIN_GAME_VERSION: '1.6.1130.0'
       PUBLISH_ARCHIVE_TYPE: '7z'
-      VCPKG_COMMIT_ID: '41626fd77bf42f29e8f7e43dc1f2f05780588cde'
+      VCPKG_COMMIT_ID: '53b9816594558d0b78529ecce2bf4a97d0a0729e'

CMakePresets.json

@@ -11,7 +11,8 @@
       "hidden": true,
       "cacheVariables": {
         "CMAKE_CONFIGURATION_TYPES": "Debug;Release",
-        "CMAKE_CXX_FLAGS": "/EHsc /MP /W4 /external:anglebrackets /external:W0 $penv{CXXFLAGS}"
+        "CMAKE_CXX_FLAGS": "/EHsc /MP /W4 /external:W0 $penv{CXXFLAGS}",
+        "CMAKE_CXX_FLAGS_RELEASE": "/O2 /DNDEBUG"
       },
       "errors": {
         "deprecated": true

cmake/ports/clib-util/portfile.cmake

@@ -2,8 +2,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO powerof3/CLibUtil
-    REF a491e2f7919211eac6d32dd2814b7908134ec1b2
-    SHA512 e6b830a061d7fc99115ee7d28de0165b8c6281006df6d053342e6b5b85606a46a846ebb30f3e4598aa976c25cfe7a9dffd1c4eb72942829d1a4615d81e62cf3c
+    REF a7a877a0551592cba58f7fc36d94d1a6d1a14db9
+    SHA512 cfebe14121c41f2400bc85deeb881d631ecf0a9216bca7e963b5c7ef5de46d4048752dae1552915fb9927d25f71d430c6d2f92be195a8130ec15a5457491d473
     HEAD_REF master
 )
 

cmake/ports/clib-util/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "clib-util",
-  "version-string": "1.4.0",
+  "version-string": "1.4.4",
   "port-version": 1,
   "description": "",
   "homepage": "https://github.com/powerof3/CLibUtil"

extern/CommonLibSSE

@@ -17,7 +17,7 @@ struct ConditionFilters
 	}
 
 	// members
-	std::string            conditionID{}; // path|condition1,condition2
+	std::string            conditionID{};  // path|condition1,condition2
 	std::vector<FormIDStr> NOT{};
 	std::vector<FormIDStr> MATCH{};
 };

extern/CommonLibVR

@@ -4,7 +4,7 @@
 
 namespace FormSwap
 {
-	class Manager : public ISingleton<Manager>
+	class Manager : public REX::Singleton<Manager>
 	{
 	public:
 		void LoadFormsOnce();

src/ConditionalData.h

@@ -6,6 +6,7 @@
 #include <ranges>
 
 #include "RE/Skyrim.h"
+#include "REX/REX/Singleton.h"
 #include "SKSE/SKSE.h"
 
 #include <MergeMapperPluginAPI.h>
@@ -20,7 +21,7 @@
 #include <CLibUtil/rng.hpp>
 #include <CLibUtil/string.hpp>
 #include <ClibUtil/simpleINI.hpp>
-#include <ClibUtil/singleton.hpp>
+
 #include <ClibUtil/editorID.hpp>
 
 #define DLLEXPORT __declspec(dllexport)
@@ -29,7 +30,6 @@ namespace logger = SKSE::log;
 using namespace std::literals;
 
 using namespace clib_util;
-using namespace clib_util::singleton;
 using SeedRNG = clib_util::RNG;
 
 // for visting variants

src/Manager.h

@@ -17,9 +17,8 @@ struct Chance
 
 	// members
 	CHANCE_TYPE   chanceType{ CHANCE_TYPE::kRefHash };
-	float chanceValue{ 100.0f };
+	float         chanceValue{ 100.0f };
 	std::uint64_t seed{ 0 };
-
 };
 
 struct BOS_RNG
@@ -40,5 +39,5 @@ struct BOS_RNG
 
 	// members
 	CHANCE_TYPE   type;
-	std::uint64_t seed { 0 };
+	std::uint64_t seed{ 0 };
 };