change deps build dir to: build/deps/linux (example) to make them independant from emu build folder, which is for example build/linux/...

This commit is contained in:
otavepto 2023-12-26 21:32:52 +02:00
parent de27c8c024
commit 1ce0e823c4
6 changed files with 6 additions and 6 deletions

View File

@ -19,7 +19,7 @@ permissions:
env: env:
DEPS_CACHE_KEY: emu-deps-linux DEPS_CACHE_KEY: emu-deps-linux
DEPS_CACHE_DIR: build/linux/deps DEPS_CACHE_DIR: build/deps/linux
PACKAGE_BASE_DIR: "build/linux/package" PACKAGE_BASE_DIR: "build/linux/package"
THIRD_PARTY_BASE_DIR: 'third-party' THIRD_PARTY_BASE_DIR: 'third-party'

View File

@ -18,7 +18,7 @@ permissions:
env: env:
DEPS_CACHE_KEY: emu-deps-win DEPS_CACHE_KEY: emu-deps-win
DEPS_CACHE_DIR: build/win/deps DEPS_CACHE_DIR: build/deps/win
PACKAGE_BASE_DIR: "build/win/package" PACKAGE_BASE_DIR: "build/win/package"
THIRD_PARTY_BASE_DIR: 'third-party' THIRD_PARTY_BASE_DIR: 'third-party'

View File

@ -109,7 +109,7 @@ build_root_64="$build_root_dir/x64"
build_root_tools="$build_root_dir/tools" build_root_tools="$build_root_dir/tools"
# common stuff # common stuff
deps_dir="build/linux/deps" deps_dir="build/deps/linux"
libs_dir="libs" libs_dir="libs"
tools_dir='tools' tools_dir='tools'
build_temp_dir="build/tmp/linux" build_temp_dir="build/tmp/linux"

View File

@ -20,7 +20,7 @@ fi
# common stuff # common stuff
script_dir=$( cd -- "$( dirname -- "${0}" )" &> /dev/null && pwd ) script_dir=$( cd -- "$( dirname -- "${0}" )" &> /dev/null && pwd )
deps_dir="$script_dir/build/linux/deps" deps_dir="$script_dir/build/deps/linux"
third_party_dir="$script_dir/third-party" third_party_dir="$script_dir/third-party"
third_party_deps_dir="$third_party_dir/deps/linux" third_party_deps_dir="$third_party_dir/deps/linux"
third_party_common_dir="$third_party_dir/deps/common" third_party_common_dir="$third_party_dir/deps/common"

View File

@ -134,7 +134,7 @@ set "find_interfaces_dir=%tools_dir%\find_interfaces"
set "lobby_connect_dir=%tools_dir%\lobby_connect" set "lobby_connect_dir=%tools_dir%\lobby_connect"
:: common stuff :: common stuff
set "deps_dir=build\win\deps" set "deps_dir=build\deps\win"
set "libs_dir=libs" set "libs_dir=libs"
set "tools_src_dir=tools" set "tools_src_dir=tools"
set "build_temp_dir=build\tmp\win" set "build_temp_dir=build\tmp\win"

View File

@ -3,7 +3,7 @@
setlocal setlocal
pushd "%~dp0" pushd "%~dp0"
set "deps_dir=build\win\deps" set "deps_dir=build\deps\win"
set "third_party_dir=third-party" set "third_party_dir=third-party"
set "third_party_deps_dir=%third_party_dir%\deps\win" set "third_party_deps_dir=%third_party_dir%\deps\win"
set "third_party_common_dir=%third_party_dir%\deps\common" set "third_party_common_dir=%third_party_dir%\deps\common"