From 842df807e704d07410fbff166e957478154ef3e6 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 5 Oct 2016 16:53:02 +0200
Subject: Add VC14u2 64-bit config, minor doc updates

---
 INSTALL      | 12 ++++++++----
 TODO         |  2 ++
 msvc-14u2-64 | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 42 insertions(+), 4 deletions(-)
 create mode 100755 msvc-14u2-64

diff --git a/INSTALL b/INSTALL
index dec36a9..7ddff1e 100644
--- a/INSTALL
+++ b/INSTALL
@@ -37,10 +37,9 @@ For Ubuntu, to install stable:
 # add-apt-repository ppa:ubuntu-wine/ppa
 # apt-get update
 # apt-get install --no-install-recommends winbind
-# apt-get install wine1.7 wine-mono4.5.6 wine-gecko2.40
+# apt-get install wine1.7
 # apt-get install p11-kit-modules:i386 libp11-kit-gnome-keyring:i386
 
-
 For Ubuntu, to install staging (into /opt/):
 
 # add-apt-repository ppa:wine/wine-builds
@@ -57,8 +56,13 @@ Configure Wine
 
 $ winecfg
 
-If it suggests installing some stuff, ignore it. Change the platform to
-Windows 7 (later version will probably also work).
+If it suggests installing some stuff (Gecko, Mono), refuse. Change the
+platform to Windows 7 (later version will probably also work).
+
+64-bit link.exe from Visual Studio 14 is known not to work with Mono that
+may have (still) been installed by winecfg. To remove it, run:
+
+$ wine64 uninstaller --remove '{E45D8920-A758-4088-B6C6-31DBB276992E}'
 
 
 Prepare to Copy Visual Studio
diff --git a/TODO b/TODO
index 2363b6c..b6589bd 100644
--- a/TODO
+++ b/TODO
@@ -1,3 +1,5 @@
+@@ Support for WINEPREFIX so that a separate .wine/ can be used.
+
 @@ When adding support to a new version need to check if any new options
    were added to any of the tools.
 
diff --git a/msvc-14u2-64 b/msvc-14u2-64
new file mode 100755
index 0000000..20b3405
--- /dev/null
+++ b/msvc-14u2-64
@@ -0,0 +1,32 @@
+#! /usr/bin/env bash
+
+# MSVC 14U2 64-bit setup/configuration.
+#
+# Should set the SDKBIN, VCBIN, VCDLL, INCLUDE, and LIB variables.
+#
+
+# SDK
+#
+SDK="C:\\Program Files (x86)\\Windows Kits\\10"
+SDKBIN="$SDK\\bin\\x64"
+SDKVER="10.0.10586.0"
+
+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="10.0.10586.0"
+
+INCLUDE="$CRT\\include\\$CRTVER\\ucrt;$INCLUDE"
+LIB="$CRT\\lib\\$CRTVER\\ucrt\\x64;$LIB"
+
+# VC
+#
+VC="C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\VC"
+VCBIN="$VC\\bin\\amd64"
+VCDLL="$VC\\bin\\amd64"
+
+INCLUDE="$VC\\include;$INCLUDE"
+LIB="$VC\\lib\\amd64;$LIB"
-- 
cgit v1.1