v2.0.0: Borderlands 1 support

.cruft.json

@@ -1,6 +1,6 @@
 {
   "template": "[email protected]:bl-sdk/common_dotfiles.git",
-  "commit": "cee5c9dbf5b95f57bb636e5138171aa6a4964cf1",
+  "commit": "597ec422d3b5692927f325b9b5c2ae42288e8cc5",
   "checkout": null,
   "context": {
     "cookiecutter": {
@@ -16,7 +16,7 @@
       "include_cpp": true,
       "include_py": false,
       "_template": "[email protected]:bl-sdk/common_dotfiles.git",
-      "_commit": "cee5c9dbf5b95f57bb636e5138171aa6a4964cf1"
+      "_commit": "597ec422d3b5692927f325b9b5c2ae42288e8cc5"
     }
   },
   "directory": null

.github/workflows/build.yml

@@ -14,10 +14,10 @@ jobs:
       fail-fast: false
       matrix:
         preset: [
-          "clang-ue3-x86-release",
-          "clang-ue4-x64-release",
-          "msvc-ue3-x86-release",
-          "msvc-ue4-x64-release",
+          "clang-willow-release",
+          "clang-oak-release",
+          "msvc-willow-release",
+          "msvc-oak-release",
         ]
 
     steps:
@@ -29,7 +29,7 @@ jobs:
       if: startswith(matrix.preset, 'msvc')
       uses: TheMrMilchmann/setup-msvc-dev@v3
       with:
-        arch: ${{ fromJSON('["x86", "x64"]')[contains(matrix.preset, 'x64')] }}
+        arch: ${{ fromJSON('["x86", "x64"]')[contains(matrix.preset, 'oak')] }}
 
     - name: Setup CMake and Ninja
       uses: lukka/get-cmake@latest
@@ -52,17 +52,17 @@ jobs:
       fail-fast: false
       matrix:
         toolchain:
-          - preset: clang-cross-ue3-x86-release
+          - preset: clang-cross-willow-release
             container: clang-cross
-          - preset: clang-cross-ue4-x64-release
+          - preset: clang-cross-oak-release
             container: clang-cross
-          - preset: llvm-mingw-ue3-x86-release
+          - preset: llvm-mingw-willow-release
             container: llvm-mingw
-          - preset: llvm-mingw-ue4-x64-release
+          - preset: llvm-mingw-oak-release
             container: llvm-mingw
-          - preset: mingw-ue3-x86-release
+          - preset: mingw-willow-release
             container: mingw
-          - preset: mingw-ue4-x64-release
+          - preset: mingw-oak-release
             container: mingw
 
     steps:
@@ -93,7 +93,6 @@ jobs:
             cmake . --preset ${{ matrix.toolchain.preset }} -G Ninja
             cmake --build out/build/${{ matrix.toolchain.preset }}
 
-
 # ==============================================================================
 
   clang-tidy:
@@ -103,8 +102,8 @@ jobs:
       fail-fast: false
       matrix:
         preset: [
-          "clang-ue3-x86-release",
-          "clang-ue4-x64-release",
+          "clang-willow-release",
+          "clang-oak-release",
         ]
 
     steps:

.gitignore

@@ -7,10 +7,6 @@
 .gdbinit
 out
 
-# User scripts with templates
-postbuild
-postbuild.bat
-
 # CMake (from https://github.com/github/gitignore/blob/main/CMake.gitignore)
 CMakeLists.txt.user
 CMakeCache.txt

.gitmodules

@@ -1,9 +1,6 @@
 [submodule "libs/minhook"]
 	path = libs/minhook
 	url = https://github.com/TsudaKageyu/minhook.git
-[submodule "libs/fmt"]
-	path = libs/fmt
-	url = https://github.com/fmtlib/fmt.git
 [submodule "libs/tomlplusplus"]
 	path = libs/tomlplusplus
 	url = https://github.com/marzer/tomlplusplus.git

CMakeLists.txt

@@ -1,9 +1,13 @@
 cmake_minimum_required(VERSION 3.25)
 
-project(unrealsdk VERSION 1.8.0)
+project(unrealsdk VERSION 2.0.0)
+
+set(UNREALSDK_FLAVOUR "" CACHE STRING "Which \"flavour\" of the SDK to build.")
+set_property(CACHE UNREALSDK_FLAVOUR PROPERTY STRINGS "WILLOW" "OAK")
+if (NOT UNREALSDK_FLAVOUR MATCHES "(WILLOW|OAK)")
+  message(FATAL_ERROR "Got invalid sdk flavour '${UNREALSDK_FLAVOUR}'")
+endif()
 
-set(UNREALSDK_UE_VERSION "UE4" CACHE STRING "The unreal engine version to build the SDK for. One of 'UE3' or 'UE4'.")
-set(UNREALSDK_ARCH "x64" CACHE STRING "The architecture to build the sdk for. One of 'x86' or 'x64'.")
 set(UNREALSDK_SHARED False CACHE BOOL "If set, compiles as a shared library instead of as an object.")
 
 add_library(_unrealsdk_interface INTERFACE)
@@ -32,17 +36,6 @@ if(MINGW)
     target_compile_options(_unrealsdk_interface INTERFACE -Werror)
 endif()
 
-set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
-try_compile(supports_format
-    SOURCE_FROM_CONTENT test.cpp "  \
-    #include <version>\n            \
-    #ifndef __cpp_lib_format\n      \
-        #error\n                    \
-    #endif                          \
-    "
-    CXX_STANDARD 20
-)
-
 set(CONFIGURE_FILES_DIR "${CMAKE_CURRENT_BINARY_DIR}/configure")
 
 configure_file(
@@ -56,29 +49,12 @@ include(common_cmake/git_watcher.cmake)
 
 add_subdirectory(libs/minhook)
 add_subdirectory(libs/tomlplusplus)
-if(NOT supports_format)
-    add_subdirectory(libs/fmt)
-endif()
-
-# If using the clang windows cross compilation toolchain
-if((NOT CMAKE_HOST_WIN32)
-    AND (CMAKE_SYSTEM_NAME STREQUAL "Windows")
-    AND (CMAKE_CXX_COMPILER_ID STREQUAL "Clang"))
-    # Disable some intrinsics - MSVC implicitly defines intrinsics, but Clang does not, so we get
-    # a linking error otherwise
-    target_compile_definitions(minhook PRIVATE MINHOOK_DISABLE_INTRINSICS)
-    target_compile_definitions(_unrealsdk_interface INTERFACE TOML_ENABLE_SIMD=0)
-endif()
 
 target_include_directories(_unrealsdk_interface INTERFACE "src" ${CONFIGURE_FILES_DIR})
 target_link_libraries(_unrealsdk_interface INTERFACE minhook tomlplusplus::tomlplusplus)
-if(NOT ${supports_format})
-    target_link_libraries(_unrealsdk_interface INTERFACE fmt)
-endif()
 
 target_compile_definitions(_unrealsdk_interface INTERFACE
-    "${UNREALSDK_UE_VERSION}"
-    "ARCH_$<UPPER_CASE:${UNREALSDK_ARCH}>"
+    "UNREALSDK_FLAVOUR=UNREALSDK_FLAVOUR_${UNREALSDK_FLAVOUR}"
     "$<$<BOOL:${UNREALSDK_SHARED}>:UNREALSDK_SHARED>"
 )
 
@@ -123,25 +99,4 @@ else()
     # Unconditionally add the exporting flag
     # Add it privately, so it doesn't appear in anything linking against this
     target_compile_definitions(unrealsdk PRIVATE "UNREALSDK_EXPORTING")
-
-    # Postbuild
-    if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
-        set(POSTBUILD_SCRIPT "postbuild")
-        if(CMAKE_HOST_WIN32)
-            set(POSTBUILD_SCRIPT "${POSTBUILD_SCRIPT}.bat")
-        endif()
-        if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${POSTBUILD_SCRIPT}")
-            add_custom_command(
-                TARGET unrealsdk
-                POST_BUILD
-                COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/${POSTBUILD_SCRIPT}"
-                ARGS
-                    "$<SHELL_PATH:$<TARGET_FILE:unrealsdk>>"
-                    "${UNREALSDK_UE_VERSION}"
-                    "${UNREALSDK_ARCH}"
-                    "$<IF:$<CONFIG:DEBUG>,DEBUG,RELEASE>"
-                WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-            )
-        endif()
-    endif()
 endif()