diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 08cd4308..ad5464f4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -48,7 +48,7 @@ jobs: run: cargo check --release - name: Build - run: cargo build --bin battle_gui --bin battle_server --release + run: cargo build --bin battle_gui --bin battle_server --bin oc_launcher --release - name: Package run: tools/package_release_windows.sh ${{ github.ref_name }} diff --git a/assets/linux/.index b/assets/linux/.index new file mode 100644 index 00000000..e69de29b diff --git a/assets/linux/sidea__embedded_server.sh b/assets/linux/sidea__embedded_server.sh deleted file mode 100755 index c6d90c5a..00000000 --- a/assets/linux/sidea__embedded_server.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env bash -./battle_gui Demo1 assets/demo1_deployment.json --embedded-server --server-rep-address tcp://0.0.0.0:4255 --server-bind-address tcp://0.0.0.0:4256 --side a --side-a-control N --side-a-control NW --side-a-control W --side-b-control ALL diff --git a/assets/linux/sideb__client.sh b/assets/linux/sideb__client.sh deleted file mode 100755 index dd5384e7..00000000 --- a/assets/linux/sideb__client.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env bash -battle_gui Demo1 assets/demo1_deployment.json --server-rep-address tcp://0.0.0.0:4255 --server-bind-address tcp://0.0.0.0:4256 --side b --side-a-control N --side-a-control NW --side-a-control W --side-b-control ALL diff --git a/assets/w64/sidea__embedded_server.bat b/assets/w64/sidea__embedded_server.bat deleted file mode 100644 index 268f88db..00000000 --- a/assets/w64/sidea__embedded_server.bat +++ /dev/null @@ -1,2 +0,0 @@ -if not defined in_subprocess (cmd /k set in_subprocess=y ^& %0 %*) & exit ) -battle_gui.exe Demo1 assets/demo1_deployment.json --embedded-server --server-rep-address tcp://0.0.0.0:4255 --server-bind-address tcp://0.0.0.0:4256 --side a --side-a-control N --side-a-control NW --side-a-control W --side-b-control ALL diff --git a/assets/w64/sideb__client.bat b/assets/w64/sideb__client.bat deleted file mode 100644 index 9d5e2710..00000000 --- a/assets/w64/sideb__client.bat +++ /dev/null @@ -1,2 +0,0 @@ -if not defined in_subprocess (cmd /k set in_subprocess=y ^& %0 %*) & exit ) -battle_gui.exe Demo1 assets/demo1_deployment.json --server-rep-address tcp://0.0.0.0:4255 --server-bind-address tcp://0.0.0.0:4256 --side b --side-a-control N --side-a-control NW --side-a-control W --side-b-control ALL diff --git a/tools/package_release_linux.sh b/tools/package_release_linux.sh index 12c9a279..6d2e539d 100755 --- a/tools/package_release_linux.sh +++ b/tools/package_release_linux.sh @@ -7,6 +7,7 @@ FOLDER_NAME=OpenCombat_${1}_Linux mkdir -p ${FOLDER_NAME} cp target/release/battle_gui ${FOLDER_NAME} cp target/release/battle_server ${FOLDER_NAME} +cp target/release/oc_launcher ${FOLDER_NAME}/start cp -r resources ${FOLDER_NAME} cp assets/linux/* ${FOLDER_NAME} mkdir -p ${FOLDER_NAME}/assets diff --git a/tools/package_release_windows.sh b/tools/package_release_windows.sh index 6bfa35de..6a4c8ee9 100755 --- a/tools/package_release_windows.sh +++ b/tools/package_release_windows.sh @@ -7,6 +7,7 @@ FOLDER_NAME=OpenCombat_${1}_Win64 mkdir ${FOLDER_NAME} cp target/release/battle_gui.exe ${FOLDER_NAME} cp target/release/battle_server.exe ${FOLDER_NAME} +cp target/release/oc_launcher.exe ${FOLDER_NAME}/start.exe cp -r resources ${FOLDER_NAME} cp assets/w64/* ${FOLDER_NAME} mkdir ${FOLDER_NAME}/assets