diff --git a/CMakePresets.json b/CMakePresets.json index 325c012..5186dc9 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -10,8 +10,8 @@ "name": "base", "hidden": true, "cacheVariables": { - "CMAKE_CXX_FLAGS": "$env{COMMONLIBSSE_COMPILER} $env{COMMONLIBSSE_PLATFORM} $env{COMMONLIBSSE_TEXT} $penv{CXXFLAGS}", - "CMAKE_SHARED_LINKER_FLAGS": "$env{COMMONLIBSSE_LINKER} $penv{SHARED_LINKER_FLAGS}", + "CMAKE_CXX_FLAGS": "$penv{CXXFLAGS} $env{COMMONLIBSSE_COMPILER} $env{COMMONLIBSSE_PLATFORM} $env{COMMONLIBSSE_TEXT}", + "CMAKE_SHARED_LINKER_FLAGS": "$penv{SHARED_LINKER_FLAGS} $env{COMMONLIBSSE_LINKER}", "CMAKE_MSVC_RUNTIME_LIBRARY": "MultiThreaded$<$:Debug>DLL" } }, @@ -54,7 +54,7 @@ "generator": "Ninja", "cmakeExecutable": "C:/Program Files/CMake/bin/cmake.exe", "environment": { - "COMMONLIBSSE_COMPILER": "/cgthreads8 /diagnostics:caret /EHsc /fp:contract /fp:except- /guard:cf- /MP /permissive- /sdl /W4 /Zc:__cplusplus /Zc:enumTypes /Zc:lambda /Zc:preprocessor /Zc:referenceBinding /Zc:rvalueCast /Zc:templateScope /Zc:ternary", + "COMMONLIBSSE_COMPILER": "/cgthreads8 /diagnostics:caret /EHsc /fp:contract /fp:except- /guard:cf- /MP /sdl /W4 /Zc:__cplusplus /Zc:enumTypes /Zc:preprocessor /Zc:templateScope", "COMMONLIBSSE_LINKER": "/CGTHREADS:8 /MACHINE:x64 /DEBUG:FULL" }, "cacheVariables": { diff --git a/src/Main.cpp b/src/Main.cpp index 3762dcf..22735ac 100644 --- a/src/Main.cpp +++ b/src/Main.cpp @@ -16,9 +16,10 @@ SKSEPluginLoad(const SKSE::LoadInterface* skse) InitializeLogging(); const auto plugin{ SKSE::PluginDeclaration::GetSingleton() }; + const auto name{ plugin->GetName() }; const auto version{ plugin->GetVersion() }; - logger::info("{} {} is loading...", plugin->GetName(), version); + logger::info("{} {} is loading...", name, version); Init(skse); @@ -26,7 +27,7 @@ SKSEPluginLoad(const SKSE::LoadInterface* skse) return false; } - logger::info("{} has finished loading.", plugin->GetName()); + logger::info("{} has finished loading.", name); logger::info(""); return true; diff --git a/vcpkg.json b/vcpkg.json index 1cee5fb..51bb5a5 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -2,20 +2,13 @@ "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", "name": "plugin-name", "version-semver": "0.0.1", + "builtin-baseline": "28b1cf627c0570b3e094192df2fce31a3a2bc1d3", "dependencies": [ "fmt", "spdlog", "rapidcsv", "simpleini", - "directxtk", - "openvr" + "directxtk" ], - "license": "GPL-3.0-or-later", - "vcpkg-configuration": { - "default-registry": { - "kind": "git", - "repository": "https://github.com/microsoft/vcpkg", - "baseline": "c591ac6466a55ef0a05a3d56bb1489ca36e50102" - } - } + "license": "GPL-3.0-or-later" }