diff --git a/INSTALL.txt b/INSTALL.txt index 5b96efcad5..35be1bbb4e 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -57,7 +57,7 @@ On Unix (including Linux) and Mac OS X, `make' (or `make in-place') creates a build in the "racket" directory. On Windows with Microsoft Visual Studio (any version between 2008/9.0 -and 2013/12.0), `nmake win32-in-place' creates a build in the "racket" +and 2015/14.0), `nmake win32-in-place' creates a build in the "racket" directory. For information on configuring your command-line environment for Visual Studio, see "racket/src/worksp/README". diff --git a/racket/collects/compiler/private/xform.rkt b/racket/collects/compiler/private/xform.rkt index 534fabb736..42b6988036 100644 --- a/racket/collects/compiler/private/xform.rkt +++ b/racket/collects/compiler/private/xform.rkt @@ -907,6 +907,7 @@ __error __errno_location __toupper __tolower ___errno __attribute__ __mode__ ; not really functions in gcc __iob_func ; VC 8 + __acrt_iob_func ; VC 14.0 (2015) |GetStdHandle| |__CFStringMakeConstantString| _vswprintf_c diff --git a/racket/src/worksp/genvsx.c b/racket/src/worksp/genvsx.c index f30dd79505..02b4d0acab 100644 --- a/racket/src/worksp/genvsx.c +++ b/racket/src/worksp/genvsx.c @@ -86,7 +86,10 @@ int main() { const char *vers = "100"; int i; -#if _MSC_VER >= 1800 +#if _MSC_VER >= 1900 + /* VS 2015 */ + vers = "140"; +#elif _MSC_VER >= 1800 /* VS 2013 */ vers = "120"; #elif _MSC_VER >= 1700