From 5e57643f3af67f2c995ce4742dbebcb4cee16e21 Mon Sep 17 00:00:00 2001 From: otavepto <153766569+otavepto@users.noreply.github.com> Date: Tue, 26 Dec 2023 19:53:10 +0200 Subject: [PATCH] changed tmp dir for builds --- build_linux.sh | 2 +- build_win.bat | 2 +- tools/generate_emu_config/rebuild_linux.sh | 2 +- tools/generate_emu_config/rebuild_win.bat | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build_linux.sh b/build_linux.sh index 00891ec1..3f826c2a 100644 --- a/build_linux.sh +++ b/build_linux.sh @@ -112,7 +112,7 @@ build_root_tools="$build_root_dir/tools" deps_dir="build/linux/deps" libs_dir="libs" tools_dir='tools' -build_temp_dir="build/linux/tmp" +build_temp_dir="build/tmp/linux" third_party_dir="third-party" third_party_build_dir="$third_party_dir/build/linux" diff --git a/build_win.bat b/build_win.bat index 764f3bc6..b9fe068a 100644 --- a/build_win.bat +++ b/build_win.bat @@ -137,7 +137,7 @@ set "lobby_connect_dir=%tools_dir%\lobby_connect" set "deps_dir=build\win\deps" set "libs_dir=libs" set "tools_src_dir=tools" -set "build_temp_dir=build\win\tmp" +set "build_temp_dir=build\tmp\win" set "protoc_exe_32=%deps_dir%\protobuf\install32\bin\protoc.exe" set "protoc_exe_64=%deps_dir%\protobuf\install64\bin\protoc.exe" diff --git a/tools/generate_emu_config/rebuild_linux.sh b/tools/generate_emu_config/rebuild_linux.sh index 6495de4e..e195a3de 100644 --- a/tools/generate_emu_config/rebuild_linux.sh +++ b/tools/generate_emu_config/rebuild_linux.sh @@ -3,7 +3,7 @@ venv=".env-linux" out_dir="bin/linux" -build_temp_dir="build/linux/tmp" +build_temp_dir="build/tmp/linux" tool_name="generate_emu_config" main_file="generate_emu_config.py" diff --git a/tools/generate_emu_config/rebuild_win.bat b/tools/generate_emu_config/rebuild_win.bat index 76194513..9456112f 100644 --- a/tools/generate_emu_config/rebuild_win.bat +++ b/tools/generate_emu_config/rebuild_win.bat @@ -5,7 +5,7 @@ pushd "%~dp0" set "venv=.env-win" set "out_dir=bin\win" -set "build_temp_dir=build\win\tmp" +set "build_temp_dir=build\tmp\win" set "tool_name=generate_emu_config" set "icon_file=icon\Froyoshark-Enkel-Steam.ico" set "main_file=generate_emu_config.py"