From 166e8891626e25106a694690165db375cc7fff9b Mon Sep 17 00:00:00 2001 From: Jaby Date: Tue, 6 Dec 2022 04:56:26 +0100 Subject: [PATCH] Use WSL for linux targets for more reliablitity --- src/Tools/psxcdgen_ex/Cargo.toml | 1 - src/Tools/run_cargo.bat | 12 +++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/Tools/psxcdgen_ex/Cargo.toml b/src/Tools/psxcdgen_ex/Cargo.toml index c712b442..acc65024 100644 --- a/src/Tools/psxcdgen_ex/Cargo.toml +++ b/src/Tools/psxcdgen_ex/Cargo.toml @@ -9,7 +9,6 @@ edition = "2021" byteorder = "*" cdtypes = {path = "../cdtypes"} clap = {version = "*", features = ["derive"]} -lz4 = "*" paste = "*" roxmltree = "*" tool_helper = {path = "../tool_helper"} \ No newline at end of file diff --git a/src/Tools/run_cargo.bat b/src/Tools/run_cargo.bat index 89b70c5a..28647fd5 100644 --- a/src/Tools/run_cargo.bat +++ b/src/Tools/run_cargo.bat @@ -5,10 +5,12 @@ rem run_cargo.bat project {build|check|clean|test} {debug|release} [linux|window set org_dir=%cd% set bin_ext=.exe set target=x86_64-pc-windows-msvc +set wsl= IF %4 == linux ( set bin_ext= - set target=x86_64-unknown-linux-musl + set target=x86_64-unknown-linux-gnu + set wsl=wsl $HOME/.cargo/bin/ ) IF defined CARGO_RUN_ARGS set run_args=-- %CARGO_RUN_ARGS% @@ -19,7 +21,7 @@ IF %2 == test set run_build=1 cd %1 IF defined run_build ( echo cargo build %1 --%3 - cargo build --%3 --target=%target% + %wsl%cargo build --%3 --target=%target% IF %2 == build IF %ERRORLEVEL% == 0 ( xcopy target\%target%\%3\%1%bin_ext% %org_dir%\..\..\bin /y @@ -30,21 +32,21 @@ IF defined run_build ( IF %2 == run ( echo cargo run %1 --%3 - cargo run --%3 --target=%target% %run_args% + %wsl%cargo run --%3 --target=%target% %run_args% exit /B %ERRORLEVEL% ) IF %2 == check ( echo cargo check %1 --%3 - cargo check --%3 --target=%target% + %wsl%cargo check --%3 --target=%target% exit /B %ERRORLEVEL% ) IF %2 == clean ( echo cargo clean %1 - cargo clean + %wsl%cargo clean rem We do not delete the bin folder anymore - is kinda to much rem @del %org_dir%\..\..\bin\%1%bin_ext%