New Enums for Special Powers and Eva events

.github/workflows/build-toolchain.yml

@@ -30,7 +30,7 @@ jobs:
   build:
     name: Preset ${{ inputs.preset }}${{ inputs.tools && '+t' || '' }}${{ inputs.extras && '+e' || '' }}
     runs-on: windows-latest
-    timeout-minutes: 20
+    timeout-minutes: 40
     steps:
       - name: Checkout Code
         uses: actions/checkout@v4
@@ -102,6 +102,9 @@ jobs:
         with:
           arch: x86
 
+      - name: Setup vcpkg
+        uses: lukka/run-vcpkg@v11
+
       - name: Configure ${{ inputs.game }} with CMake Using ${{ inputs.preset }}${{ inputs.tools && '+t' || '' }}${{ inputs.extras && '+e' || '' }} Preset
         shell: pwsh
         run: |
@@ -111,10 +114,12 @@ jobs:
           )
 
           $gamePrefix = "${{ inputs.game == 'Generals' && 'GENERALS' || 'ZEROHOUR' }}"
+          $buildFlags += "-DRTS_BUILD_CORE_TOOLS=${{ inputs.tools && 'ON' || 'OFF' }}"
           $buildFlags += "-DRTS_BUILD_${gamePrefix}_TOOLS=${{ inputs.tools && 'ON' || 'OFF' }}"
+          $buildFlags += "-DRTS_BUILD_CORE_EXTRAS=${{ inputs.extras && 'ON' || 'OFF' }}"
           $buildFlags += "-DRTS_BUILD_${gamePrefix}_EXTRAS=${{ inputs.extras && 'ON' || 'OFF' }}"
 
-          Write-Host "Build flags: $buildFlags"
+          Write-Host "Build flags: $($buildFlags -join ' | ')"
 
           cmake --preset ${{ inputs.preset }} $buildFlags
 
@@ -131,12 +136,12 @@ jobs:
 
             if ("${{ inputs.preset }}" -like "win32*") {
             # For win32 preset, look in config-specific subdirectories
-            $configToUse = if ("${{ inputs.preset }}" -eq "win32dbg") { "Debug" } else { "Release" }
-            $files = Get-ChildItem -Path "$buildDir\${{ inputs.game }}\$configToUse" -File | Where-Object { $_.Extension -in @(".exe", ".dll", ".pdb") } -Verbose
+            $configToUse = if ("${{ inputs.preset }}" -match "debug") { "Debug" } else { "Release" }
+            $files = Get-ChildItem -Path "$buildDir\Core\$configToUse","$buildDir\${{ inputs.game }}\$configToUse" -File | Where-Object { $_.Extension -in @(".exe", ".dll", ".pdb") } -Verbose
             } else {
-            $files = Get-ChildItem -Path "$buildDir\${{ inputs.game }}" -File | Where-Object { $_.Extension -in @(".exe", ".dll", ".pdb") } -Verbose
+            $files = Get-ChildItem -Path "$buildDir\Core","$buildDir\${{ inputs.game }}" -File | Where-Object { $_.Extension -in @(".exe", ".dll", ".pdb") } -Verbose
           }
-          $files | Move-Item -Destination $artifactsDir -Verbose
+          $files | Move-Item -Destination $artifactsDir -Verbose -Force
 
       - name: Upload ${{ inputs.game }} ${{ inputs.preset }}${{ inputs.tools && '+t' || '' }}${{ inputs.extras && '+e' || '' }} Artifact
         uses: actions/upload-artifact@v4

.github/workflows/ci.yml

@@ -66,25 +66,25 @@ jobs:
           - preset: "vc6"
             tools: true
             extras: true
-          - preset: "vc6prof"
+          - preset: "vc6-profile"
             tools: true
             extras: true
-          - preset: "vc6int"
+          - preset: "vc6-internal"
             tools: true
             extras: true
-          - preset: "vc6dbg"
+          - preset: "vc6-debug"
             tools: true
             extras: true
-          - preset: "win32"
+          - preset: "win32-vcpkg"
             tools: true
             extras: true
-          - preset: "win32prof"
+          - preset: "win32-vcpkg-profile"
             tools: true
             extras: true
-          - preset: "win32int"
+          - preset: "win32-vcpkg-internal"
             tools: true
             extras: true
-          - preset: "win32dbg"
+          - preset: "win32-vcpkg-debug"
             tools: true
             extras: true
       fail-fast: false
@@ -106,25 +106,25 @@ jobs:
           - preset: "vc6"
             tools: true
             extras: true
-          - preset: "vc6prof"
+          - preset: "vc6-profile"
             tools: true
             extras: true
-          - preset: "vc6int"
+          - preset: "vc6-internal"
             tools: true
             extras: true
-          - preset: "vc6dbg"
+          - preset: "vc6-debug"
             tools: true
             extras: true
           - preset: "win32"
             tools: true
             extras: true
-          - preset: "win32prof"
+          - preset: "win32-profile"
             tools: true
             extras: true
-          - preset: "win32int"
+          - preset: "win32-internal"
             tools: true
             extras: true
-          - preset: "win32dbg"
+          - preset: "win32-debug"
             tools: true
             extras: true
       fail-fast: false

.github/workflows/valid-tags.txt

@@ -1,5 +1,6 @@
 [GEN]
 [ZH]
+[BFME]
 [CMAKE]
 [GITHUB]
 [CORE]

CMakeLists.txt

@@ -56,7 +56,6 @@ endif()
 include(cmake/config.cmake)
 include(cmake/gamespy.cmake)
 include(cmake/lzhl.cmake)
-include(cmake/zlib.cmake)
 
 add_subdirectory(Dependencies/Benchmark)
 if (IS_VS6_BUILD)