Merge branch 'shad0wshayd3-FO4:master' into master

.github/workflows/main_ci.yml

@@ -1,46 +1,52 @@
-name: build
+name: Main CI
 
 on:
   push:
     branches: [ master ]
+    paths:
+      - '.github/workflows/main_ci.yml'
+      - 'cmake/**'
+      - 'include/**'
+      - 'src/**'
+      - 'CMakeLists.txt'
+      - 'CMakePresets.json'
+      - 'vcpkg.json'
   pull_request:
     branches: [ master ]
   workflow_dispatch:
 
 env:
+  BUILD_TYPE: Debug
   VCPKG_DEFAULT_BINARY_CACHE: ${{ github.workspace }}/vcpkg-cache
 
 jobs:
   windows:
-    runs-on: windows-2022
-    strategy:
-      fail-fast: false
-      matrix:
-        build-type:
-          - debug
-          - release
-        compiler:
-          - msvc
+    runs-on: windows-latest
     steps:
-      - name: Checkout
-        uses: actions/checkout@v2
+      - uses: actions/checkout@v2
         with:
           path: main
-
-      - name: Setup cmake
-        uses: lukka/get-cmake@latest
-
-      - name: Setup msvc
-        uses: ilammy/[email protected]
 
       - name: Setup vcpkg
-        uses: friendlyanon/setup-vcpkg@v1
+        run: |
+          mkdir -p ${{ env.VCPKG_DEFAULT_BINARY_CACHE }}
+          cd $env:VCPKG_INSTALLATION_ROOT
+          ./bootstrap-vcpkg.bat
+          ./vcpkg --version > ${{ github.workspace }}/vcpkg-version.txt
+
+      - name: Cache vcpkg
+        uses: actions/cache@v2
+        id: vcpkg-cache
+        env:
+          cache-name: vcpkg-cache
         with:
-          committish: 943c5ef1c8f6b5e6ced092b242c8299caae2ff01
+          path: ${{ env.VCPKG_DEFAULT_BINARY_CACHE }}/*
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('main/**/vcpkg.json', 'vcpkg-version.txt') }}
+
+      - name: Configure CMake
+        working-directory: ${{ github.workspace }}/main
+        run: cmake --preset vs2022-windows-vcpkg
 
       - name: Build
-        uses: lukka/[email protected]
-        with:
-          cmakeListsTxtPath: ${{ github.workspace }}/main/CMakeLists.txt
-          configurePreset: build-${{ matrix.build-type }}-${{ matrix.compiler }}-vcpkg
-          buildPreset: ${{ matrix.build-type }}-${{ matrix.compiler }}-vcpkg
+        working-directory: ${{ github.workspace }}/main
+        run: cmake --build build --config ${{ env.BUILD_TYPE }}

.github/workflows/main_ci_xmake.yml

@@ -0,0 +1,38 @@
+name: Main CI [XMake]
+
+on:
+  push:
+    branches: [ master ]
+    paths:
+      - ".github/workflows/main_ci_xmake.yml"
+      - "include/**"
+      - "src/**"
+      - "xmake.lua"
+      - "xmake-extra.lua"
+  pull_request:
+    branches: [ master ]
+  workflow_dispatch:
+
+jobs:
+  build-xmake:
+    runs-on: windows-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        mode:
+          - debug
+          - release
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup XMake
+        uses: xmake-io/github-action-setup-xmake@v1
+        with:
+          xmake-version: "latest"
+
+      - name: Configure
+        run: xmake config -y --mode=${{ matrix.mode }} --vs_toolset=14.41
+
+      - name: Build
+        run: xmake build -y -vD

.github/workflows/maintenance.yml

@@ -1,24 +1,24 @@
 name: maintenance
 
-on: [push]
+on: push
 
 jobs:
   maintenance:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+    - uses: actions/checkout@v2
 
-      - uses: actions/setup-python@v2
-        with:
-          python-version: '3.9'
+    - uses: actions/setup-python@v2
+      with:
+        python-version: '3.9'
 
-      - name: Run clang-format
-        run: find -type f \( -name *.h -o -name *.cpp \) | xargs clang-format-14 -style=file -i
+    - name: Run clang-format
+      run: find -type f \( -name *.h -o -name *.cpp \) | xargs clang-format-14 -style=file -i
 
-      - name: Glob files
-        run: python ${{ github.workspace }}/CommonLibF4/scripts/glob_files.py
+    - name: Glob files
+      run: python ${{ github.workspace }}/CommonLibF4/scripts/cmake_generate.py
 
-      - uses: stefanzweifel/git-auto-commit-action@v4
-        with:
-          commit_message: maintenance
+    - uses: stefanzweifel/git-auto-commit-action@v4
+      with:
+        commit_message: maintenance

CMakePresets.json

@@ -1,102 +1,72 @@
 {
   "configurePresets": [
     {
-      "name": "common",
-      "hidden": true,
+      "binaryDir": "${sourceDir}/build",
       "cacheVariables": {
-        "CMAKE_CXX_FLAGS": "$env{PROJECT_PLATFORM_FLAGS} $env{PROJECT_TEXT_FLAGS} $env{PROJECT_COMPILER_FLAGS} $penv{CXX_FLAGS}",
-        "CMAKE_MSVC_RUNTIME_LIBRARY": "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL"
-      },
-      "environment": {
-        "PROJECT_ARCHITECTURE": "x64",
-        "PROJECT_PLATFORM": "windows",
-        "PROJECT_TEXT_FLAGS": "-DUNICODE -D_UNICODE"
+        "CMAKE_BUILD_TYPE": {
+          "type": "STRING",
+          "value": "Debug"
+        }
       },
       "errors": {
         "deprecated": true
       },
+      "hidden": true,
+      "name": "cmake-dev",
       "warnings": {
         "deprecated": true,
         "dev": true
-      },
-      "vendor": {
-        "microsoft.com/VisualStudioSettings/CMake/1.0": {
-          "intelliSenseMode": "$env{PROJECT_PLATFORM}-$env{PROJECT_COMPILER}-$env{PROJECT_ARCHITECTURE}",
-          "enableMicrosoftCodeAnalysis": true,
-          "enableClangTidyCodeAnalysis": true
-        }
       }
     },
     {
-      "name": "buildtype-debug",
-      "hidden": true,
       "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "Debug"
-      }
-    },
-    {
-      "name": "buildtype-release",
+        "CMAKE_TOOLCHAIN_FILE": {
+          "type": "STRING",
+          "value": "$env{VCPKG_INSTALLATION_ROOT}/scripts/buildsystems/vcpkg.cmake"
+        }
+      },
       "hidden": true,
-      "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "RelWithDebInfo"
-      }
+      "name": "vcpkg"
     },
     {
-      "name": "packaging-vcpkg",
-      "hidden": true,
-      "toolchainFile": "$env{VCPKG_INSTALLATION_ROOT}/scripts/buildsystems/vcpkg.cmake",
       "cacheVariables": {
-        "VCPKG_HOST_TRIPLET": "$env{PROJECT_ARCHITECTURE}-$env{PROJECT_PLATFORM}-static-md",
-        "VCPKG_TARGET_TRIPLET": "$env{PROJECT_ARCHITECTURE}-$env{PROJECT_PLATFORM}-static-md"
-      }
-    },
-    {
-      "name": "generator-ninja",
-      "hidden": true,
-      "generator": "Ninja"
-    },
-    {
-      "name": "compiler-msvc",
+        "CMAKE_MSVC_RUNTIME_LIBRARY": {
+          "type": "STRING",
+          "value": "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL"
+        },
+        "VCPKG_TARGET_TRIPLET": {
+          "type": "STRING",
+          "value": "x64-windows-static-md"
+        }
+      },
       "hidden": true,
-      "environment": {
-        "PROJECT_COMPILER_FLAGS": "/EHsc /MP /W4 /WX /external:W0 /bigobj",
-        "PROJECT_COMPILER": "msvc"
-      }
+      "name": "windows"
     },
     {
-      "name": "build-debug-msvc-vcpkg",
+      "cacheVariables": {
+        "CMAKE_CXX_FLAGS": "/EHsc /MP /W4 /WX /external:anglebrackets /external:W0"
+      },
+      "generator": "Visual Studio 16 2019",
       "inherits": [
-        "common",
-        "buildtype-debug",
-        "packaging-vcpkg",
-        "generator-ninja",
-        "compiler-msvc"
+        "cmake-dev",
+        "vcpkg",
+        "windows"
       ],
-      "binaryDir": "${sourceDir}/build/debug-msvc-vcpkg"
+      "name": "vs2019-windows-vcpkg"
     },
     {
-      "name": "build-release-msvc-vcpkg",
+      "cacheVariables": {
+        "CMAKE_CXX_FLAGS": "/EHsc /MP /W4 /WX /external:W0"
+      },
+      "generator": "Visual Studio 17 2022",
       "inherits": [
-        "common",
-        "buildtype-release",
-        "packaging-vcpkg",
-        "generator-ninja",
-        "compiler-msvc"
+        "cmake-dev",
+        "vcpkg",
+        "windows"
       ],
-      "binaryDir": "${sourceDir}/build/release-msvc-vcpkg"
-    }
-  ],
-  "buildPresets": [
-    {
-      "name": "debug-msvc-vcpkg",
-      "configurePreset": "build-debug-msvc-vcpkg",
-      "displayName": "Debug (MSVC, Vcpkg)"
-    },
-    {
-      "name": "release-msvc-vcpkg",
-      "configurePreset": "build-release-msvc-vcpkg",
-      "displayName": "Release (MSVC, Vcpkg)"
+      "name": "vs2022-windows-vcpkg",
+      "toolset": "v143"
     }
   ],
-  "version": 3
+  "version": 2
 }

CommonLibF4/CMakeLists.txt

@@ -1,6 +1,9 @@
 cmake_minimum_required(VERSION 3.21)
 
 option(F4SE_SUPPORT_XBYAK "Enables trampoline support for Xbyak." OFF)
+option(REX_OPTION_INI "Enables ini config support for REX." OFF)
+option(REX_OPTION_JSON "Enables json config support for REX." OFF)
+option(REX_OPTION_TOML "Enables toml config support for REX." OFF)
 
 project(
 	CommonLibF4
@@ -39,6 +42,9 @@ target_compile_definitions(
 		WINVER=0x0601	# windows 7, minimum supported version by fallout 4
 		_WIN32_WINNT=0x0601
 		"$<$<BOOL:${F4SE_SUPPORT_XBYAK}>:F4SE_SUPPORT_XBYAK=1>"
+		"$<$<BOOL:${REX_OPTION_INI}>:REX_OPTION_INI=1>"
+		"$<$<BOOL:${REX_OPTION_JSON}>:REX_OPTION_JSON=1>"
+		"$<$<BOOL:${REX_OPTION_TOML}>:REX_OPTION_TOML=1>"
 )
 
 target_compile_features(

CommonLibF4/cmake/sourcelist.cmake

@@ -385,6 +385,13 @@ set(SOURCES
 	include/REX/PS4.h
 	include/REX/PS4/SCEPAD.h
 	include/REX/REX.h
+	include/REX/REX/Enum.h
+	include/REX/REX/EnumSet.h
+	include/REX/REX/INI.h
+	include/REX/REX/JSON.h
+	include/REX/REX/Setting.h
+	include/REX/REX/Singleton.h
+	include/REX/REX/TOML.h
 	include/REX/W32.h
 	include/REX/W32/ADVAPI32.h
 	include/REX/W32/BASE.h
@@ -461,5 +468,6 @@ set(SOURCES
 	src/REL/Module.cpp
 	src/REL/Relocation.cpp
 	src/REL/Version.cpp
+	src/REX/REX.cpp
 	src/REX/W32.cpp
 )

CommonLibF4/include/F4SE/Impl/PCH.h

@@ -14,6 +14,7 @@
 #include <ctime>
 #include <execution>
 #include <filesystem>
+#include <fstream>
 #include <functional>
 #include <initializer_list>
 #include <intrin.h>
@@ -41,15 +42,16 @@ static_assert(
 	std::is_integral_v<std::time_t> && sizeof(std::time_t) == sizeof(std::size_t),
 	"wrap std::time_t instead");
 
+#include "REX/REX/Enum.h"
+#include "REX/REX/EnumSet.h"
+#include "REX/W32/KERNEL32.h"
+#include "REX/W32/USER32.h"
+
 #pragma warning(push, 0)
 #include <mmio/mmio.hpp>
 #include <spdlog/spdlog.h>
 #pragma warning(pop)
 
-#include "REX/REX.h"
-#include "REX/W32/KERNEL32.h"
-#include "REX/W32/USER32.h"
-
 namespace F4SE
 {
 	using namespace std::literals;

CommonLibF4/include/RE/msvc/memory.h

@@ -270,7 +270,7 @@ namespace RE::msvc
 
 		// 3c
 		unique_ptr(pointer a_ptr, const deleter_type& a_dtor) noexcept  //
-			requires((std::is_lvalue_reference<deleter_type> &&
+			requires((std::is_lvalue_reference_v<deleter_type> &&
 					  std::is_const_v<deleter_type>)) :
 			super(a_ptr, a_dtor)
 		{}
@@ -484,7 +484,7 @@ namespace RE::msvc
 		// 3c
 		template <class U>
 		unique_ptr(U a_ptr, const deleter_type& a_dtor) noexcept  //
-			requires((std::is_lvalue_reference<deleter_type> &&
+			requires((std::is_lvalue_reference_v<deleter_type> &&
 					  std::is_const_v<deleter_type> &&
 					  detail::unique_ptr_array_convertible<U, unique_ptr>)) :
 			super(a_ptr, a_dtor)