Name output binary Cemu_<CONFIG> and always place it in bin/ (#179)

This commit is contained in:
Exzap 2022-09-04 22:23:24 +02:00 committed by GitHub
parent 1373c76eb9
commit 4ed18a65c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 20 additions and 9 deletions

View File

@ -86,7 +86,11 @@ jobs:
run: | run: |
cd build cd build
ninja ninja
- name: Prepare artifact
if: ${{ inputs.deploymode == 'release' }}
run: mv bin/Cemu_release bin/Cemu
- name: Upload artifact - name: Upload artifact
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
if: ${{ inputs.deploymode == 'release' }} if: ${{ inputs.deploymode == 'release' }}
@ -188,10 +192,14 @@ jobs:
run: | run: |
cd build cd build
cmake --build . --config ${{ env.BUILD_MODE }} -j 2 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 - name: Upload artifact
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
if: ${{ inputs.deploymode == 'release' }} if: ${{ inputs.deploymode == 'release' }}
with: with:
name: cemu-bin-windows-x64 name: cemu-bin-windows-x64
path: ./bin/Cemu.exe path: ./bin/Cemu.exe

View File

@ -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 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 tar xvzf ghr.tar.gz; rm ghr.tar.gz
echo "[INFO] Release tag: v${{ env.CEMU_VERSION }}" 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

7
.gitignore vendored
View File

@ -18,14 +18,15 @@
build/ build/
out/ out/
.cache/ .cache/
bin/Cemu bin/Cemu_*
bin/Cemu_*.exe
# Cemu bin files # Cemu bin files
bin/otp.bin bin/otp.bin
bin/seeprom.bin bin/seeprom.bin
bin/log.txt bin/log.txt
bin/Cemu.pdb bin/Cemu_*.pdb
bin/Cemu.ilk bin/Cemu_*.ilk
bin/Cemu.exe.backup bin/Cemu.exe.backup
bin/mlc01/* bin/mlc01/*
bin/settings.xml bin/settings.xml

View File

@ -75,8 +75,10 @@ endif()
set_property(TARGET CemuBin PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>") set_property(TARGET CemuBin PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
set_target_properties(CemuBin PROPERTIES set_target_properties(CemuBin PROPERTIES
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../bin/" # multi-configuration generators will add a config subdirectory to RUNTIME_OUTPUT_DIRECTORY if no generator expression is used
OUTPUT_NAME "Cemu" # 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 target_link_libraries(CemuBin PRIVATE