diff options
| author | patthoyts <patthoyts@users.sourceforge.net> | 2007-09-11 00:10:47 (GMT) |
|---|---|---|
| committer | patthoyts <patthoyts@users.sourceforge.net> | 2007-09-11 00:10:47 (GMT) |
| commit | 7d84381bfcf3014790c83d13caa0dd5fcf16af5e (patch) | |
| tree | 157b207a37d3a8fc8624294f317d2a93ac863d63 | |
| parent | 4b59eed7e9ef54634aa4bf2c3114d2dbe63ca846 (diff) | |
| download | tcl-7d84381bfcf3014790c83d13caa0dd5fcf16af5e.zip tcl-7d84381bfcf3014790c83d13caa0dd5fcf16af5e.tar.gz tcl-7d84381bfcf3014790c83d13caa0dd5fcf16af5e.tar.bz2 | |
Fix for AMD64 target symbols builds.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | win/makefile.vc | 26 | ||||
| -rw-r--r-- | win/rules.vc | 5 |
3 files changed, 23 insertions, 13 deletions
@@ -1,3 +1,8 @@ +2007-09-11 Pat Thoyts <patthoyts@users.sourceforge.net> + + * win/makefile.vc: AMD64 target fixes for symbols builds. + * win/rules.vc: + 2007-09-10 Jeff Hobbs <jeffh@ActiveState.com> * generic/tclLink.c (Tcl_UpdateLinkedVar): guard against var being diff --git a/win/makefile.vc b/win/makefile.vc index e3625b9..5c37f0c 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.100.2.9 2006/09/26 21:40:36 patthoyts Exp $ +# RCS: @(#) $Id: makefile.vc,v 1.100.2.10 2007/09/11 00:10:48 patthoyts Exp $ #------------------------------------------------------------------------------ # Check to see we are configured to build with MSVC (MSDEVDIR or MSVCDIR) @@ -99,7 +99,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 @@ -327,11 +327,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 @@ -413,9 +413,9 @@ baselibs = $(baselibs) bufferoverflowU.lib # TclTest flags #--------------------------------------------------------------------- -!IF "$(TESTPAT)" != "" -TESTFLAGS = -file $(TESTPAT) -!ENDIF +!if "$(TESTPAT)" != "" +TESTFLAGS = $(TESTFLAGS) -file $(TESTPAT) +!endif #--------------------------------------------------------------------- @@ -441,8 +441,8 @@ test: setup $(TCLTEST) dlls $(CAT32) !endif runtest: setup $(TCLTEST) dlls $(CAT32) - set TCL_LIBRARY=$(ROOT)/library - $(TCLTEST) + set TCL_LIBRARY=$(ROOT)/library + $(TCLTEST) setup: @if not exist $(OUT_DIR)\nul mkdir $(OUT_DIR) @@ -510,7 +510,7 @@ $(CAT32): $(WINDIR)\cat.c $(cc32) $(CON_CFLAGS) -Fo$(TMP_DIR)\ $? $(link32) $(conlflags) -out:$@ -stack:16384 $(TMP_DIR)\cat.obj \ $(baselibs) - $(_VC_MANIFEST_EMBED_EXE) + $(_VC_MANIFEST_EMBED_EXE) #--------------------------------------------------------------------- # Regenerate the stubs files. [Development use only] @@ -594,7 +594,9 @@ CreateButton(4, "FAQ", ExecFile("http://www.purl.org/NET/Tcl-FAQ/")) @$(CPY) "$(DOCTMP_DIR)\$(@B).cnt" "$(OUT_DIR)" $(MAN2TCL): $(TOOLSDIR)\$$(@B).c - $(cc32) -nologo -G4 -ML -O2 -Fo$(@D)\ $(TOOLSDIR)\$(@B).c -link -out:$@ + $(cc32) $(TCL_CFLAGS) -Fo$(@D)\ $(TOOLSDIR)\$(@B).c + $(link32) $(conlflags) -out:$@ -stack:16384 $(@D)\man2tcl.obj + $(_VC_MANIFEST_EMBED_EXE) $(HELPRTF): $(MAN2TCL) $(MAN2HELP) $(MAN2HELP2) $(INDEX) $(DOCDIR)\* $(TCLSH) $(MAN2HELP) -bitmap $(BMP_NOPATH) $(PROJECT) $(VERSION) $(DOCDIR:\=/) diff --git a/win/rules.vc b/win/rules.vc index 91fa444..6cb2381 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.11.2.6 2006/10/31 15:17:20 patthoyts Exp $ +# RCS: @(#) $Id: rules.vc,v 1.11.2.7 2007/09/11 00:10:48 patthoyts Exp $ #------------------------------------------------------------------------------ !ifndef _RULES_VC @@ -119,11 +119,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 |