Commit b504123e authored by Mike Hommey's avatar Mike Hommey
Browse files

Bug 1289291 - Set WINDOWSSDKDIR as a Windows path instead of msys path. r=chmanchester 

--HG--
extra : rebase_source : de10ea1eb7956bd74b9784e760094356fc27364e
parent 1b9c7045

build/win32/mozconfig.vs2015-win64

+2 −1
Original line number Diff line number Diff line 
if [ -z "${VSPATH}" ]; then

    TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}

    VSPATH="$(cd ${TOOLTOOL_DIR} && pwd)/vs2015u2"

    VSWINPATH="$(cd ${TOOLTOOL_DIR} && pwd -W)/vs2015u2"

fi



export WINDOWSSDKDIR="${VSPATH}/SDK"

export WINDOWSSDKDIR="${VSWINPATH}/SDK"

export WIN32_REDIST_DIR="${VSPATH}/VC/redist/x86/Microsoft.VC140.CRT"

export WIN_UCRT_REDIST_DIR="${VSPATH}/SDK/Redist/ucrt/DLLs/x86"

build/win64/mozconfig.vs2015

+2 −1
Original line number Diff line number Diff line 
if [ -z "${VSPATH}" ]; then

    TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}

    VSPATH="$(cd ${TOOLTOOL_DIR} && pwd)/vs2015u2"

    VSWINPATH="$(cd ${TOOLTOOL_DIR} && pwd -W)/vs2015u2"

fi



export WINDOWSSDKDIR="${VSPATH}/SDK"

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"