Merge branch 'develop' into adv-beta

DFHack · Apr 21, 2024 · f52820e · f52820e
2 parents 91bb4d5 + 60cff29
commit f52820e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/.github/workflows/generate-symbols.yml b/.github/workflows/generate-symbols.yml
@@ -37,6 +37,7 @@ on:
         options:
         - default
         - testing
+        - adventure_test
         - beta
       steam_branch:
         description: DFHack Steam branch to deploy to (leave blank to skip deploy)
@@ -97,6 +98,7 @@ jobs:
         STEAM_USERNAME: ${{ secrets.STEAM_USERNAME }}
         STEAM_CONFIG_VDF: ${{ secrets.STEAM_CONFIG_VDF }}
         STEAM_DF_TESTING: ${{ secrets.STEAM_DF_TESTING }}
+        STEAM_DF_ADVENTURE_TEST: ${{ secrets.STEAM_DF_ADVENTURE_TEST }}
       run: |
         mkdir DF_steam
         mkdir -p $HOME/Steam/config
@@ -106,6 +108,8 @@ jobs:
           BETA_PARAMS=""
         elif [ "${{ inputs.df_steam_branch }}" = "testing" ]; then
           BETA_PARAMS="-beta testing -betapassword $STEAM_DF_TESTING"
+        elif [ "${{ inputs.df_steam_branch }}" = "adventure_test" ]; then
+          BETA_PARAMS="-beta adventure_test -betapassword $STEAM_DF_ADVENTURE_TEST"
         else
           BETA_PARAMS="-beta ${{ inputs.df_steam_branch }}"
         fi
@@ -204,6 +208,7 @@ jobs:
         STEAM_USERNAME: ${{ secrets.STEAM_USERNAME }}
         STEAM_CONFIG_VDF: ${{ secrets.STEAM_CONFIG_VDF }}
         STEAM_DF_TESTING: ${{ secrets.STEAM_DF_TESTING }}
+        STEAM_DF_ADVENTURE_TEST: ${{ secrets.STEAM_DF_ADVENTURE_TEST }}
       run: |
         mkdir DF_steam
         mkdir -p $HOME/Steam/config
@@ -213,6 +218,8 @@ jobs:
           BETA_PARAMS=""
         elif [ "${{ inputs.df_steam_branch }}" = "testing" ]; then
           BETA_PARAMS="-beta testing -betapassword $STEAM_DF_TESTING"
+        elif [ "${{ inputs.df_steam_branch }}" = "adventure_test" ]; then
+          BETA_PARAMS="-beta adventure_test -betapassword $STEAM_DF_ADVENTURE_TEST"
         else
           BETA_PARAMS="-beta ${{ inputs.df_steam_branch }}"
         fi

diff --git a/library/include/Export.h b/library/include/Export.h
@@ -50,7 +50,7 @@ distribution.
     #endif
 #endif
 
-// C export macros for faking SDL and plugin exports
+// C export macros
 #ifdef LINUX_BUILD
     #define DFhackCExport extern "C" __attribute__ ((visibility("default")))
     #define DFhackDataExport __attribute__ ((visibility("default")))