From c65fc3794c2f2cde9cb3e377505bc86f7d8bb0f1 Mon Sep 17 00:00:00 2001
From: Eddoursul <git@eddoursul.win>
Date: Sat, 20 Jan 2024 03:20:09 +0100
Subject: [PATCH] Compatibility with 1.6.1170

---
 SKSE/Plugins/.gitignore |   1 +
 src/CMakeLists.txt      |  21 ++++++++-
 src/src/PCH.h           | 100 ----------------------------------------
 src/vcpkg.json          |   9 +++-
 4 files changed, 29 insertions(+), 102 deletions(-)
 create mode 100644 SKSE/Plugins/.gitignore

diff --git a/SKSE/Plugins/.gitignore b/SKSE/Plugins/.gitignore
new file mode 100644
index 0000000..cd663eb
--- /dev/null
+++ b/SKSE/Plugins/.gitignore
@@ -0,0 +1 @@
+EnderalSEEasyCrafting.dll
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index babbe89..abe4d68 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -37,7 +37,26 @@ source_group(
 ########################################################################################################################
 ## Configure target DLL
 ########################################################################################################################
-find_package(CommonLibSSE CONFIG REQUIRED)
+
+# find_package(CommonLibSSE CONFIG REQUIRED)
+
+include(FetchContent)
+FetchContent_Declare(
+    CommonLibNG
+    GIT_REPOSITORY https://github.com/alandtse/CommonLibVR
+    GIT_TAG a62791cbcb68bd796b303ae7d1a25829d49c6b12
+)
+
+set(ENABLE_SKYRIM_SE ON CACHE BOOL " " FORCE)
+set(ENABLE_SKYRIM_AE ON CACHE BOOL " " FORCE)
+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)
+
+get_target_property(commonlib_src_dir CommonLibSSE SOURCE_DIR)
+include(${commonlib_src_dir}/cmake/CommonLibSSE.cmake) 
 
 add_commonlibsse_plugin(${PROJECT_NAME} SOURCES ${headers} ${sources})
 add_library("${PROJECT_NAME}::${PROJECT_NAME}" ALIAS "${PROJECT_NAME}")
diff --git a/src/src/PCH.h b/src/src/PCH.h
index 165cd7e..c5cf8ef 100644
--- a/src/src/PCH.h
+++ b/src/src/PCH.h
@@ -1,107 +1,11 @@
 #pragma once
 
-#include <cassert>
-#include <cctype>
-#include <cerrno>
-#include <cfenv>
-#include <cfloat>
-#include <cinttypes>
-#include <climits>
-#include <clocale>
-#include <cmath>
-#include <csetjmp>
-#include <csignal>
-#include <cstdarg>
-#include <cstddef>
-#include <cstdint>
-#include <cstdlib>
-#include <cstdio>
-#include <cstring>
-#include <ctime>
-#include <cuchar>
-#include <cwchar>
-#include <cwctype>
-
-#include <algorithm>
-#include <any>
-#include <array>
-#include <atomic>
-#include <barrier>
-#include <bit>
-#include <bitset>
-#include <charconv>
-#include <chrono>
-#include <compare>
-#include <complex>
-#include <concepts>
-#include <condition_variable>
-#include <deque>
-#include <exception>
-#include <execution>
-#include <filesystem>
-#include <format>
-#include <forward_list>
-#include <fstream>
-#include <functional>
-#include <future>
-#include <initializer_list>
-#include <iomanip>
-#include <iosfwd>
-#include <ios>
-#include <iostream>
-#include <istream>
-#include <iterator>
-#include <latch>
-#include <limits>
-#include <locale>
-#include <map>
-#include <memory>
-#include <memory_resource>
-#include <mutex>
-#include <new>
-#include <numbers>
-#include <numeric>
-#include <optional>
-#include <ostream>
-#include <queue>
-#include <random>
-#include <ranges>
-#include <regex>
-#include <ratio>
-#include <scoped_allocator>
-#include <semaphore>
-#include <set>
-#include <shared_mutex>
-#include <source_location>
-#include <span>
-#include <sstream>
-#include <stack>
-#include <stdexcept>
-#include <streambuf>
-#include <string>
-#include <string_view>
-#include <syncstream>
-#include <system_error>
-#include <thread>
-#include <tuple>
-#include <typeindex>
-#include <typeinfo>
-#include <type_traits>
-#include <unordered_map>
 #include <unordered_set>
-#include <utility>
-#include <valarray>
-#include <variant>
-#include <vector>
-#include <version>
-
 #include <RE/Skyrim.h>
 #include <SKSE/SKSE.h>
 #include <REL/Relocation.h>
 
 #include <ShlObj_core.h>
-#include <Windows.h>
-#include <Psapi.h>
 #undef cdecl // Workaround for Clang 14 CMake configure error.
 
 #include <spdlog/sinks/basic_file_sink.h>
@@ -114,7 +18,3 @@ using namespace std::literals;
 using namespace REL::literals;
 
 namespace logger = SKSE::log;
-
-namespace util {
-    using SKSE::stl::report_and_fail;
-}
diff --git a/src/vcpkg.json b/src/vcpkg.json
index ef3e95a..f2115cc 100644
--- a/src/vcpkg.json
+++ b/src/vcpkg.json
@@ -10,7 +10,14 @@
     "plugin": {
       "description": "Automatic use of crafting supplies for Enderal SE 2.0.12+.",
       "dependencies": [
-        "commonlibsse-ng",
+        "fast-cpp-csv-parser",
+        "rsm-binary-io",
+        "simpleini",
+        "spdlog",
+        "xbyak",
+        "rapidcsv",
+        "directxmath",
+        "directxtk",
         "simpleini"
       ]
     }