summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--library/dde/pkgIndex.tcl4
-rw-r--r--win/makefile.vc7
3 files changed, 10 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index a76590b..427b3e4 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-16 Donal K. Fellows <dkf@users.sf.net>
* generic/tclUtil.c (UpdateStringOfEndOffset): [Bug 3544658]: Stop
@@ -7,7 +11,7 @@
2012-07-16 Jan Nijtmans <nijtmans@users.sf.net>
* library/reg/pkgIndex.tcl: Make registry 1.3 package dynamically
- loadable in Tcl 8.4.20.
+ loadable when ::tcl::pkgconfig is available.
2012-07-11 Jan Nijtmans <nijtmans@users.sf.net>
diff --git a/library/dde/pkgIndex.tcl b/library/dde/pkgIndex.tcl
index fc5b973..ce8276b 100644
--- a/library/dde/pkgIndex.tcl
+++ b/library/dde/pkgIndex.tcl
@@ -1,5 +1,5 @@
-if {![package vsatisfies [package provide Tcl] 8.5]} return
-if {[info sharedlibextension] ne ".dll"} return
+if {([info commands ::tcl::pkgconfig] eq "")
+ || ([info sharedlibextension] ne ".dll")} return
if {[::tcl::pkgconfig get debug]} {
package ifneeded dde 1.4.0b1 [list load [file join $dir tcldde14g.dll] dde]
} else {
diff --git a/win/makefile.vc b/win/makefile.vc
index 96ae7f6..bcae7f8 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -13,10 +13,9 @@
# Copyright (c) 2003-2008 Pat Thoyts.
#------------------------------------------------------------------------------
-# 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^