summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--win/makefile.vc10
2 files changed, 12 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index c954131..1c5f53e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-11-15 David Gravereaux <davygrvy@pobox.com>
+
+ * win/makefile.vc: Fixes pkgIndex.tcl generation so a symbols build
+ is loaded when Tcl is symbols.
+
2003-11-15 Vince Darley <vincentdarley@users.sourceforge.net>
* generic/tkTextDisp.c:
diff --git a/win/makefile.vc b/win/makefile.vc
index 7928fc6..565d55d 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -12,7 +12,7 @@
# Copyright (c) 2001-2002 David Gravereaux.
#
#------------------------------------------------------------------------------
-# RCS: @(#) $Id: makefile.vc,v 1.74 2003/10/14 15:35:52 patthoyts Exp $
+# RCS: @(#) $Id: makefile.vc,v 1.75 2003/11/16 06:07:00 davygrvy Exp $
#------------------------------------------------------------------------------
!if "$(MSVCDIR)" == ""
@@ -533,8 +533,12 @@ install-binaries:
!if !$(STATIC_BUILD)
@echo Creating package index "$(SCRIPT_INSTALL_DIR)\pkgIndex.tcl"
-del "$(SCRIPT_INSTALL_DIR)\pkgIndex.tcl"
- echo if {[package vcompare [package provide Tcl] $(TCL_DOTVERSION)] != 0} { return } > "$(OUT_DIR)\pkgIndex.tcl"
- echo package ifneeded Tk $(DOTVERSION) [list load [file join $$dir .. .. bin $(TKLIBNAME)] Tk] >>"$(OUT_DIR)\pkgIndex.tcl"
+ echo if {[package vcompare [package provide Tcl] $(TCL_DOTVERSION)] != 0} { return }> "$(OUT_DIR)\pkgIndex.tcl"
+ echo if {[info exists ::tcl_platform(debug)]} {>> "$(OUT_DIR)\pkgIndex.tcl"
+ echo package ifneeded Tk $(DOTVERSION) [list load [file join $$dir .. .. bin tk$(VERSION)g.dll] Tk]>> "$(OUT_DIR)\pkgIndex.tcl"
+ echo } else {>> "$(OUT_DIR)\pkgIndex.tcl"
+ echo package ifneeded Tk $(DOTVERSION) [list load [file join $$dir .. .. bin tk$(VERSION).dll] Tk]>> "$(OUT_DIR)\pkgIndex.tcl"
+ echo }>> "$(OUT_DIR)\pkgIndex.tcl"
$(CPY) "$(OUT_DIR)\pkgIndex.tcl" "$(SCRIPT_INSTALL_DIR)\"
!endif