diff --git a/build/win32/mozconfig.vs2013-win64 b/build/win32/mozconfig.vs2013-win64 new file mode 100644 index 0000000000..0adf6cc05e --- /dev/null +++ b/build/win32/mozconfig.vs2013-win64 @@ -0,0 +1,28 @@ +_VSPATH="/c/tools/vs2013" +export WIN32_REDIST_DIR=${_VSPATH}/VC/redist/x86/Microsoft.VC120.CRT + +## moz tools location for 64-bit builders ## +export MOZ_TOOLS=C:/mozilla-build/moztools + +## includes: win8.1 sdk includes, winrt headers for metro, msvc std library, directx sdk for d3d9 ## +export INCLUDE=/c/Program\ Files\ \(x86\)/Windows\ Kits/8.1/include/shared:/c/Program\ Files\ \(x86\)/Windows\ Kits/8.1/include/um:/c/Program\ Files\ \(x86\)/Windows\ Kits/8.1/include/winrt:/c/Program\ Files\ \(x86\)/Windows\ Kits/8.1/include/winrt/wrl:/c/Program\ Files\ \(x86\)/Windows\ Kits/8.1/include/winrt/wrl/wrappers:${_VSPATH}/vc/include:${_VSPATH}/vc/atlmfc/include:/c/tools/sdks/dx10/include + +## libs: win8.1 sdk x86 (32-bit) libs, msvc (32-bit) std library, msvc atl libs, directx sdk (32-bit) for d3d9 ## +export LIBPATH=/c/Program\ Files\ \(x86\)/Windows\ Kits/8.1/Lib/winv6.3/um/x86:${_VSPATH}/vc/lib:${_VSPATH}/vc/atlmfc/lib:/c/tools/sdks/dx10/lib +export LIB=/c/Program\ Files\ \(x86\)/Windows\ Kits/8.1/Lib/winv6.3/um/x86:${_VSPATH}/vc/lib:${_VSPATH}/vc/atlmfc/lib:/c/tools/sdks/dx10/lib + +## paths: win8.1 sdk x86 (32-bit) tools, msvc (64-bit compiling 32-bit) build toolchain, moz tools ## +export PATH="/c/Program Files (x86)/Windows Kits/8.1/bin/x86:${_VSPATH}/Common7/IDE:${_VSPATH}/VC/BIN/amd64_x86:${_VSPATH}/VC/BIN/amd64:${_VSPATH}/Common7/Tools:${_VSPATH}/VC/VCPackages:/c/mozilla-build/moztools:${PATH}" + +## WindowsSDKDir ## +export WINDOWSSDKDIR="/c/Program Files (x86)/Windows Kits/8.1/" + +. $topsrcdir/build/mozconfig.vs-common + +mk_export_correct_style LIB +mk_export_correct_style LIBPATH +mk_export_correct_style PATH +mk_export_correct_style INCLUDE +mk_export_correct_style WIN32_REDIST_DIR + +mk_add_options "export MOZ_TOOLS=$MOZ_TOOLS" diff --git a/mail/config/mozconfigs/win32/debug b/mail/config/mozconfigs/win32/debug index 1cb1e305c2..1cadd8826f 100644 --- a/mail/config/mozconfigs/win32/debug +++ b/mail/config/mozconfigs/win32/debug @@ -16,7 +16,7 @@ export MOZ_DEBUG_SYMBOLS=1 export MOZ_PACKAGE_JSSHELL=1 if test "$PROCESSOR_ARCHITECTURE" = "AMD64" -o "$PROCESSOR_ARCHITEW6432" = "AMD64"; then - . $topsrcdir/build/win32/mozconfig.vs2010-win64 + . $topsrcdir/build/win32/mozconfig.vs2013-win64 else . $topsrcdir/build/win32/mozconfig.vs2010 fi diff --git a/mail/config/mozconfigs/win32/l10n-mozconfig b/mail/config/mozconfigs/win32/l10n-mozconfig index 2795024f53..07f39bcf91 100644 --- a/mail/config/mozconfigs/win32/l10n-mozconfig +++ b/mail/config/mozconfigs/win32/l10n-mozconfig @@ -16,7 +16,7 @@ export MOZ_DEBUG_SYMBOLS=1 export MOZILLA_OFFICIAL=1 if test "$PROCESSOR_ARCHITECTURE" = "AMD64" -o "$PROCESSOR_ARCHITEW6432" = "AMD64"; then - . $topsrcdir/build/win32/mozconfig.vs2010-win64 + . $topsrcdir/build/win32/mozconfig.vs2013-win64 else . $topsrcdir/build/win32/mozconfig.vs2010 fi diff --git a/mail/config/mozconfigs/win32/nightly b/mail/config/mozconfigs/win32/nightly index 31ddca2316..04dcf7852b 100644 --- a/mail/config/mozconfigs/win32/nightly +++ b/mail/config/mozconfigs/win32/nightly @@ -21,7 +21,7 @@ export MOZILLA_OFFICIAL=1 export MOZ_PACKAGE_JSSHELL=1 if test "$PROCESSOR_ARCHITECTURE" = "AMD64" -o "$PROCESSOR_ARCHITEW6432" = "AMD64"; then - . $topsrcdir/build/win32/mozconfig.vs2010-win64 + . $topsrcdir/build/win32/mozconfig.vs2013-win64 else . $topsrcdir/build/win32/mozconfig.vs2010 fi diff --git a/mail/config/mozconfigs/win32/release b/mail/config/mozconfigs/win32/release index 9873267b68..72b9032a34 100644 --- a/mail/config/mozconfigs/win32/release +++ b/mail/config/mozconfigs/win32/release @@ -20,7 +20,7 @@ export MOZILLA_OFFICIAL=1 export MOZ_PACKAGE_JSSHELL=1 if test "$PROCESSOR_ARCHITECTURE" = "AMD64" -o "$PROCESSOR_ARCHITEW6432" = "AMD64"; then - . $topsrcdir/build/win32/mozconfig.vs2010-win64 + . $topsrcdir/build/win32/mozconfig.vs2013-win64 else . $topsrcdir/build/win32/mozconfig.vs2010 fi diff --git a/mail/config/mozconfigs/win64/debug b/mail/config/mozconfigs/win64/debug index f53042e1b7..b28578a763 100644 --- a/mail/config/mozconfigs/win64/debug +++ b/mail/config/mozconfigs/win64/debug @@ -14,7 +14,7 @@ export MOZILLA_OFFICIAL=1 # Package js shell export MOZ_PACKAGE_JSSHELL=1 -. $topsrcdir/build/win64/mozconfig.vs2010 +. $topsrcdir/build/win64/mozconfig.vs2013 # Set up mapi includes (must be done after visual studio setup) export INCLUDE=$INCLUDE:/c/Office\ 2010\ Developer\ Resources/Outlook\ 2010\ MAPI\ Headers diff --git a/mail/config/mozconfigs/win64/l10n-mozconfig b/mail/config/mozconfigs/win64/l10n-mozconfig index 98c8052ddb..49a534e084 100644 --- a/mail/config/mozconfigs/win64/l10n-mozconfig +++ b/mail/config/mozconfigs/win64/l10n-mozconfig @@ -14,7 +14,7 @@ ac_add_options --enable-calendar # Needed to enable breakpad in application.ini export MOZILLA_OFFICIAL=1 -. $topsrcdir/build/win64/mozconfig.vs2010 +. $topsrcdir/build/win64/mozconfig.vs2013 # Set up mapi includes (must be done after visual studio setup) export INCLUDE=$INCLUDE:/c/Office\ 2010\ Developer\ Resources/Outlook\ 2010\ MAPI\ Headers diff --git a/mail/config/mozconfigs/win64/nightly b/mail/config/mozconfigs/win64/nightly index a1b323da92..3140702af6 100644 --- a/mail/config/mozconfigs/win64/nightly +++ b/mail/config/mozconfigs/win64/nightly @@ -19,7 +19,7 @@ export MOZ_TELEMETRY_REPORTING=1 # Package js shell export MOZ_PACKAGE_JSSHELL=1 -. $topsrcdir/build/win64/mozconfig.vs2010 +. $topsrcdir/build/win64/mozconfig.vs2013 # Set up mapi includes (must be done after visual studio setup) export INCLUDE=$INCLUDE:/c/Office\ 2010\ Developer\ Resources/Outlook\ 2010\ MAPI\ Headers