attempt fix commit hash

LatiteClient · Dec 1, 2024 · aae8b9e · aae8b9e
1 parent d896c7d
commit aae8b9e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.github/workflows/releasebuild.yml b/.github/workflows/releasebuild.yml
@@ -35,7 +35,7 @@ jobs:
       working-directory: ${{env.GITHUB_WORKSPACE}}
       # Add additional options to the MSBuild command line here (like platform or verbosity level).
       # See https://docs.microsoft.com/visualstudio/msbuild/msbuild-command-line-reference
-      run: msbuild /m /p:Configuration=${{env.BUILD_CONFIGURATION}} /p:DefineConstants="COMMIT_HASH=${{env.COMMIT_HASH}}" ${{env.SOLUTION_FILE_PATH}}
+      run: msbuild /m /p:Configuration=${{env.BUILD_CONFIGURATION}} /p:COMMIT_HASH=${{env.COMMIT_HASH}} ${{env.SOLUTION_FILE_PATH}}
 
     - name: Upload release DLL to artifacts
       uses: actions/upload-artifact@v4

diff --git a/src/client/Latite.cpp b/src/client/Latite.cpp
@@ -476,11 +476,12 @@ void Latite::threadsafeInit() {
 
     auto app = winrt::Windows::UI::ViewManagement::ApplicationView::GetForCurrentView();
     std::string vstr(this->version);
+#define STRINGIFY(x) #x
 #ifdef LATITE_NIGHTLY
 #ifndef COMMIT_HASH
 #error Invalid nightly build - No Commit Hash
 #endif
-    auto ws = util::StrToWStr("Latite Client [NIGHTLY] commit #" + COMMIT_HASH + " game version " + gameVersion);
+    auto ws = util::StrToWStr("Latite Client [NIGHTLY] commit #" + STRINGIFY(COMMIT_HASH) + " game version " + gameVersion);
 #else
     auto ws = util::StrToWStr("Latite Client " + vstr);
 #endif