Thu, 22 Jan 2015 13:21:57 +0100
Incorporate requested changes from Mozilla in review:
https://bugzilla.mozilla.org/show_bug.cgi?id=1123480#c6
michael@0 | 1 | |
michael@0 | 2 | if [ -d "/c/PROGRA~2/MICROS~2.0" ]; then |
michael@0 | 3 | # /c/Program Files (x86)/Microsoft Visual Studio 10.0 |
michael@0 | 4 | _VSPATH="/c/PROGRA~2/MICROS~2.0" |
michael@0 | 5 | else |
michael@0 | 6 | _VSPATH="/c/tools/msvs10" |
michael@0 | 7 | fi |
michael@0 | 8 | |
michael@0 | 9 | ## SDK redist ## |
michael@0 | 10 | export WIN32_REDIST_DIR=${_VSPATH}/VC/redist/x86/Microsoft.VC100.CRT |
michael@0 | 11 | |
michael@0 | 12 | ## moz tools location for 64-bit builders ## |
michael@0 | 13 | export MOZ_TOOLS=C:/mozilla-build/moztools |
michael@0 | 14 | |
michael@0 | 15 | ## includes: win8 sdk includes, winrt headers for metro, msvc 10 std library, directx sdk for d3d9 ## |
michael@0 | 16 | export INCLUDE=/c/Program\ Files\ \(x86\)/Windows\ Kits/8.0/include/shared:/c/Program\ Files\ \(x86\)/Windows\ Kits/8.0/include/um:/c/Program\ Files\ \(x86\)/Windows\ Kits/8.0/include/winrt:/c/Program\ Files\ \(x86\)/Windows\ Kits/8.0/include/winrt/wrl:/c/Program\ Files\ \(x86\)/Windows\ Kits/8.0/include/winrt/wrl/wrappers:${_VSPATH}/vc/include:${_VSPATH}/vc/atlmfc/include:/c/tools/sdks/dx10/include |
michael@0 | 17 | |
michael@0 | 18 | ## libs: win8 sdk x86 (32-bit) libs, msvc 10 (32-bit) std library, msvc 10 atl libs, directx sdk (32-bit) for d3d9 ## |
michael@0 | 19 | export LIBPATH=/c/Program\ Files\ \(x86\)/Windows\ Kits/8.0/Lib/win8/um/x86:${_VSPATH}/vc/lib:${_VSPATH}/vc/atlmfc/lib:/c/tools/sdks/dx10/lib |
michael@0 | 20 | export LIB=/c/Program\ Files\ \(x86\)/Windows\ Kits/8.0/Lib/win8/um/x86:${_VSPATH}/vc/lib:${_VSPATH}/vc/atlmfc/lib:/c/tools/sdks/dx10/lib |
michael@0 | 21 | |
michael@0 | 22 | ## paths: win8 sdk x86 (32-bit) tools, msvc 10 (32-bit) build toolchain, moz tools ## |
michael@0 | 23 | export PATH="/c/Program Files (x86)/Windows Kits/8.0/bin/x86:${_VSPATH}/Common7/IDE:${_VSPATH}/VC/BIN:${_VSPATH}/Common7/Tools:${_VSPATH}/VC/VCPackages:/c/mozilla-build/moztools:${PATH}" |
michael@0 | 24 | |
michael@0 | 25 | ## WindowsSDKDir ## |
michael@0 | 26 | export WINDOWSSDKDIR="/c/Program Files (x86)/Windows Kits/8.0/" |
michael@0 | 27 | |
michael@0 | 28 | . $topsrcdir/build/mozconfig.vs2010-common |
michael@0 | 29 | |
michael@0 | 30 | mk_export_correct_style LIB |
michael@0 | 31 | mk_export_correct_style LIBPATH |
michael@0 | 32 | mk_export_correct_style PATH |
michael@0 | 33 | mk_export_correct_style INCLUDE |
michael@0 | 34 | mk_export_correct_style WIN32_REDIST_DIR |
michael@0 | 35 | |
michael@0 | 36 | mk_add_options "export MOZ_TOOLS=$MOZ_TOOLS" |