diff --git a/CMakeLists.txt b/CMakeLists.txt index 6b9e007..638cc74 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ option(BUILD_AS_SHARED "Build as dll skse plugin else build as static lib" ON) # Version set(LIB_MAJOR_VERSION 1) -set(LIB_MINOR_VERSION 0) +set(LIB_MINOR_VERSION 1) set(API_MAJOR_VERSION 1) set(API_MINOR_VERSION 0) diff --git a/WinBuild.ps1 b/WinBuild.ps1 index 4c71616..f6c264f 100644 --- a/WinBuild.ps1 +++ b/WinBuild.ps1 @@ -9,5 +9,5 @@ if (!$Work) { $buildDir = mkdir -Force build Set-Location $buildDir -cmake .. -DVCPKG_ROOT="F:\vcpkg" +cmake .. -DVCPKG_ROOT="F:\vcpkg" -DOUTPUT_PATH="F:/Steam/steamapps/common/Skyrim Special Edition_NirnLabUIPlatform" cmake --build . --config Release --parallel 4 diff --git a/WinBuildLocal.ps1 b/WinBuildLocal.ps1 new file mode 100644 index 0000000..227e830 --- /dev/null +++ b/WinBuildLocal.ps1 @@ -0,0 +1,13 @@ +param($Work) + +# restart PowerShell with -noexit, the same script, and 1 +if (!$Work) { + powershell -noexit -file $MyInvocation.MyCommand.Path 1 + return +} + +$buildDir = mkdir -Force build +Set-Location $buildDir + +cmake .. -DVCPKG_ROOT="F:\vcpkg" -UOUTPUT_PATH +cmake --build . --config Release --parallel 4 diff --git a/WinInit.ps1 b/WinInit.ps1 index 907b5f7..f698ac7 100644 --- a/WinInit.ps1 +++ b/WinInit.ps1 @@ -9,4 +9,4 @@ if (!$Work) { $buildDir = mkdir -Force build Set-Location $buildDir -cmake .. -DVCPKG_ROOT="F:\vcpkg" +cmake .. -DVCPKG_ROOT="F:\vcpkg" -DOUTPUT_PATH="F:/Steam/steamapps/common/Skyrim Special Edition_NirnLabUIPlatform" diff --git a/src/UIPlatform/CEF/NirnLabCefApp.cpp b/src/UIPlatform/CEF/NirnLabCefApp.cpp index 3c13a82..986cb9f 100644 --- a/src/UIPlatform/CEF/NirnLabCefApp.cpp +++ b/src/UIPlatform/CEF/NirnLabCefApp.cpp @@ -24,6 +24,10 @@ namespace NL::CEF // requiring the muted attribute or user interaction command_line->AppendSwitchWithValue("autoplay-policy", "no-user-gesture-required"); + // Allow local files + command_line->AppendSwitch("allow-file-access-from-files"); + command_line->AppendSwitch("allow-insecure-localhost"); + // https://chromium.googlesource.com/chromium/src/+/main/docs/process_model_and_site_isolation.md command_line->AppendSwitch("disable-site-isolation-for-policy"); command_line->AppendSwitch("disable-site-isolation-trials"); diff --git a/src/UIPlatform/NirnLabUIPlatformAPI/Version.h b/src/UIPlatform/NirnLabUIPlatformAPI/Version.h index 2c6c4ca..29306f3 100644 --- a/src/UIPlatform/NirnLabUIPlatformAPI/Version.h +++ b/src/UIPlatform/NirnLabUIPlatformAPI/Version.h @@ -5,11 +5,11 @@ namespace NL::UI::LibVersion { inline constexpr std::uint32_t MAJOR = 1; - inline constexpr std::uint32_t MINOR = 0; + inline constexpr std::uint32_t MINOR = 1; inline constexpr auto PROJECT_NAME = "NirnLabUIPlatform"; inline constexpr auto MAJOR_MULT = 100000; - inline constexpr auto AS_STRING = "1.0"; + inline constexpr auto AS_STRING = "1.1"; inline constexpr std::uint32_t AS_INT = (static_cast(MAJOR * MAJOR_MULT + MINOR)); inline std::uint32_t GetMajorVersion(std::uint32_t a_version) diff --git a/src/UIPlatformTest/NirnLabUIPlatformAPI/Version.h b/src/UIPlatformTest/NirnLabUIPlatformAPI/Version.h index 2c6c4ca..29306f3 100644 --- a/src/UIPlatformTest/NirnLabUIPlatformAPI/Version.h +++ b/src/UIPlatformTest/NirnLabUIPlatformAPI/Version.h @@ -5,11 +5,11 @@ namespace NL::UI::LibVersion { inline constexpr std::uint32_t MAJOR = 1; - inline constexpr std::uint32_t MINOR = 0; + inline constexpr std::uint32_t MINOR = 1; inline constexpr auto PROJECT_NAME = "NirnLabUIPlatform"; inline constexpr auto MAJOR_MULT = 100000; - inline constexpr auto AS_STRING = "1.0"; + inline constexpr auto AS_STRING = "1.1"; inline constexpr std::uint32_t AS_INT = (static_cast(MAJOR * MAJOR_MULT + MINOR)); inline std::uint32_t GetMajorVersion(std::uint32_t a_version)