From 416f5ee22d062ae8ccbdeb7af896ef28c932f0db Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Fri, 20 Jan 2017 16:52:07 +0200 Subject: Add support for VC15RC2 --- buildfile | 24 ++++++++++++++++-------- cl-15rc2-32 | 10 ++++++++++ cl-15rc2-64 | 10 ++++++++++ lib-15rc2-32 | 10 ++++++++++ lib-15rc2-64 | 10 ++++++++++ link-15rc2-32 | 10 ++++++++++ link-15rc2-64 | 10 ++++++++++ msvc-15/msvc-15rc2-32 | 40 ++++++++++++++++++++++++++++++++++++++++ msvc-15/msvc-15rc2-64 | 40 ++++++++++++++++++++++++++++++++++++++++ mt-15rc2-32 | 10 ++++++++++ mt-15rc2-64 | 10 ++++++++++ rc-15rc2-32 | 10 ++++++++++ rc-15rc2-64 | 10 ++++++++++ 13 files changed, 196 insertions(+), 8 deletions(-) create mode 100755 cl-15rc2-32 create mode 100755 cl-15rc2-64 create mode 100755 lib-15rc2-32 create mode 100755 lib-15rc2-64 create mode 100755 link-15rc2-32 create mode 100755 link-15rc2-64 create mode 100755 msvc-15/msvc-15rc2-32 create mode 100755 msvc-15/msvc-15rc2-64 create mode 100755 mt-15rc2-32 create mode 100755 mt-15rc2-64 create mode 100755 rc-15rc2-32 create mode 100755 rc-15rc2-64 diff --git a/buildfile b/buildfile index 97c2935..0423ab9 100644 --- a/buildfile +++ b/buildfile @@ -7,27 +7,35 @@ sh{*}: extension = sh{*}: install = bin/ s = cl-11-32 lib-11-32 link-11-32 mt-11-32 rc-11-32 \ + msvc-11/{msvc-11-32} \ + \ cl-12-32 lib-12-32 link-12-32 mt-12-32 rc-12-32 \ + msvc-12/{msvc-12-32} \ + \ cl-14u0-32 lib-14u0-32 link-14u0-32 mt-14u0-32 rc-14u0-32 \ + msvc-14/{msvc-14u0-32} \ + \ cl-14u2-32 lib-14u2-32 link-14u2-32 mt-14u2-32 rc-14u2-32 \ cl-14u2-64 lib-14u2-64 link-14u2-64 mt-14u2-64 rc-14u2-64 \ + msvc-14/{msvc-14u2-32 msvc-14u2-64} \ + \ cl-14u3-32 lib-14u3-32 link-14u3-32 mt-14u3-32 rc-14u3-32 \ cl-14u3-64 lib-14u3-64 link-14u3-64 mt-14u3-64 rc-14u3-64 \ + msvc-14/{msvc-14u3-32 msvc-14u3-64} \ + \ cl-15rc1-32 lib-15rc1-32 link-15rc1-32 mt-15rc1-32 rc-15rc1-32 \ cl-15rc1-64 lib-15rc1-64 link-15rc1-64 mt-15rc1-64 rc-15rc1-64 \ + msvc-15/{msvc-15rc1-32 msvc-15rc1-64} \ + \ + cl-15rc2-32 lib-15rc2-32 link-15rc2-32 mt-15rc2-32 rc-15rc2-32 \ + cl-15rc2-64 lib-15rc2-64 link-15rc2-64 mt-15rc2-64 rc-15rc2-64 \ + msvc-15/{msvc-15rc2-32 msvc-15rc2-64} \ \ msvc-dispatch \ \ msvc-common/{msvc-cl-common msvc-common msvc-lib-common \ msvc-link-common msvc-mt-common msvc-rc-common \ - msvc-sdk-common} \ - \ - msvc-11/{msvc-11-32} \ - msvc-12/{msvc-12-32} \ - msvc-14/{msvc-14u0-32 \ - msvc-14u2-32 msvc-14u2-64 \ - msvc-14u3-32 msvc-14u3-64} \ - msvc-15/{msvc-15rc1-32 msvc-15rc1-64} + msvc-sdk-common} ./: msvc-common/exe{msvc-filter} sh{$s} \ diff --git a/cl-15rc2-32 b/cl-15rc2-32 new file mode 100755 index 0000000..0d34aea --- /dev/null +++ b/cl-15rc2-32 @@ -0,0 +1,10 @@ +#! /usr/bin/env bash + +# The contents of these files are all identical; the information is carries by +# the file name which should be in the form --. See +# msvc-dispatch for details. +# +src_exe="$(realpath ${BASH_SOURCE[0]})" +src_dir="$(dirname "$src_exe")" + +source "$src_dir/msvc-dispatch" diff --git a/cl-15rc2-64 b/cl-15rc2-64 new file mode 100755 index 0000000..0d34aea --- /dev/null +++ b/cl-15rc2-64 @@ -0,0 +1,10 @@ +#! /usr/bin/env bash + +# The contents of these files are all identical; the information is carries by +# the file name which should be in the form --. See +# msvc-dispatch for details. +# +src_exe="$(realpath ${BASH_SOURCE[0]})" +src_dir="$(dirname "$src_exe")" + +source "$src_dir/msvc-dispatch" diff --git a/lib-15rc2-32 b/lib-15rc2-32 new file mode 100755 index 0000000..0d34aea --- /dev/null +++ b/lib-15rc2-32 @@ -0,0 +1,10 @@ +#! /usr/bin/env bash + +# The contents of these files are all identical; the information is carries by +# the file name which should be in the form --. See +# msvc-dispatch for details. +# +src_exe="$(realpath ${BASH_SOURCE[0]})" +src_dir="$(dirname "$src_exe")" + +source "$src_dir/msvc-dispatch" diff --git a/lib-15rc2-64 b/lib-15rc2-64 new file mode 100755 index 0000000..0d34aea --- /dev/null +++ b/lib-15rc2-64 @@ -0,0 +1,10 @@ +#! /usr/bin/env bash + +# The contents of these files are all identical; the information is carries by +# the file name which should be in the form --. See +# msvc-dispatch for details. +# +src_exe="$(realpath ${BASH_SOURCE[0]})" +src_dir="$(dirname "$src_exe")" + +source "$src_dir/msvc-dispatch" diff --git a/link-15rc2-32 b/link-15rc2-32 new file mode 100755 index 0000000..0d34aea --- /dev/null +++ b/link-15rc2-32 @@ -0,0 +1,10 @@ +#! /usr/bin/env bash + +# The contents of these files are all identical; the information is carries by +# the file name which should be in the form --. See +# msvc-dispatch for details. +# +src_exe="$(realpath ${BASH_SOURCE[0]})" +src_dir="$(dirname "$src_exe")" + +source "$src_dir/msvc-dispatch" diff --git a/link-15rc2-64 b/link-15rc2-64 new file mode 100755 index 0000000..0d34aea --- /dev/null +++ b/link-15rc2-64 @@ -0,0 +1,10 @@ +#! /usr/bin/env bash + +# The contents of these files are all identical; the information is carries by +# the file name which should be in the form --. See +# msvc-dispatch for details. +# +src_exe="$(realpath ${BASH_SOURCE[0]})" +src_dir="$(dirname "$src_exe")" + +source "$src_dir/msvc-dispatch" diff --git a/msvc-15/msvc-15rc2-32 b/msvc-15/msvc-15rc2-32 new file mode 100755 index 0000000..3d529c6 --- /dev/null +++ b/msvc-15/msvc-15rc2-32 @@ -0,0 +1,40 @@ +#! /usr/bin/env bash + +# MSVC 15RC1 32-bit setup/configuration (note: using 64-to-32 cross-compiler). +# +# Should set the SDKBIN, VCBIN, VCDLL, INCLUDE, and LIB variables. +# +if [ -z "$MSVC_INSTALLDIR" ]; then + MSVC_INSTALLDIR="Microsoft Visual Studio 15.0" +fi + +if [ -z "$MSVC_SDKVERSION" ]; then + source "$src_dir/msvc-common/msvc-sdk-common" + MSVC_SDKVERSION="$(windows10_sdkversion)" +fi + +# SDK +# +SDK="C:\\Program Files (x86)\\Windows Kits\\10" +SDKBIN="$SDK\\bin\\x86" +SDKVER="$MSVC_SDKVERSION.0" # Originally "10.0.14393". + +INCLUDE="$SDK\\include\\$SDKVER\\shared;$SDK\\include\\$SDKVER\\um;$SDK\\include\\$SDKVER\\winrt" +LIB="$SDK\\lib\\$SDKVER\\um\\x86" + +# CRT +# +CRT="C:\\Program Files (x86)\\Windows Kits\\10" +CRTVER="$MSVC_SDKVERSION.0" # Originally "10.0.14393". + +INCLUDE="$CRT\\include\\$CRTVER\\ucrt;$INCLUDE" +LIB="$CRT\\lib\\$CRTVER\\ucrt\\x86;$LIB" + +# VC +# +VC="C:\\Program Files (x86)\\$MSVC_INSTALLDIR\\VC\\Tools\\MSVC\\14.10.24728" +VCBIN="$VC\\bin\\HostX64\\x86" +VCDLL="$VC\\bin\\HostX64\\x64" + +INCLUDE="$VC\\include;$INCLUDE" +LIB="$VC\\lib\\x86;$LIB" diff --git a/msvc-15/msvc-15rc2-64 b/msvc-15/msvc-15rc2-64 new file mode 100755 index 0000000..5a111de --- /dev/null +++ b/msvc-15/msvc-15rc2-64 @@ -0,0 +1,40 @@ +#! /usr/bin/env bash + +# MSVC 15RC1 64-bit setup/configuration. +# +# Should set the SDKBIN, VCBIN, VCDLL, INCLUDE, and LIB variables. +# +if [ -z "$MSVC_INSTALLDIR" ]; then + MSVC_INSTALLDIR="Microsoft Visual Studio 15.0" +fi + +if [ -z "$MSVC_SDKVERSION" ]; then + source "$src_dir/msvc-common/msvc-sdk-common" + MSVC_SDKVERSION="$(windows10_sdkversion)" +fi + +# SDK +# +SDK="C:\\Program Files (x86)\\Windows Kits\\10" +SDKBIN="$SDK\\bin\\x64" +SDKVER="$MSVC_SDKVERSION.0" # Originally "10.0.14393". + +INCLUDE="$SDK\\include\\$SDKVER\\shared;$SDK\\include\\$SDKVER\\um;$SDK\\include\\$SDKVER\\winrt" +LIB="$SDK\\lib\\$SDKVER\\um\\x64" + +# CRT +# +CRT="C:\\Program Files (x86)\\Windows Kits\\10" +CRTVER="$MSVC_SDKVERSION.0" # Originally "10.0.14393". + +INCLUDE="$CRT\\include\\$CRTVER\\ucrt;$INCLUDE" +LIB="$CRT\\lib\\$CRTVER\\ucrt\\x64;$LIB" + +# VC +# +VC="C:\\Program Files (x86)\\$MSVC_INSTALLDIR\\VC\\Tools\\MSVC\\14.10.24728" +VCBIN="$VC\\bin\\HostX64\\x64" +VCDLL="$VC\\bin\\HostX64\\x64" + +INCLUDE="$VC\\include;$INCLUDE" +LIB="$VC\\lib\\x64;$LIB" diff --git a/mt-15rc2-32 b/mt-15rc2-32 new file mode 100755 index 0000000..0d34aea --- /dev/null +++ b/mt-15rc2-32 @@ -0,0 +1,10 @@ +#! /usr/bin/env bash + +# The contents of these files are all identical; the information is carries by +# the file name which should be in the form --. See +# msvc-dispatch for details. +# +src_exe="$(realpath ${BASH_SOURCE[0]})" +src_dir="$(dirname "$src_exe")" + +source "$src_dir/msvc-dispatch" diff --git a/mt-15rc2-64 b/mt-15rc2-64 new file mode 100755 index 0000000..0d34aea --- /dev/null +++ b/mt-15rc2-64 @@ -0,0 +1,10 @@ +#! /usr/bin/env bash + +# The contents of these files are all identical; the information is carries by +# the file name which should be in the form --. See +# msvc-dispatch for details. +# +src_exe="$(realpath ${BASH_SOURCE[0]})" +src_dir="$(dirname "$src_exe")" + +source "$src_dir/msvc-dispatch" diff --git a/rc-15rc2-32 b/rc-15rc2-32 new file mode 100755 index 0000000..0d34aea --- /dev/null +++ b/rc-15rc2-32 @@ -0,0 +1,10 @@ +#! /usr/bin/env bash + +# The contents of these files are all identical; the information is carries by +# the file name which should be in the form --. See +# msvc-dispatch for details. +# +src_exe="$(realpath ${BASH_SOURCE[0]})" +src_dir="$(dirname "$src_exe")" + +source "$src_dir/msvc-dispatch" diff --git a/rc-15rc2-64 b/rc-15rc2-64 new file mode 100755 index 0000000..0d34aea --- /dev/null +++ b/rc-15rc2-64 @@ -0,0 +1,10 @@ +#! /usr/bin/env bash + +# The contents of these files are all identical; the information is carries by +# the file name which should be in the form --. See +# msvc-dispatch for details. +# +src_exe="$(realpath ${BASH_SOURCE[0]})" +src_dir="$(dirname "$src_exe")" + +source "$src_dir/msvc-dispatch" -- cgit v1.1