diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml index 6df5bab5..cfc514b9 100644 --- a/.github/workflows/build-linux.yml +++ b/.github/workflows/build-linux.yml @@ -19,7 +19,7 @@ permissions: env: DEPS_CACHE_KEY: emu-deps-linux - DEPS_CACHE_DIR: build/linux/deps + DEPS_CACHE_DIR: build/deps/linux PACKAGE_BASE_DIR: "build/linux/package" THIRD_PARTY_BASE_DIR: 'third-party' diff --git a/.github/workflows/build-win.yml b/.github/workflows/build-win.yml index 43e5e8b6..a72af9b1 100644 --- a/.github/workflows/build-win.yml +++ b/.github/workflows/build-win.yml @@ -18,7 +18,7 @@ permissions: env: DEPS_CACHE_KEY: emu-deps-win - DEPS_CACHE_DIR: build/win/deps + DEPS_CACHE_DIR: build/deps/win PACKAGE_BASE_DIR: "build/win/package" THIRD_PARTY_BASE_DIR: 'third-party' diff --git a/build_linux.sh b/build_linux.sh index 935b7224..2d613356 100644 --- a/build_linux.sh +++ b/build_linux.sh @@ -109,7 +109,7 @@ build_root_64="$build_root_dir/x64" build_root_tools="$build_root_dir/tools" # common stuff -deps_dir="build/linux/deps" +deps_dir="build/deps/linux" libs_dir="libs" tools_dir='tools' build_temp_dir="build/tmp/linux" diff --git a/build_linux_deps.sh b/build_linux_deps.sh index b93bcc74..67fcb360 100644 --- a/build_linux_deps.sh +++ b/build_linux_deps.sh @@ -20,7 +20,7 @@ fi # common stuff 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_deps_dir="$third_party_dir/deps/linux" third_party_common_dir="$third_party_dir/deps/common" diff --git a/build_win.bat b/build_win.bat index b9fe068a..05d5840d 100644 --- a/build_win.bat +++ b/build_win.bat @@ -134,7 +134,7 @@ set "find_interfaces_dir=%tools_dir%\find_interfaces" set "lobby_connect_dir=%tools_dir%\lobby_connect" :: common stuff -set "deps_dir=build\win\deps" +set "deps_dir=build\deps\win" set "libs_dir=libs" set "tools_src_dir=tools" set "build_temp_dir=build\tmp\win" diff --git a/build_win_deps.bat b/build_win_deps.bat index 1685ed27..a1a8ff19 100644 --- a/build_win_deps.bat +++ b/build_win_deps.bat @@ -3,7 +3,7 @@ setlocal pushd "%~dp0" -set "deps_dir=build\win\deps" +set "deps_dir=build\deps\win" set "third_party_dir=third-party" set "third_party_deps_dir=%third_party_dir%\deps\win" set "third_party_common_dir=%third_party_dir%\deps\common"