From 4ed18a65c320cef3ef05d4f62130927aaa6becbb Mon Sep 17 00:00:00 2001
From: Exzap <13877693+Exzap@users.noreply.github.com>
Date: Sun, 4 Sep 2022 22:23:24 +0200
Subject: [PATCH] Name output binary Cemu_<CONFIG> and always place it in bin/
 (#179)

---
 .github/workflows/build.yml               | 14 +++++++++++---
 .github/workflows/deploy_experimental.yml |  2 +-
 .gitignore                                |  7 ++++---
 src/CMakeLists.txt                        |  6 ++++--
 4 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 926ed4a9..29af2648 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -86,7 +86,11 @@ jobs:
       run: |
         cd build
         ninja
-        
+
+    - name: Prepare artifact
+      if: ${{ inputs.deploymode == 'release' }}
+      run: mv bin/Cemu_release bin/Cemu
+              
     - name: Upload artifact
       uses: actions/upload-artifact@v3
       if: ${{ inputs.deploymode == 'release' }}
@@ -188,10 +192,14 @@ jobs:
       run: |
         cd build
         cmake --build . --config ${{ env.BUILD_MODE }} -j 2
-        
+
+    - name: Prepare artifact
+      if: ${{ inputs.deploymode == 'release' }}
+      run: Rename-Item bin/Cemu_release.exe Cemu.exe
+      
     - name: Upload artifact
       uses: actions/upload-artifact@v3
       if: ${{ inputs.deploymode == 'release' }}
       with:
         name: cemu-bin-windows-x64
-        path: ./bin/Cemu.exe
\ No newline at end of file
+        path: ./bin/Cemu.exe
diff --git a/.github/workflows/deploy_experimental.yml b/.github/workflows/deploy_experimental.yml
index 32000986..afe3dee7 100644
--- a/.github/workflows/deploy_experimental.yml
+++ b/.github/workflows/deploy_experimental.yml
@@ -63,4 +63,4 @@ jobs:
           wget -O ghr.tar.gz https://github.com/tcnksm/ghr/releases/download/v0.15.0/ghr_v0.15.0_linux_amd64.tar.gz
           tar xvzf ghr.tar.gz; rm ghr.tar.gz
           echo "[INFO] Release tag: v${{ env.CEMU_VERSION }}"
-          ghr_v0.15.0_linux_amd64/ghr -prerelease -t ${{ secrets.GITHUB_TOKEN }} -n "Cemu ${{ env.CEMU_VERSION }} (Experimental)" -b "" "v${{ env.CEMU_VERSION }}" ./upload
+          ghr_v0.15.0_linux_amd64/ghr -prerelease -t ${{ secrets.GITHUB_TOKEN }} -n "Cemu ${{ env.CEMU_VERSION }} (Experimental)" -b "Cemu experimental release - [changelog](https://cemu.info/changelog.html)" "v${{ env.CEMU_VERSION }}" ./upload
diff --git a/.gitignore b/.gitignore
index 6feed97f..ce7f91c2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,14 +18,15 @@
 build/
 out/
 .cache/
-bin/Cemu
+bin/Cemu_*
+bin/Cemu_*.exe
 
 # Cemu bin files
 bin/otp.bin
 bin/seeprom.bin
 bin/log.txt
-bin/Cemu.pdb
-bin/Cemu.ilk
+bin/Cemu_*.pdb
+bin/Cemu_*.ilk
 bin/Cemu.exe.backup
 bin/mlc01/*
 bin/settings.xml
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ca677710..d3bf8aec 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -75,8 +75,10 @@ endif()
 set_property(TARGET CemuBin PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
 
 set_target_properties(CemuBin PROPERTIES
-	RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../bin/"
-	OUTPUT_NAME "Cemu"
+	# multi-configuration generators will add a config subdirectory to RUNTIME_OUTPUT_DIRECTORY if no generator expression is used
+	# to get the same behavior everywhere we append an empty generator expression
+	RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../bin/$<1:>"
+	OUTPUT_NAME "Cemu_$<LOWER_CASE:$<CONFIG>>"
 )
 
 target_link_libraries(CemuBin PRIVATE