From a8876eb5857dc80bbf361c11aeb25323507fb534 Mon Sep 17 00:00:00 2001 From: Diavolo Date: Fri, 23 Jun 2023 14:17:09 +0200 Subject: [PATCH] fix: change targetname --- .github/workflows/build.yml | 14 +++++++------- premake5.lua | 8 +++++--- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ad0648a..824fa42 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -51,15 +51,15 @@ jobs: uses: ammaraskar/msvc-problem-matcher@master - 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 uses: actions/upload-artifact@v3.1.2 with: name: Windows ${{matrix.configuration}} ${{matrix.arch}} binaries path: | - build/bin/${{matrix.arch}}/${{matrix.configuration}}/xlabs-master-tool.exe - build/bin/${{matrix.arch}}/${{matrix.configuration}}/xlabs-master-tool.pdb + build/bin/${{matrix.arch}}/${{matrix.configuration}}/alterware-master-tool.exe + build/bin/${{matrix.arch}}/${{matrix.configuration}}/alterware-master-tool.pdb build-linux: name: Build Linux @@ -106,12 +106,12 @@ jobs: - name: Set up problem matching uses: ammaraskar/gcc-problem-matcher@master - - name: Set up CC environment variables + - name: Set up CC environment variable if: matrix.arch == 'arm64' run: | echo "CC=aarch64-linux-gnu-gcc" >> $GITHUB_ENV - - name: Set up CXX environment variables + - name: Set up CXX environment variable if: matrix.arch == 'arm64' run: | echo "CXX=aarch64-linux-gnu-g++" >> $GITHUB_ENV @@ -126,7 +126,7 @@ jobs: with: name: Linux ${{matrix.configuration}} ${{matrix.arch}} binaries path: | - build/bin/${{matrix.arch}}/${{matrix.configuration}}/xlabs-master-tool + build/bin/${{matrix.arch}}/${{matrix.configuration}}/alterware-master-tool build-mac: name: Build macOS @@ -175,4 +175,4 @@ jobs: with: name: macOS ${{matrix.configuration}} ${{matrix.arch}} binaries path: | - build/bin/${{matrix.arch}}/${{matrix.configuration}}/xlabs-master-tool + build/bin/${{matrix.arch}}/${{matrix.configuration}}/alterware-master-tool diff --git a/premake5.lua b/premake5.lua index aeb100a..4fbcc67 100644 --- a/premake5.lua +++ b/premake5.lua @@ -30,8 +30,8 @@ end dependencies.load() -workspace "xlabs-master-tool" -startproject "xlabs-master-tool" +workspace "alterware-master-tool" +startproject "alterware-master-tool" location "./build" objdir "%{wks.location}/obj" targetdir "%{wks.location}/bin/%{cfg.platform}/%{cfg.buildcfg}" @@ -96,10 +96,12 @@ filter "configurations:Debug" defines {"DEBUG", "_DEBUG"} filter {} -project "xlabs-master-tool" +project "alterware-master-tool" kind "ConsoleApp" language "C++" +targetname "alterware-master-tool" + pchheader "std_include.hpp" pchsource "src/std_include.cpp"