Avoid rebuilding tcl/tk.
Merge x86 changes into AMD64.
diff --git a/Tools/buildbot/external.bat b/Tools/buildbot/external.bat
index a849526..d6b18ae 100644
--- a/Tools/buildbot/external.bat
+++ b/Tools/buildbot/external.bat
@@ -4,7 +4,7 @@
 call "Tools\buildbot\external-common.bat"

 call "%VS90COMNTOOLS%\vsvars32.bat"

 

-if not exist tcltk\bin\tcl85.dll (

+if not exist tcltk\bin\tcl85g.dll (

     @rem all and install need to be separate invocations, otherwise nmakehlp is not found on install

     cd tcl-8.5.2.1\win

     nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 INSTALLDIR=..\..\tcltk clean all 

@@ -12,7 +12,7 @@
     cd ..\..

 )

 

-if not exist tcltk\bin\tk85.dll (

+if not exist tcltk\bin\tk85g.dll (

     cd tk-8.5.2.0\win    

     nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.2.1 clean

     nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.2.1 all