summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <jan.nijtmans@noemail.net>2012-07-17 13:10:41 (GMT)
committerjan.nijtmans <jan.nijtmans@noemail.net>2012-07-17 13:10:41 (GMT)
commit8e6716b99692bf693ece8b24a72a24d2a329d056 (patch)
treeceb4e290ec74d8f86fcb8c48113e470f3111787c
parentb7345103e412cb3c7f4c210d5409732a006d7cc2 (diff)
downloadtk-8e6716b99692bf693ece8b24a72a24d2a329d056.zip
tk-8e6716b99692bf693ece8b24a72a24d2a329d056.tar.gz
tk-8e6716b99692bf693ece8b24a72a24d2a329d056.tar.bz2
[Bug 3544932]: Visual studio compiler check fails
FossilOrigin-Name: f277df6f50ae30b7f818e903ec8af1e29cb41e96
-rw-r--r--ChangeLog4
-rw-r--r--win/makefile.vc7
2 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 82e10b6..bb34f20 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 32dd4d5..482cf13 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -12,10 +12,9 @@
# Copyright (c) 2001-2002 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^