fix: change targetname

This commit is contained in:
6arelyFuture 2023-06-23 14:17:09 +02:00
parent e49a40630d
commit a8876eb585
Signed by: Future
GPG Key ID: FA77F074E98D98A5
2 changed files with 12 additions and 10 deletions

View File

@ -51,15 +51,15 @@ jobs:
uses: ammaraskar/msvc-problem-matcher@master uses: ammaraskar/msvc-problem-matcher@master
- name: Build ${{matrix.configuration}} ${{matrix.arch}} binaries - name: Build ${{matrix.configuration}} ${{matrix.arch}} binaries
run: msbuild /m /v:minimal /p:Configuration=${{matrix.configuration}} /p:Platform=${{matrix.platform}} build/xlabs-master-tool.sln run: msbuild /m /v:minimal /p:Configuration=${{matrix.configuration}} /p:Platform=${{matrix.platform}} build/alterware-master-tool.sln
- name: Upload ${{matrix.configuration}} ${{matrix.arch}} binaries - name: Upload ${{matrix.configuration}} ${{matrix.arch}} binaries
uses: actions/upload-artifact@v3.1.2 uses: actions/upload-artifact@v3.1.2
with: with:
name: Windows ${{matrix.configuration}} ${{matrix.arch}} binaries name: Windows ${{matrix.configuration}} ${{matrix.arch}} binaries
path: | path: |
build/bin/${{matrix.arch}}/${{matrix.configuration}}/xlabs-master-tool.exe build/bin/${{matrix.arch}}/${{matrix.configuration}}/alterware-master-tool.exe
build/bin/${{matrix.arch}}/${{matrix.configuration}}/xlabs-master-tool.pdb build/bin/${{matrix.arch}}/${{matrix.configuration}}/alterware-master-tool.pdb
build-linux: build-linux:
name: Build Linux name: Build Linux
@ -106,12 +106,12 @@ jobs:
- name: Set up problem matching - name: Set up problem matching
uses: ammaraskar/gcc-problem-matcher@master uses: ammaraskar/gcc-problem-matcher@master
- name: Set up CC environment variables - name: Set up CC environment variable
if: matrix.arch == 'arm64' if: matrix.arch == 'arm64'
run: | run: |
echo "CC=aarch64-linux-gnu-gcc" >> $GITHUB_ENV echo "CC=aarch64-linux-gnu-gcc" >> $GITHUB_ENV
- name: Set up CXX environment variables - name: Set up CXX environment variable
if: matrix.arch == 'arm64' if: matrix.arch == 'arm64'
run: | run: |
echo "CXX=aarch64-linux-gnu-g++" >> $GITHUB_ENV echo "CXX=aarch64-linux-gnu-g++" >> $GITHUB_ENV
@ -126,7 +126,7 @@ jobs:
with: with:
name: Linux ${{matrix.configuration}} ${{matrix.arch}} binaries name: Linux ${{matrix.configuration}} ${{matrix.arch}} binaries
path: | path: |
build/bin/${{matrix.arch}}/${{matrix.configuration}}/xlabs-master-tool build/bin/${{matrix.arch}}/${{matrix.configuration}}/alterware-master-tool
build-mac: build-mac:
name: Build macOS name: Build macOS
@ -175,4 +175,4 @@ jobs:
with: with:
name: macOS ${{matrix.configuration}} ${{matrix.arch}} binaries name: macOS ${{matrix.configuration}} ${{matrix.arch}} binaries
path: | path: |
build/bin/${{matrix.arch}}/${{matrix.configuration}}/xlabs-master-tool build/bin/${{matrix.arch}}/${{matrix.configuration}}/alterware-master-tool

View File

@ -30,8 +30,8 @@ end
dependencies.load() dependencies.load()
workspace "xlabs-master-tool" workspace "alterware-master-tool"
startproject "xlabs-master-tool" startproject "alterware-master-tool"
location "./build" location "./build"
objdir "%{wks.location}/obj" objdir "%{wks.location}/obj"
targetdir "%{wks.location}/bin/%{cfg.platform}/%{cfg.buildcfg}" targetdir "%{wks.location}/bin/%{cfg.platform}/%{cfg.buildcfg}"
@ -96,10 +96,12 @@ filter "configurations:Debug"
defines {"DEBUG", "_DEBUG"} defines {"DEBUG", "_DEBUG"}
filter {} filter {}
project "xlabs-master-tool" project "alterware-master-tool"
kind "ConsoleApp" kind "ConsoleApp"
language "C++" language "C++"
targetname "alterware-master-tool"
pchheader "std_include.hpp" pchheader "std_include.hpp"
pchsource "src/std_include.cpp" pchsource "src/std_include.cpp"