From 15f4495b63a35cb615f36de4efe6d3a3f16be819 Mon Sep 17 00:00:00 2001 From: Peter0x44 Date: Fri, 14 Jun 2024 03:09:40 +0100 Subject: [PATCH] Give executables consistent names --- .github/workflows/build-all-and-release.yml | 8 ++++---- tools/build-nzp-linux32.sh | 1 + tools/build-nzp-linux64.sh | 3 ++- tools/build-nzp-linux_arm64.sh | 1 + tools/build-nzp-linux_armhf.sh | 1 + 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-all-and-release.yml b/.github/workflows/build-all-and-release.yml index 7c43ecdcd..f666552d8 100644 --- a/.github/workflows/build-all-and-release.yml +++ b/.github/workflows/build-all-and-release.yml @@ -16,7 +16,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: pc-nzp-linux32.zip - path: ./engine/release/nzportable32 + path: ./engine/release/nzportable32-sdl Compile-Linux64: runs-on: ubuntu-latest container: @@ -32,7 +32,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: pc-nzp-linux64.zip - path: ./engine/release/nzportable64 + path: ./engine/release/nzportable64-sdl Compile-LinuxArm64: runs-on: ubuntu-latest container: @@ -48,7 +48,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: pc-nzp-linux_arm64.zip - path: ./engine/release/nzportablearm64 + path: ./engine/release/nzportablearm64-sdl Compile-LinuxArmhf: runs-on: ubuntu-latest container: @@ -64,7 +64,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: pc-nzp-linux_armhf.zip - path: ./engine/release/nzportablearmhf + path: ./engine/release/nzportablearmhf-sdl Compile-Windows32: runs-on: ubuntu-latest container: diff --git a/tools/build-nzp-linux32.sh b/tools/build-nzp-linux32.sh index ef71bb900..fe4f0a470 100755 --- a/tools/build-nzp-linux32.sh +++ b/tools/build-nzp-linux32.sh @@ -2,3 +2,4 @@ cd ../engine export CC=i686-linux-gnu-gcc export STRIP=i686-linux-gnu-strip make makelibs FTE_TARGET=SDL2 && make m-rel FTE_TARGET=SDL2 FTE_CONFIG=nzportable -j32 +mv release/nzportable-sdl2 release/nzportable32-sdl diff --git a/tools/build-nzp-linux64.sh b/tools/build-nzp-linux64.sh index c0ac3d205..d7eef7d78 100755 --- a/tools/build-nzp-linux64.sh +++ b/tools/build-nzp-linux64.sh @@ -1,4 +1,5 @@ cd ../engine export CC=x86_64-linux-gnu-gcc export STRIP=x86_64-linux-gnu-strip -make makelibs FTE_TARGET=SDL2 && make m-rel FTE_TARGET=SDL2 FTE_CONFIG_=nzportable -j32 +make makelibs FTE_TARGET=SDL2 && make m-rel FTE_TARGET=SDL2 FTE_CONFIG=nzportable -j32 +mv release/nzportable-sdl2 release/nzportable64-sdl diff --git a/tools/build-nzp-linux_arm64.sh b/tools/build-nzp-linux_arm64.sh index 07af95216..ee73b7641 100755 --- a/tools/build-nzp-linux_arm64.sh +++ b/tools/build-nzp-linux_arm64.sh @@ -2,3 +2,4 @@ cd ../engine export CC=aarch64-linux-gnu-gcc export STRIP=aarch64-linux-gnu-strip make makelibs FTE_TARGET=SDL2 && make m-rel FTE_TARGET=SDL2 FTE_CONFIG=nzportable -j32 +mv release/nzportable-sdl2 release/nzportablearm64-sdl diff --git a/tools/build-nzp-linux_armhf.sh b/tools/build-nzp-linux_armhf.sh index 5bcecb89c..08a0191e1 100755 --- a/tools/build-nzp-linux_armhf.sh +++ b/tools/build-nzp-linux_armhf.sh @@ -2,3 +2,4 @@ cd ../engine export CC=arm-linux-gnueabihf-gcc export STRIP=arm-linux-gnueabihf-strip make makelibs FTE_TARGET=SDL2 && make m-rel FTE_TARGET=SDL2 FTE_CONFIG=nzportable -j32 +mv release/nzportable-sdl2 release/nzportablearmhf-sdl