summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2012-07-17 16:25:44 (GMT)
committerdgp <dgp@users.sourceforge.net>2012-07-17 16:25:44 (GMT)
commitaae0611f0e1e75c8200093870815484e71b4abf5 (patch)
treeea578bce789e57e9f75c4a1fae2e4fb57f907cd7 /win
parentb6e02ef4c46470f2b225870960b3565c9ec4c5a6 (diff)
parentb066ff8b40c073f09c251eff871a3574e6c94247 (diff)
downloadtk-aae0611f0e1e75c8200093870815484e71b4abf5.zip
tk-aae0611f0e1e75c8200093870815484e71b4abf5.tar.gz
tk-aae0611f0e1e75c8200093870815484e71b4abf5.tar.bz2
merge 8.5
Diffstat (limited to 'win')
-rw-r--r--win/makefile.vc7
1 files changed, 3 insertions, 4 deletions
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^