From 463d7d6d576b4e4dae42264343f1592758d0cbf5 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Sat, 25 May 2019 18:10:48 +0300 Subject: Add support for 16.1 --- INSTALL | 2 +- cl-16.1-32 | 10 ++++++++++ cl-16.1-64 | 10 ++++++++++ lib-16.1-32 | 10 ++++++++++ lib-16.1-64 | 10 ++++++++++ link-16.1-32 | 10 ++++++++++ link-16.1-64 | 10 ++++++++++ msvc-16/msvc-16.1-32 | 46 ++++++++++++++++++++++++++++++++++++++++++++++ msvc-16/msvc-16.1-64 | 45 +++++++++++++++++++++++++++++++++++++++++++++ mt-16.1-32 | 10 ++++++++++ mt-16.1-64 | 10 ++++++++++ rc-16.1-32 | 10 ++++++++++ rc-16.1-64 | 10 ++++++++++ 13 files changed, 192 insertions(+), 1 deletion(-) create mode 100755 cl-16.1-32 create mode 100755 cl-16.1-64 create mode 100755 lib-16.1-32 create mode 100755 lib-16.1-64 create mode 100755 link-16.1-32 create mode 100755 link-16.1-64 create mode 100755 msvc-16/msvc-16.1-32 create mode 100755 msvc-16/msvc-16.1-64 create mode 100755 mt-16.1-32 create mode 100755 mt-16.1-64 create mode 100755 rc-16.1-32 create mode 100755 rc-16.1-64 diff --git a/INSTALL b/INSTALL index e6b7ef7..677d495 100644 --- a/INSTALL +++ b/INSTALL @@ -410,7 +410,7 @@ Create the driver scripts corresponding to each new configuration. For example (replace and ): for t in cl link lib mt rc; do \ - cp cl-11-32 $t--; done + cp $t-16.0-32 $t--; done Copy and Setup Visual Studio on Linux diff --git a/cl-16.1-32 b/cl-16.1-32 new file mode 100755 index 0000000..0d34aea --- /dev/null +++ b/cl-16.1-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-16.1-64 b/cl-16.1-64 new file mode 100755 index 0000000..0d34aea --- /dev/null +++ b/cl-16.1-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-16.1-32 b/lib-16.1-32 new file mode 100755 index 0000000..0d34aea --- /dev/null +++ b/lib-16.1-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-16.1-64 b/lib-16.1-64 new file mode 100755 index 0000000..0d34aea --- /dev/null +++ b/lib-16.1-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-16.1-32 b/link-16.1-32 new file mode 100755 index 0000000..0d34aea --- /dev/null +++ b/link-16.1-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-16.1-64 b/link-16.1-64 new file mode 100755 index 0000000..0d34aea --- /dev/null +++ b/link-16.1-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-16/msvc-16.1-32 b/msvc-16/msvc-16.1-32 new file mode 100755 index 0000000..65def42 --- /dev/null +++ b/msvc-16/msvc-16.1-32 @@ -0,0 +1,46 @@ +#! /usr/bin/env bash + +# file : msvc-16/msvc-16.1-32 +# copyright : Copyright (c) 2014-2019 Code Synthesis Ltd +# license : MIT; see accompanying LICENSE file + +# MSVC 16 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 16.1" +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" +SDKVER="$MSVC_SDKVERSION.0" +SDKBIN="$SDK\\bin\\$SDKVER\\x86" + +INCLUDE="$SDK\\include\\$SDKVER\\shared;$SDK\\include\\$SDKVER\\um;$SDK\\include\\$SDKVER\\winrt;$SDK\\include\\$SDKVER\\cppwinrt" +LIB="$SDK\\lib\\$SDKVER\\um\\x86" + +# CRT +# +CRT="C:\\Program Files (x86)\\Windows Kits\\10" +CRTVER="$MSVC_SDKVERSION.0" + +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.21.27702" + +VCBIN="$VC\\bin\\HostX64\\x86" +VCDLL="$VC\\bin\\HostX64\\x64" + +INCLUDE="$VC\\include;$INCLUDE" +IFCPATH="$VC\\ifc\\x86" +LIB="$VC\\lib\\x86;$LIB" diff --git a/msvc-16/msvc-16.1-64 b/msvc-16/msvc-16.1-64 new file mode 100755 index 0000000..ce6c433 --- /dev/null +++ b/msvc-16/msvc-16.1-64 @@ -0,0 +1,45 @@ +#! /usr/bin/env bash + +# file : msvc-16/msvc-16.1-64 +# copyright : Copyright (c) 2014-2019 Code Synthesis Ltd +# license : MIT; see accompanying LICENSE file + +# MSVC 64-bit setup/configuration. +# +# Should set the SDKBIN, VCBIN, VCDLL, INCLUDE, and LIB variables. +# +if [ -z "$MSVC_INSTALLDIR" ]; then + MSVC_INSTALLDIR="Microsoft Visual Studio 16.1" +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" +SDKVER="$MSVC_SDKVERSION.0" +SDKBIN="$SDK\\bin\\$SDKVER\\x64" + +INCLUDE="$SDK\\include\\$SDKVER\\shared;$SDK\\include\\$SDKVER\\um;$SDK\\include\\$SDKVER\\winrt;$SDK\\include\\$SDKVER\\cppwinrt" +LIB="$SDK\\lib\\$SDKVER\\um\\x64" + +# CRT +# +CRT="C:\\Program Files (x86)\\Windows Kits\\10" +CRTVER="$MSVC_SDKVERSION.0" + +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.21.27702" +VCBIN="$VC\\bin\\HostX64\\x64" +VCDLL="$VC\\bin\\HostX64\\x64" + +INCLUDE="$VC\\include;$INCLUDE" +IFCPATH="$VC\\ifc\\x64" +LIB="$VC\\lib\\x64;$LIB" diff --git a/mt-16.1-32 b/mt-16.1-32 new file mode 100755 index 0000000..0d34aea --- /dev/null +++ b/mt-16.1-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-16.1-64 b/mt-16.1-64 new file mode 100755 index 0000000..0d34aea --- /dev/null +++ b/mt-16.1-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-16.1-32 b/rc-16.1-32 new file mode 100755 index 0000000..0d34aea --- /dev/null +++ b/rc-16.1-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-16.1-64 b/rc-16.1-64 new file mode 100755 index 0000000..0d34aea --- /dev/null +++ b/rc-16.1-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