summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpatthoyts <patthoyts@users.sourceforge.net>2007-09-11 00:13:07 (GMT)
committerpatthoyts <patthoyts@users.sourceforge.net>2007-09-11 00:13:07 (GMT)
commitc6b29b12bf3680de4f95fd5d98bf69005ef1d606 (patch)
treefd42dacf0945334c527ba09779555b94c95528f0
parented4e01f66535acdac3cd68b707172137ad4e2a2a (diff)
downloadtk-c6b29b12bf3680de4f95fd5d98bf69005ef1d606.zip
tk-c6b29b12bf3680de4f95fd5d98bf69005ef1d606.tar.gz
tk-c6b29b12bf3680de4f95fd5d98bf69005ef1d606.tar.bz2
Fix for AMD64 symbols builds
-rw-r--r--ChangeLog5
-rw-r--r--win/makefile.vc30
-rw-r--r--win/rules.vc5
3 files changed, 25 insertions, 15 deletions
diff --git a/ChangeLog b/ChangeLog
index 585539a..54b9d5b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-11 Pat Thoyts <patthoyts@users.sourceforge.net>
+
+ * win/makefile.vc: Fix for AMD64 symbols target builds.
+ * win/rules.vc:
+
2007-09-05 Pat Thoyts <patthoyts@users.sourceforge.net>
* win/rc/tk_base.rc: Backported the BASE_NO_TK_ICON patch to assist in
diff --git a/win/makefile.vc b/win/makefile.vc
index 097b3e6..4a94819 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.67.2.17 2006/09/26 23:55:50 patthoyts Exp $
+# RCS: @(#) $Id: makefile.vc,v 1.67.2.18 2007/09/11 00:13:07 patthoyts Exp $
#------------------------------------------------------------------------------
# Check to see we are configured to build with MSVC (MSDEVDIR or MSVCDIR)
@@ -103,7 +103,7 @@ the build instructions.
# memdbg = Enables the debugging memory allocator.
# compdbg = Enables byte compilation logging.
#
-# MACHINE=(IX86|IA64|ALPHA)
+# MACHINE=(IX86|IA64|AMD64|ALPHA)
# Set the machine type used for the compiler, linker, and
# resource compiler. This hook is needed to tell the tools
# when alternate platforms are requested. IX86 is the default
@@ -360,11 +360,11 @@ cdebug = -O2 $(OPTIMIZATIONS)
!else
cdebug =
!endif
-!else if "$(MACHINE)" == "IA64"
+!else if "$(MACHINE)" == "IA64" || "$(MACHINE)" == "AMD64"
### Warnings are too many, can't support warnings into errors.
-cdebug = -Z7 -Od $(DEBUGFLAGS)
+cdebug = -Zi -Od $(DEBUGFLAGS)
!else
-cdebug = -Z7 -WX $(DEBUGFLAGS)
+cdebug = -Zi -WX $(DEBUGFLAGS)
!endif
### Declarations common to all compiler options
@@ -448,7 +448,7 @@ guilibs = $(baselibs) shell32.lib gdi32.lib comdlg32.lib winspool.lib imm32.li
#---------------------------------------------------------------------
!if "$(TESTPAT)" != ""
-TESTFLAGS = -file $(TESTPAT)
+TESTFLAGS = $(TESTFLAGS) -file $(TESTPAT)
!endif
@@ -543,6 +543,7 @@ $(CAT32): $(_TCLDIR)\win\cat.c
$(_VC_MANIFEST_EMBED_EXE)
install-binaries:
+ @echo installing binaries in "$(BIN_INSTALL_DIR)"
@$(CPY) "$(WISH)" "$(BIN_INSTALL_DIR)\"
!if $(TKLIB) != $(TKIMPLIB)
@$(CPY) "$(TKLIB)" "$(BIN_INSTALL_DIR)\"
@@ -550,25 +551,26 @@ install-binaries:
@$(CPY) "$(TKIMPLIB)" "$(LIB_INSTALL_DIR)\"
@$(CPY) "$(TKSTUBLIB)" "$(LIB_INSTALL_DIR)\"
!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"
- $(CPY) "$(OUT_DIR)\pkgIndex.tcl" "$(SCRIPT_INSTALL_DIR)\"
+ @-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"
+ @$(CPY) "$(OUT_DIR)\pkgIndex.tcl" "$(SCRIPT_INSTALL_DIR)\"
!endif
install-libraries:
+ @echo installing headers in "$(INCLUDE_INSTALL_DIR)"
@$(CPY) "$(GENERICDIR)\tk.h" "$(INCLUDE_INSTALL_DIR)\"
@$(CPY) "$(GENERICDIR)\tkDecls.h" "$(INCLUDE_INSTALL_DIR)\"
@$(CPY) "$(GENERICDIR)\tkPlatDecls.h" "$(INCLUDE_INSTALL_DIR)\"
@$(CPY) "$(GENERICDIR)\tkIntXlibDecls.h" "$(INCLUDE_INSTALL_DIR)\"
@$(CPY) "$(XLIBDIR)\X11\*.h" "$(INCLUDE_INSTALL_DIR)\X11\"
+ @echo installing library files in "$(SCRIPT_INSTALL_DIR)"
@$(CPY) "$(ROOT)\library\*" "$(SCRIPT_INSTALL_DIR)\"
- @$(CPY) "$(ROOT)\library\*" "$(SCRIPT_INSTALL_DIR)\"
- @$(CPY) "$(ROOT)\library\demos\*" "$(SCRIPT_INSTALL_DIR)\demos\"
- @$(CPY) "$(ROOT)\library\demos\images\*" "$(SCRIPT_INSTALL_DIR)\demos\images\"
@$(CPY) "$(ROOT)\library\images\*" "$(SCRIPT_INSTALL_DIR)\images\"
@$(CPY) "$(ROOT)\library\msgs\*" "$(SCRIPT_INSTALL_DIR)\msgs\"
+ @echo installing demo files in "$(SCRIPT_INSTALL_DIR)\demos"
+ @$(CPY) "$(ROOT)\library\demos\*" "$(SCRIPT_INSTALL_DIR)\demos\"
+ @$(CPY) "$(ROOT)\library\demos\images\*" "$(SCRIPT_INSTALL_DIR)\demos\images\"
#---------------------------------------------------------------------
diff --git a/win/rules.vc b/win/rules.vc
index 235802e..678f4b3 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -11,7 +11,7 @@
# Copyright (c) 2003-2006 Patrick Thoyts
#
#------------------------------------------------------------------------------
-# RCS: @(#) $Id: rules.vc,v 1.5.2.8 2006/10/31 15:18:28 patthoyts Exp $
+# RCS: @(#) $Id: rules.vc,v 1.5.2.9 2007/09/11 00:13:12 patthoyts Exp $
#------------------------------------------------------------------------------
!ifndef _RULES_VC
@@ -123,11 +123,14 @@ OPTIMIZATIONS = $(OPTIMIZATIONS) -GL
DEBUGFLAGS =
+# the platform SDK has broken headers that break the runtime checks for amd64
+!if "$(MACHINE)" != "AMD64"
!if [nmakehlp -c -RTC1]
DEBUGFLAGS = $(DEBUGFLAGS) -RTC1
!elseif [nmakehlp -c -GZ]
DEBUGFLAGS = $(DEBUGFLAGS) -GZ
!endif
+!endif
COMPILERFLAGS =-W3