mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-14 13:55:43 +00:00
25b39c3581
The `cd $PATH && pwd` pattern doesn't work when $PATH doesn't exist, so move them in a block only executed when the directory exists. --HG-- extra : rebase_source : 53bd2959dbd9825526a386b6ab5b40a7f67a5d20
27 lines
1.2 KiB
Plaintext
27 lines
1.2 KiB
Plaintext
if [ -z "${VSPATH}" ]; then
|
|
TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
|
|
VSPATH="$(cd ${TOOLTOOL_DIR} && pwd)/vs2015u3"
|
|
fi
|
|
|
|
if [ -d "${VSPATH}" ]; then
|
|
VSWINPATH="$(cd ${VSPATH} && pwd -W)"
|
|
|
|
export WINDOWSSDKDIR="${VSWINPATH}/SDK"
|
|
export WIN32_REDIST_DIR=${VSPATH}/VC/redist/x64/Microsoft.VC140.CRT
|
|
export WIN_UCRT_REDIST_DIR="${VSPATH}/SDK/Redist/ucrt/DLLs/x64"
|
|
|
|
export PATH="${VSPATH}/VC/bin/amd64:${VSPATH}/VC/bin:${VSPATH}/SDK/bin/x64:${VSPATH}/VC/redist/x64/Microsoft.VC140.CRT:${VSPATH}/SDK/Redist/ucrt/DLLs/x64:${VSPATH}/DIA SDK/bin/amd64:${PATH}"
|
|
|
|
export INCLUDE="${VSPATH}/VC/include:${VSPATH}/VC/atlmfc/include:${VSPATH}/SDK/Include/10.0.14393.0/ucrt:${VSPATH}/SDK/Include/10.0.14393.0/shared:${VSPATH}/SDK/Include/10.0.14393.0/um:${VSPATH}/SDK/Include/10.0.14393.0/winrt:${VSPATH}/DIA SDK/include"
|
|
export LIB="${VSPATH}/VC/lib/amd64:${VSPATH}/VC/atlmfc/lib/amd64:${VSPATH}/SDK/lib/10.0.14393.0/ucrt/x64:${VSPATH}/SDK/lib/10.0.14393.0/um/x64:${VSPATH}/DIA SDK/lib/amd64"
|
|
fi
|
|
|
|
. $topsrcdir/build/mozconfig.vs-common
|
|
|
|
mk_export_correct_style WINDOWSSDKDIR
|
|
mk_export_correct_style INCLUDE
|
|
mk_export_correct_style LIB
|
|
mk_export_correct_style PATH
|
|
mk_export_correct_style WIN32_REDIST_DIR
|
|
mk_export_correct_style WIN_UCRT_REDIST_DIR
|