Merge branch 'praydog:master' into master

joeyhodge · Mar 16, 2024 · 73927e8 · 73927e8
2 parents 2741b8b + e206942
commit 73927e8
Show file tree

Hide file tree

Showing 125 changed files with 23,478 additions and 35 deletions.
diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: windows-latest
     strategy:
       matrix:
-        target: [RE2, RE2_TDB66, RE3, RE3_TDB67, RE4, RE7, RE7_TDB49, RE8, DMC5, MHRISE, SF6]
+        target: [RE2, RE2_TDB66, RE3, RE3_TDB67, RE4, RE7, RE7_TDB49, RE8, DMC5, MHRISE, SF6, DD2]
     steps:
       - name: Checkout
         uses: actions/checkout@v3

diff --git a/.github/workflows/dev-release.yml b/.github/workflows/dev-release.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: windows-latest
     strategy:
       matrix:
-        target: [RE2, RE2_TDB66, RE3, RE3_TDB67, RE4, RE7, RE7_TDB49, RE8, DMC5, MHRISE, SF6]
+        target: [RE2, RE2_TDB66, RE3, RE3_TDB67, RE4, RE7, RE7_TDB49, RE8, DMC5, MHRISE, SF6, DD2]
     steps:
       - name: Checkout
         uses: actions/checkout@v3

diff --git a/CMakeLists.txt b/CMakeLists.txt
diff --git a/cmake.toml b/cmake.toml
@@ -44,6 +44,7 @@ REF_BUILD_RE8_SDK = false
 REF_BUILD_DMC5_SDK = false
 REF_BUILD_MHRISE_SDK = false
 REF_BUILD_SF6_SDK = false
+REF_BUILD_DD2_SDK = false
 REF_BUILD_FRAMEWORK = { value = true, comment = "Enable building the full REFramework" }
 REF_BUILD_DEPENDENCIES = { value = true, comment = "Enable building dependencies" }
 
@@ -61,6 +62,7 @@ build-re8-sdk = "REF_BUILD_RE8_SDK OR REF_BUILD_FRAMEWORK"
 build-dmc5-sdk = "REF_BUILD_DMC5_SDK OR REF_BUILD_FRAMEWORK"
 build-mhrise-sdk = "REF_BUILD_MHRISE_SDK OR REF_BUILD_FRAMEWORK"
 build-sf6-sdk = "REF_BUILD_SF6_SDK OR REF_BUILD_FRAMEWORK"
+build-dd2-sdk = "REF_BUILD_DD2_SDK OR REF_BUILD_FRAMEWORK"
 build-framework-dependencies = "REF_BUILD_DEPENDENCIES AND CMAKE_SIZEOF_VOID_P EQUAL 8"
 
 [fetch-content.asmjit]
@@ -169,7 +171,7 @@ tag = "v1.34.10"
 
 [fetch-content.kananlib]
 git = "https://github.com/cursey/kananlib"
-tag = "main"
+tag = "b0323a0b005fc9e3944e0ea36dcc98eda4b84eea"
 
 [target.utility]
 type = "static"
@@ -329,6 +331,14 @@ condition = "build-sf6-sdk"
 [target.SF6]
 type = "game"
 
+[target.DD2SDK]
+type = "sdk"
+compile-definitions = ["DD2", "REENGINE_PACKED", "REENGINE_AT"]
+condition = "build-dd2-sdk"
+
+[target.DD2]
+type = "game"
+
 [template.plugin]
 type = "shared"
 include-directories = ["include/"]