diff options
| author | dgp@users.sourceforge.net <dgp> | 2012-07-17 16:25:44 (GMT) |
|---|---|---|
| committer | dgp@users.sourceforge.net <dgp> | 2012-07-17 16:25:44 (GMT) |
| commit | 26e466870dedae5980bcf7238ff5d021ed78ba9c (patch) | |
| tree | ea578bce789e57e9f75c4a1fae2e4fb57f907cd7 | |
| parent | 3828951f06ace4de9716e9dd67966698d6a3a06b (diff) | |
| parent | 4cf304a0f40533d4ab5a997268c6ce1cc238eb4f (diff) | |
| download | tk-26e466870dedae5980bcf7238ff5d021ed78ba9c.zip tk-26e466870dedae5980bcf7238ff5d021ed78ba9c.tar.gz tk-26e466870dedae5980bcf7238ff5d021ed78ba9c.tar.bz2 | |
merge 8.5
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | win/makefile.vc | 7 |
2 files changed, 7 insertions, 4 deletions
@@ -1,3 +1,7 @@ +2012-07-17 Jan Nijtmans <nijtmans@users.sf.net> + + * win/makefile.vc: [Bug 3544932]: Visual studio compiler check fails + 2012-07-08 Jan Nijtmans <nijtmans@users.sf.net> * generic/tkIntXlibDecls.h: [Bug 3541305]: Xfree/Xsync... diff --git a/win/makefile.vc b/win/makefile.vc index 89dbe30..2f60436 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -12,10 +12,9 @@ # Copyright (c) 2001-2004 David Gravereaux. #------------------------------------------------------------------------------ -# Check to see we are configured to build with MSVC (MSDEVDIR or MSVCDIR) -# or with the MS Platform SDK (MSSDK). Visual Studio .NET 2003 and 2005 define -# VCINSTALLDIR instead. -!if !defined(MSDEVDIR) && !defined(MSVCDIR) && !defined(MSSDK) && !defined(VCINSTALLDIR) +# Check to see we are configured to build with MSVC (MSDEVDIR, MSVCDIR or +# VCINSTALLDIR) or with the MS Platform SDK (MSSDK or WindowsSDKDir) +!if !defined(MSDEVDIR) && !defined(MSVCDIR) && !defined(VCINSTALLDIR) && !defined(MSSDK) && !defined(WINDOWSSDKDIR) MSG = ^ You need to run vcvars32.bat from Developer Studio or setenv.bat from the^ Platform SDK first to setup the environment. Jump to this line to read^ |