merge core-8-branch

44 files changed, 2782 insertions, 2081 deletions

diff --git a/.fossil-settings/crlf-glob b/.fossil-settings/crlf-glob
index 2041cb6..56f3a03 100644
--- a/.fossil-settings/crlf-glob
+++ b/.fossil-settings/crlf-glob
@@ -12,6 +12,8 @@ win/buildall.vc.bat
 win/coffbase.txt
 win/makefile.vc
 win/rules.vc
+win/rules-ext.vc
+win/targets.vc
 win/tcl.dsp
 win/tcl.dsw
 win/tcl.hpj.in
\ No newline at end of file
diff --git a/.fossil-settings/crnl-glob b/.fossil-settings/crnl-glob
index 2041cb6..56f3a03 100644
--- a/.fossil-settings/crnl-glob
+++ b/.fossil-settings/crnl-glob
@@ -12,6 +12,8 @@ win/buildall.vc.bat
 win/coffbase.txt
 win/makefile.vc
 win/rules.vc
+win/rules-ext.vc
+win/targets.vc
 win/tcl.dsp
 win/tcl.dsw
 win/tcl.hpj.in
\ No newline at end of file
diff --git a/.fossil-settings/ignore-glob b/.fossil-settings/ignore-glob
index c85b488..08e405d 100644
--- a/.fossil-settings/ignore-glob
+++ b/.fossil-settings/ignore-glob
@@ -44,5 +44,6 @@ unix/pkgs/*
 win/Debug*
 win/Release*
 win/pkgs/*
+win/coffbase.txt
 win/tcl.hpj
 win/nmhlp-out.txt
diff --git a/generic/tclAlloc.c b/generic/tclAlloc.c
index fbd8f6e..8a4b1c8 100644
--- a/generic/tclAlloc.c
+++ b/generic/tclAlloc.c
@@ -661,13 +661,13 @@ mstats(
 
     fprintf(stderr, "\nused:\t");
     for (i = 0; i < NBUCKETS; i++) {
-	fprintf(stderr, " %" TCL_Z_MODIFIER "d", numMallocs[i]);
+	fprintf(stderr, " %" TCL_Z_MODIFIER "u", numMallocs[i]);
 	totalUsed += numMallocs[i] * (1 << (i + 3));
     }
 
-    fprintf(stderr, "\n\tTotal small in use: %" TCL_Z_MODIFIER "d, total free: %" TCL_Z_MODIFIER "d\n",
+    fprintf(stderr, "\n\tTotal small in use: %" TCL_Z_MODIFIER "u, total free: %" TCL_Z_MODIFIER "u\n",
 	totalUsed, totalFree);
-    fprintf(stderr, "\n\tNumber of big (>%d) blocks in use: %" TCL_Z_MODIFIER "d\n",
+    fprintf(stderr, "\n\tNumber of big (>%d) blocks in use: %" TCL_Z_MODIFIER "u\n",
 	    MAXMALLOC, numMallocs[NBUCKETS]);
 
     Tcl_MutexUnlock(allocMutexPtr);
diff --git a/generic/tclBasic.c b/generic/tclBasic.c
index 8f7f172..5fd9e28 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -954,9 +954,11 @@ Tcl_CreateInterp(void)
 
     Tcl_SetVar2(interp, "tcl_patchLevel", NULL, TCL_PATCH_LEVEL, TCL_GLOBAL_ONLY);
     Tcl_SetVar2(interp, "tcl_version", NULL, TCL_VERSION, TCL_GLOBAL_ONLY);
+#if !defined(TCL_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9
     Tcl_TraceVar2(interp, "tcl_precision", NULL,
 	    TCL_GLOBAL_ONLY|TCL_TRACE_READS|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
 	    TclPrecTraceProc, NULL);
+#endif /* !TCL_NO_DEPRECATED */
     TclpSetVariables(interp);
 
 #ifdef TCL_THREADS
@@ -3151,6 +3153,7 @@ Tcl_DeleteCommandFromToken(
      * traces.
      */
 
+    cmdPtr->nsPtr->refCount++;
     if (cmdPtr->tracePtr != NULL) {
 	CommandTrace *tracePtr;
 	CallCommandTraces(iPtr,cmdPtr,NULL,NULL,TCL_TRACE_DELETE);
@@ -3178,6 +3181,7 @@ Tcl_DeleteCommandFromToken(
      */
 
     TclInvalidateNsCmdLookup(cmdPtr->nsPtr);
+    TclNsDecrRefCount(cmdPtr->nsPtr);
 
     /*
      * If the command being deleted has a compile function, increment the
@@ -4785,7 +4789,7 @@ TEOV_RunEnterTraces(
 {
     Interp *iPtr = (Interp *) interp;
     Command *cmdPtr = *cmdPtrPtr;
-    size_t newEpoch, cmdEpoch = cmdPtr->cmdEpoch;
+    unsigned int newEpoch, cmdEpoch = cmdPtr->cmdEpoch;
     int length, traceCode = TCL_OK;
     const char *command = TclGetStringFromObj(commandPtr, &length);
 
diff --git a/generic/tclCkalloc.c b/generic/tclCkalloc.c
index 18e3edb..de767f9 100644
--- a/generic/tclCkalloc.c
+++ b/generic/tclCkalloc.c
@@ -254,7 +254,7 @@ ValidateMemory(
 	fprintf(stderr, "low guard failed at %p, %s %d\n",
 		memHeaderP->body, file, line);
 	fflush(stderr);			/* In case name pointer is bad. */
-	fprintf(stderr, "%" TCL_Z_MODIFIER "d bytes allocated at (%s %d)\n", memHeaderP->length,
+	fprintf(stderr, "%" TCL_Z_MODIFIER "u bytes allocated at (%s %d)\n", memHeaderP->length,
 		memHeaderP->file, memHeaderP->line);
 	Tcl_Panic("Memory validation failure");
     }
@@ -276,7 +276,7 @@ ValidateMemory(
 	fprintf(stderr, "high guard failed at %p, %s %d\n",
 		memHeaderP->body, file, line);
 	fflush(stderr);			/* In case name pointer is bad. */
-	fprintf(stderr, "%" TCL_Z_MODIFIER "d bytes allocated at (%s %d)\n",
+	fprintf(stderr, "%" TCL_Z_MODIFIER "u bytes allocated at (%s %d)\n",
 		memHeaderP->length, memHeaderP->file,
 		memHeaderP->line);
 	Tcl_Panic("Memory validation failure");
diff --git a/generic/tclCompile.h b/generic/tclCompile.h
index bd7aaab..f20ecfd 100644
--- a/generic/tclCompile.h
+++ b/generic/tclCompile.h
@@ -425,11 +425,11 @@ typedef struct ByteCode {
 				 * compiled. If the code is executed if a
 				 * different namespace, it must be
 				 * recompiled. */
-    size_t nsEpoch;		/* Value of nsPtr->resolverEpoch when this
+    unsigned int nsEpoch;	/* Value of nsPtr->resolverEpoch when this
 				 * ByteCode was compiled. Used to invalidate
 				 * code when new namespace resolution rules
 				 * are put into effect. */
-    int refCount;		/* Reference count: set 1 when created plus 1
+    unsigned int refCount;	/* Reference count: set 1 when created plus 1
 				 * for each execution of the code currently
 				 * active. This structure can be freed when
 				 * refCount becomes zero. */
diff --git a/generic/tclDisassemble.c b/generic/tclDisassemble.c
index d61ed42..e07080a 100644
--- a/generic/tclDisassemble.c
+++ b/generic/tclDisassemble.c
@@ -254,7 +254,7 @@ DisassembleByteCodeObj(
     Tcl_Obj *bufferObj, *fileObj;
 
     TclNewObj(bufferObj);
-    if (codePtr->refCount <= 0) {
+    if (!codePtr->refCount) {
 	return bufferObj;	/* Already freed. */
     }
 
@@ -312,7 +312,7 @@ DisassembleByteCodeObj(
 	int numCompiledLocals = procPtr->numCompiledLocals;
 
 	Tcl_AppendPrintfToObj(bufferObj,
-		"  Proc %p, refCt %d, args %d, compiled locals %d\n",
+		"  Proc %p, refCt %u, args %d, compiled locals %d\n",
 		procPtr, procPtr->refCount, procPtr->numArgs,
 		numCompiledLocals);
 	if (numCompiledLocals > 0) {
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index e1e26d3..46db12c 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -3609,7 +3609,7 @@ unilen(
 static void
 InitializeEncodingSearchPath(
     char **valuePtr,
-    size_t *lengthPtr,
+    unsigned int *lengthPtr,
     Tcl_Encoding *encodingPtr)
 {
     const char *bytes;
diff --git a/generic/tclEnsemble.c b/generic/tclEnsemble.c
index 580ea5c..e7bfbac 100644
--- a/generic/tclEnsemble.c
+++ b/generic/tclEnsemble.c
@@ -92,7 +92,7 @@ static const Tcl_ObjType ensembleCmdType = {
  */
 
 typedef struct {
-    size_t epoch;               /* Used to confirm when the data in this
+    unsigned int epoch;         /* Used to confirm when the data in this
                                  * really structure matches up with the
                                  * ensemble. */
     Command *token;             /* Reference to the command for which this
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index c7e453a..c4c4461 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -9476,9 +9476,9 @@ PrintByteCodeInfo(
     Proc *procPtr = codePtr->procPtr;
     Interp *iPtr = (Interp *) *codePtr->interpHandle;
 
-    fprintf(stdout, "\nExecuting ByteCode 0x%p, refCt %" TCL_Z_MODIFIER "u, epoch %" TCL_Z_MODIFIER "u, interp 0x%p (epoch %" TCL_Z_MODIFIER "u)\n",
-	    codePtr, codePtr->refCount, codePtr->compileEpoch, iPtr,
-	    (size_t)iPtr->compileEpoch);
+    fprintf(stdout, "\nExecuting ByteCode 0x%p, refCt %" TCL_Z_MODIFIER "u, epoch %u, interp 0x%p (epoch %u)\n",
+	    codePtr, (size_t)codePtr->refCount, codePtr->compileEpoch, iPtr,
+	    iPtr->compileEpoch);
 
     fprintf(stdout, "  Source: ");
     TclPrintSource(stdout, codePtr->source, 60);
diff --git a/generic/tclInt.decls b/generic/tclInt.decls
index 33bf0b3..175ea9c 100644
--- a/generic/tclInt.decls
+++ b/generic/tclInt.decls
@@ -355,7 +355,7 @@ declare 81 {
 #  declare 87 {
 #      void TclPlatformInit(Tcl_Interp *interp)
 #  }
-declare 88 {
+declare 88 {deprecated {}} {
     char *TclPrecTraceProc(ClientData clientData, Tcl_Interp *interp,
 	    const char *name1, const char *name2, int flags)
 }
diff --git a/generic/tclInt.h b/generic/tclInt.h
index ad1d9c6..de22924 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -265,7 +265,7 @@ typedef struct Namespace {
 				 * strings; values have type (Namespace *). If
 				 * NULL, there are no children. */
 #endif
-    size_t nsId;		/* Unique id for the namespace. */
+    unsigned long nsId;		/* Unique id for the namespace. */
     Tcl_Interp *interp;		/* The interpreter containing this
 				 * namespace. */
     int flags;			/* OR-ed combination of the namespace status
@@ -274,7 +274,7 @@ typedef struct Namespace {
 				 * frames for this namespace that are on the
 				 * Tcl call stack. The namespace won't be
 				 * freed until activationCount becomes zero. */
-    int refCount;		/* Count of references by namespaceName
+    unsigned int refCount;	/* Count of references by namespaceName
 				 * objects. The namespace can't be freed until
 				 * refCount becomes zero. */
     Tcl_HashTable cmdTable;	/* Contains all the commands currently
@@ -299,12 +299,12 @@ typedef struct Namespace {
 				 * registered using "namespace export". */
     int maxExportPatterns;	/* Mumber of export patterns for which space
 				 * is currently allocated. */
-    size_t cmdRefEpoch;		/* Incremented if a newly added command
+    unsigned int cmdRefEpoch;	/* Incremented if a newly added command
 				 * shadows a command for which this namespace
 				 * has already cached a Command* pointer; this
 				 * causes all its cached Command* pointers to
 				 * be invalidated. */
-    size_t resolverEpoch;	/* Incremented whenever (a) the name
+    unsigned int resolverEpoch;	/* Incremented whenever (a) the name
 				 * resolution rules change for this namespace
 				 * or (b) a newly added command shadows a
 				 * command that is compiled to bytecodes. This
@@ -331,7 +331,7 @@ typedef struct Namespace {
 				 * LookupCompiledLocal to resolve variable
 				 * references within the namespace at compile
 				 * time. */
-    size_t exportLookupEpoch;	/* Incremented whenever a command is added to
+    unsigned int exportLookupEpoch;	/* Incremented whenever a command is added to
 				 * a namespace, removed from a namespace or
 				 * the exports of a namespace are changed.
 				 * Allows TIP#112-driven command lists to be
@@ -432,7 +432,7 @@ typedef struct EnsembleConfig {
 				 * if the command has been deleted (or never
 				 * existed; the global namespace never has an
 				 * ensemble command.) */
-    size_t epoch;		/* The epoch at which this ensemble's table of
+    unsigned int epoch;		/* The epoch at which this ensemble's table of
 				 * exported commands is valid. */
     char **subcommandArrayPtr;	/* Array of ensemble subcommand names. At all
 				 * consistent points, this will have the same
@@ -545,7 +545,7 @@ typedef struct CommandTrace {
     struct CommandTrace *nextPtr;
 				/* Next in list of traces associated with a
 				 * particular command. */
-    int refCount;		/* Used to ensure this structure is not
+    unsigned int refCount;	/* Used to ensure this structure is not
 				 * deleted too early. Keeps track of how many
 				 * pieces of code have a pointer to this
 				 * structure. */
@@ -618,7 +618,7 @@ typedef struct Var {
 
 typedef struct VarInHash {
     Var var;
-    int refCount;		/* Counts number of active uses of this
+    unsigned int refCount;	/* Counts number of active uses of this
 				 * variable: 1 for the entry in the hash
 				 * table, 1 for each additional variable whose
 				 * linkPtr points here, 1 for each nested
@@ -950,7 +950,7 @@ typedef struct CompiledLocal {
 typedef struct Proc {
     struct Interp *iPtr;	/* Interpreter for which this command is
 				 * defined. */
-    int refCount;		/* Reference count: 1 if still present in
+    unsigned int refCount;	/* Reference count: 1 if still present in
 				 * command table plus 1 for each call to the
 				 * procedure that is currently active. This
 				 * structure can be freed when refCount
@@ -1067,7 +1067,7 @@ typedef struct AssocData {
  */
 
 typedef struct LocalCache {
-    int refCount;
+    unsigned int refCount;
     int numVars;
     Tcl_Obj *varName0;
 } LocalCache;
@@ -1229,7 +1229,7 @@ typedef struct CmdFrame {
 typedef struct CFWord {
     CmdFrame *framePtr;		/* CmdFrame to access. */
     int word;			/* Index of the word in the command. */
-    int refCount;		/* Number of times the word is on the
+    unsigned int refCount;	/* Number of times the word is on the
 				 * stack. */
 } CFWord;
 
@@ -1634,12 +1634,12 @@ typedef struct Command {
 				 * recreated). */
     Namespace *nsPtr;		/* Points to the namespace containing this
 				 * command. */
-    int refCount;		/* 1 if in command hashtable plus 1 for each
+    unsigned int refCount;	/* 1 if in command hashtable plus 1 for each
 				 * reference from a CmdName Tcl object
 				 * representing a command's name in a ByteCode
 				 * instruction sequence. This structure can be
 				 * freed when refCount becomes zero. */
-    size_t cmdEpoch;		/* Incremented to invalidate any references
+    unsigned int cmdEpoch;	/* Incremented to invalidate any references
 				 * that point to this command when it is
 				 * renamed, deleted, hidden, or exposed. */
     CompileProc *compileProc;	/* Procedure called to compile command. NULL
@@ -2384,7 +2384,7 @@ typedef enum TclEolTranslation {
  */
 
 typedef struct List {
-    int refCount;
+    unsigned int refCount;
     int maxElemCount;		/* Total number of element array slots. */
     int elemCount;		/* Current number of list elements. */
     int canonicalFlag;		/* Set if the string representation was
@@ -2626,7 +2626,7 @@ typedef Tcl_ObjCmdProc *TclObjCmdProcType;
  *----------------------------------------------------------------
  */
 
-typedef void (TclInitProcessGlobalValueProc)(char **valuePtr, size_t *lengthPtr,
+typedef void (TclInitProcessGlobalValueProc)(char **valuePtr, unsigned int *lengthPtr,
 	Tcl_Encoding *encodingPtr);
 
 /*
@@ -2638,9 +2638,9 @@ typedef void (TclInitProcessGlobalValueProc)(char **valuePtr, size_t *lengthPtr,
  */
 
 typedef struct ProcessGlobalValue {
-    size_t epoch;		/* Epoch counter to detect changes in the
+    unsigned int epoch;		/* Epoch counter to detect changes in the
 				 * master value. */
-    size_t numBytes;		/* Length of the master string. */
+    unsigned int numBytes;	/* Length of the master string. */
     char *value;		/* The master string value. */
     Tcl_Encoding encoding;	/* system encoding when master string was
 				 * initialized. */
@@ -2960,8 +2960,7 @@ MODULE_SCOPE char *	TclDStringAppendDString(Tcl_DString *dsPtr,
 MODULE_SCOPE Tcl_Obj *	TclDStringToObj(Tcl_DString *dsPtr);
 MODULE_SCOPE Tcl_Obj *const *	TclFetchEnsembleRoot(Tcl_Interp *interp,
 			    Tcl_Obj *const *objv, int objc, int *objcPtr);
-Tcl_Namespace * 	TclEnsureNamespace(
-			    Tcl_Interp *interp,
+MODULE_SCOPE Tcl_Namespace * 	TclEnsureNamespace(Tcl_Interp *interp,
 			    Tcl_Namespace *namespacePtr);
 
 MODULE_SCOPE void	TclFinalizeAllocSubsystem(void);
@@ -3125,7 +3124,7 @@ MODULE_SCOPE int	TclpThreadCreate(Tcl_ThreadId *idPtr,
 			    int stackSize, int flags);
 MODULE_SCOPE int	TclpFindVariable(const char *name, int *lengthPtr);
 MODULE_SCOPE void	TclpInitLibraryPath(char **valuePtr,
-			    size_t *lengthPtr, Tcl_Encoding *encodingPtr);
+			    unsigned int *lengthPtr, Tcl_Encoding *encodingPtr);
 MODULE_SCOPE void	TclpInitLock(void);
 MODULE_SCOPE void	TclpInitPlatform(void);
 MODULE_SCOPE void	TclpInitUnlock(void);
diff --git a/generic/tclIntDecls.h b/generic/tclIntDecls.h
index 5848bb3..bc8f7b8 100644
--- a/generic/tclIntDecls.h
+++ b/generic/tclIntDecls.h
@@ -233,7 +233,8 @@ EXTERN char *		TclpRealloc(char *ptr, unsigned int size);
 /* Slot 86 is reserved */
 /* Slot 87 is reserved */
 /* 88 */
-EXTERN char *		TclPrecTraceProc(ClientData clientData,
+TCL_DEPRECATED("")
+char *			TclPrecTraceProc(ClientData clientData,
 				Tcl_Interp *interp, const char *name1,
 				const char *name2, int flags);
 /* 89 */
@@ -743,7 +744,7 @@ typedef struct TclIntStubs {
     void (*reserved85)(void);
     void (*reserved86)(void);
     void (*reserved87)(void);
-    char * (*tclPrecTraceProc) (ClientData clientData, Tcl_Interp *interp, const char *name1, const char *name2, int flags); /* 88 */
+    TCL_DEPRECATED_API("") char * (*tclPrecTraceProc) (ClientData clientData, Tcl_Interp *interp, const char *name1, const char *name2, int flags); /* 88 */
     int (*tclPreventAliasLoop) (Tcl_Interp *interp, Tcl_Interp *cmdInterp, Tcl_Command cmd); /* 89 */
     void (*reserved90)(void);
     void (*tclProcCleanupProc) (Proc *procPtr); /* 91 */
diff --git a/generic/tclIntPlatDecls.h b/generic/tclIntPlatDecls.h
index 494d6f1..1222cee 100644
--- a/generic/tclIntPlatDecls.h
+++ b/generic/tclIntPlatDecls.h
@@ -559,6 +559,8 @@ extern const TclIntPlatStubs *tclIntPlatStubsPtr;
 #   define TclWinGetServByName getservbyname
 #   define TclWinGetSockOpt getsockopt
 #   define TclWinSetSockOpt setsockopt
+#   undef TclWinGetPlatformId
+#   define TclWinGetPlatformId() (2) /* VER_PLATFORM_WIN32_NT */
 #else
 #   undef TclpGetPid
 #   define TclpGetPid(pid) ((unsigned long) (pid))
diff --git a/generic/tclNamesp.c b/generic/tclNamesp.c
index d661856..269d06b 100644
--- a/generic/tclNamesp.c
+++ b/generic/tclNamesp.c
@@ -32,7 +32,7 @@
  */
 
 typedef struct {
-    size_t numNsCreated;	/* Count of the number of namespaces created
+    unsigned long numNsCreated;	/* Count of the number of namespaces created
 				 * within the thread. This value is used as a
 				 * unique id for each namespace. Cannot be
 				 * per-interp because the nsId is used to
@@ -402,7 +402,7 @@ Tcl_PopCallFrame(
     }
     if (framePtr->numCompiledLocals > 0) {
 	TclDeleteCompiledLocalVars(iPtr, framePtr);
-	if (--framePtr->localCachePtr->refCount == 0) {
+	if (framePtr->localCachePtr->refCount-- <= 1) {
 	    TclFreeLocalCache(interp, framePtr->localCachePtr);
 	}
 	framePtr->localCachePtr = NULL;
@@ -1052,7 +1052,7 @@ Tcl_DeleteNamespace(
 	     * Otherwise, mark it as "dead" so that it can't be used.
 	     */
 
-	    if (nsPtr->refCount == 0) {
+	    if (!nsPtr->refCount) {
 		NamespaceFree(nsPtr);
 	    } else {
 		nsPtr->flags |= NS_DEAD;
diff --git a/generic/tclObj.c b/generic/tclObj.c
index 1a00011..4ec0a57 100644
--- a/generic/tclObj.c
+++ b/generic/tclObj.c
@@ -344,17 +344,17 @@ typedef struct ResolvedCmdName {
 				 * reference (not the namespace that contains
 				 * the referenced command). NULL if the name
 				 * is fully qualified.*/
-    size_t refNsId;		/* refNsPtr's unique namespace id. Used to
+    unsigned long refNsId;		/* refNsPtr's unique namespace id. Used to
 				 * verify that refNsPtr is still valid (e.g.,
 				 * it's possible that the cmd's containing
 				 * namespace was deleted and a new one created
 				 * at the same address). */
-    size_t refNsCmdEpoch;	/* Value of the referencing namespace's
+    unsigned int refNsCmdEpoch;	/* Value of the referencing namespace's
 				 * cmdRefEpoch when the pointer was cached.
 				 * Before using the cached pointer, we check
 				 * if the namespace's epoch was incremented;
 				 * if so, this cached pointer is invalid. */
-    size_t cmdEpoch;		/* Value of the command's cmdEpoch when this
+    unsigned int cmdEpoch; /* Value of the command's cmdEpoch when this
 				 * pointer was cached. Before using the cached
 				 * pointer, we check if the cmd's epoch was
 				 * incremented; if so, the cmd was renamed,
diff --git a/generic/tclPathObj.c b/generic/tclPathObj.c
index 49d62dc..2453c46 100644
--- a/generic/tclPathObj.c
+++ b/generic/tclPathObj.c
@@ -1809,7 +1809,6 @@ Tcl_FSGetNormalizedPath(
 	 */
 
 	(void) TclGetStringFromObj(dir, &cwdLen);
-	cwdLen += (Tcl_GetString(copy)[cwdLen] == '/');
 
 	/* Normalize the combined string. */
 
@@ -1831,12 +1830,12 @@ Tcl_FSGetNormalizedPath(
 	     * normalized head, we can more efficiently normalize the combined
 	     * path by passing over only the unnormalized tail portion. When
 	     * this is sufficient, prior developers claim this should be much
-	     * faster. We use 'cwdLen-1' so that we are already pointing at
+	     * faster. We use 'cwdLen' so that we are already pointing at
 	     * the dir-separator that we know about. The normalization code
 	     * will actually start off directly after that separator.
 	     */
 
-	    TclFSNormalizeToUniquePath(interp, copy, cwdLen-1);
+	    TclFSNormalizeToUniquePath(interp, copy, cwdLen);
 	}
 
 	/* Now we need to construct the new path object. */
diff --git a/generic/tclPkg.c b/generic/tclPkg.c
index fb721a0..cdf9a8b 100644
--- a/generic/tclPkg.c
+++ b/generic/tclPkg.c
@@ -503,6 +503,8 @@ PkgRequireCore(
 		     * The version of the package sought is better than the
 		     * currently selected version.
 		     */
+		    ckfree(bestVersion);
+		    bestVersion = NULL;
 		    goto newbest;
 		}
 	    } else {
@@ -531,6 +533,8 @@ PkgRequireCore(
 		     * This stable version of the package sought is better
 		     * than the currently selected stable version.
 		     */
+		    ckfree(bestStableVersion);
+		    bestStableVersion = NULL;
 		    goto newstable;
 		}
 	    } else {
diff --git a/generic/tclProc.c b/generic/tclProc.c
index b89357c..70dc4dc 100644
--- a/generic/tclProc.c
+++ b/generic/tclProc.c
@@ -2380,7 +2380,7 @@ FreeLambdaInternalRep(
     Proc *procPtr = objPtr->internalRep.twoPtrValue.ptr1;
     Tcl_Obj *nsObjPtr = objPtr->internalRep.twoPtrValue.ptr2;
 
-    if (procPtr->refCount-- == 1) {
+    if (procPtr->refCount-- <= 1) {
 	TclProcCleanupProc(procPtr);
     }
     TclDecrRefCount(nsObjPtr);
diff --git a/generic/tclStringObj.c b/generic/tclStringObj.c
index a5b289c..2cc1207 100644
--- a/generic/tclStringObj.c
+++ b/generic/tclStringObj.c
@@ -421,13 +421,14 @@ Tcl_GetCharLength(
      * Optimize the case where we're really dealing with a bytearray object;
      * we don't need to convert to a string to perform the get-length operation.
      *
-     * NOTE that we do not need the bytearray to be "pure".  A ByteArray value
-     * with a string rep cannot be trusted to represent the same value as the
-     * string rep, but it *can* be trusted to have the same character length
-     * as the string rep, which is all this routine cares about.
+     * Starting in Tcl 8.7, we check for a "pure" bytearray, because the
+     * machinery behind that test is using a proper bytearray ObjType.  We
+     * could also compute length of an improper bytearray without shimmering
+     * but there's no value in that. We *want* to shimmer an improper bytearray
+     * because improper bytearrays have worthless internal reps.
      */
 
-    if (objPtr->typePtr == &tclByteArrayType) {
+    if (TclIsPureByteArray(objPtr)) {
 	int length;
 
 	(void) Tcl_GetByteArrayFromObj(objPtr, &length);
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index d2de021..bd0971b 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -49,7 +49,7 @@
 #undef TclWinNToHS
 
 /* See bug 510001: TclSockMinimumBuffers needs plat imp */
-#if defined(_WIN64) || defined(TCL_NO_DEPRECATED)
+#if defined(_WIN64) || defined(TCL_NO_DEPRECATED) || TCL_MAJOR_VERSION > 8
 #   define TclSockMinimumBuffersOld 0
 #else
 #define TclSockMinimumBuffersOld sockMinimumBuffersOld
@@ -59,16 +59,18 @@ static int TclSockMinimumBuffersOld(int sock, int size)
 }
 #endif
 
-#if defined(TCL_NO_DEPRECATED)
+#if defined(TCL_NO_DEPRECATED) || TCL_MAJOR_VERSION > 8
 #   define TclSetStartupScriptPath 0
 #   define TclGetStartupScriptPath 0
 #   define TclSetStartupScriptFileName 0
 #   define TclGetStartupScriptFileName 0
+#   define TclPrecTraceProc 0
 #   define TclpInetNtoa 0
 #   define TclWinGetServByName 0
 #   define TclWinGetSockOpt 0
 #   define TclWinSetSockOpt 0
 #   define TclWinNToHS 0
+#   define TclWinGetPlatformId 0
 #   define TclBNInitBignumFromWideUInt 0
 #   define TclBNInitBignumFromWideInt 0
 #   define TclBNInitBignumFromLong 0
@@ -101,10 +103,22 @@ static const char *TclGetStartupScriptFileName(void)
 
 #if defined(_WIN32) || defined(__CYGWIN__)
 #undef TclWinNToHS
+#undef TclWinGetPlatformId
+#if !defined(TCL_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9
 #define TclWinNToHS winNToHS
 static unsigned short TclWinNToHS(unsigned short ns) {
 	return ntohs(ns);
 }
+#define TclWinGetPlatformId winGetPlatformId
+static int
+TclWinGetPlatformId(void)
+{
+    return 2; /* VER_PLATFORM_WIN32_NT */;
+}
+#else
+#define TclWinNToHS 0
+#define TclWinGetPlatformId 0
+#endif
 #endif
 #   define TclBNInitBignumFromWideUInt TclInitBignumFromWideUInt
 #   define TclBNInitBignumFromWideInt TclInitBignumFromWideInt
@@ -132,15 +146,6 @@ TclpIsAtty(int fd)
     return isatty(fd);
 }
 
-#define TclWinGetPlatformId winGetPlatformId
-static int
-TclWinGetPlatformId()
-{
-    /* Don't bother to determine the real platform on cygwin,
-     * because VER_PLATFORM_WIN32_NT is the only supported platform */
-    return 2; /* VER_PLATFORM_WIN32_NT */;
-}
-
 void *TclWinGetTclInstance()
 {
     void *hInstance = NULL;
@@ -149,7 +154,7 @@ void *TclWinGetTclInstance()
     return hInstance;
 }
 
-#ifndef TCL_NO_DEPRECATED
+#if !defined(TCL_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9
 #define TclWinSetSockOpt winSetSockOpt
 static int
 TclWinSetSockOpt(SOCKET s, int level, int optname,
@@ -311,7 +316,7 @@ static int formatInt(char *buffer, int n){
 
 #endif /* __CYGWIN__ */
 
-#ifdef TCL_NO_DEPRECATED
+#if defined(TCL_NO_DEPRECATED)
 #   define Tcl_SeekOld 0
 #   define Tcl_TellOld 0
 #   undef Tcl_SetBooleanObj
diff --git a/generic/tclUtil.c b/generic/tclUtil.c
index 51af016..15018de 100644
--- a/generic/tclUtil.c
+++ b/generic/tclUtil.c
@@ -3298,6 +3298,7 @@ Tcl_PrintDouble(
  *----------------------------------------------------------------------
  */
 
+#if !defined(TCL_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9
 	/* ARGSUSED */
 char *
 TclPrecTraceProc(
@@ -3355,6 +3356,7 @@ TclPrecTraceProc(
     *precisionPtr = prec;
     return NULL;
 }
+#endif /* !TCL_NO_DEPRECATED)*/
 
 /*
  *----------------------------------------------------------------------
@@ -4010,7 +4012,7 @@ TclSetProcessGlobalValue(
     Tcl_IncrRefCount(newValue);
     cacheMap = GetThreadHash(&pgvPtr->key);
     ClearHash(cacheMap);
-    hPtr = Tcl_CreateHashEntry(cacheMap, (void *)(pgvPtr->epoch), &dummy);
+    hPtr = Tcl_CreateHashEntry(cacheMap, (void *)(size_t)(pgvPtr->epoch), &dummy);
     Tcl_SetHashValue(hPtr, newValue);
     Tcl_MutexUnlock(&pgvPtr->mutex);
 }
@@ -4036,7 +4038,7 @@ TclGetProcessGlobalValue(
     Tcl_Obj *value = NULL;
     Tcl_HashTable *cacheMap;
     Tcl_HashEntry *hPtr;
-    size_t epoch = pgvPtr->epoch;
+    unsigned int epoch = pgvPtr->epoch;
 
     if (pgvPtr->encoding) {
 	Tcl_Encoding current = Tcl_GetEncoding(NULL, NULL);
@@ -4070,7 +4072,7 @@ TclGetProcessGlobalValue(
 	}
     }
     cacheMap = GetThreadHash(&pgvPtr->key);
-    hPtr = Tcl_FindHashEntry(cacheMap, (void *) (epoch));
+    hPtr = Tcl_FindHashEntry(cacheMap, (void *)(size_t)epoch);
     if (NULL == hPtr) {
 	int dummy;
 
@@ -4103,7 +4105,7 @@ TclGetProcessGlobalValue(
 
 	value = Tcl_NewStringObj(pgvPtr->value, pgvPtr->numBytes);
 	hPtr = Tcl_CreateHashEntry(cacheMap,
-		(void *)(pgvPtr->epoch), &dummy);
+		(void *)(size_t)(pgvPtr->epoch), &dummy);
 	Tcl_MutexUnlock(&pgvPtr->mutex);
 	Tcl_SetHashValue(hPtr, value);
 	Tcl_IncrRefCount(value);
diff --git a/library/init.tcl b/library/init.tcl
index 4424087..530ce58 100644
--- a/library/init.tcl
+++ b/library/init.tcl
@@ -619,8 +619,7 @@ proc auto_execok name {
     set auto_execs($name) ""
 
     set shellBuiltins [list assoc cls copy date del dir echo erase ftype \
-                           md mkdir mklink move rd ren rename rmdir start \
-                           time type ver vol]
+	    md mkdir mklink move rd ren rename rmdir start time type ver vol]
     if {[info exists env(PATHEXT)]} {
 	# Add an initial ; to have the {} extension check first.
 	set execExtensions [split ";$env(PATHEXT)" ";"]
@@ -654,10 +653,7 @@ proc auto_execok name {
 	set windir $env(WINDIR)
     }
     if {[info exists windir]} {
-	if {$tcl_platform(os) eq "Windows NT"} {
-	    append path "$windir/system32;"
-	}
-	append path "$windir/system;$windir;"
+	append path "$windir/system32;$windir/system;$windir;"
     }
 
     foreach var {PATH Path path} {
diff --git a/tests/fileSystem.test b/tests/fileSystem.test
index 4c90376..0dd0bdb 100644
--- a/tests/fileSystem.test
+++ b/tests/fileSystem.test
@@ -377,6 +377,22 @@ test filesystem-1.52.1 {bug f9f390d0fa: file join where strep is not canonical}
     file normalize $x
     file join $x
 } -result /foo
+test filesystem-1.53 {[Bug 3559678] - normalize when tail is empty} {
+  string match */ [file normalize [lindex [glob -dir [pwd] {{}}] 0]]
+} 0
+test filesystem-1.54 {[Bug ce3a211dcb] - normalize when tail is empty} -setup {
+    set save [pwd]
+    cd [set home [makeDirectory ce3a211dcb]]
+    makeDirectory A $home
+    cd [lindex [glob */] 0]
+} -body {
+    string match */A [pwd]
+} -cleanup {
+    cd $home
+    removeDirectory A $home
+    cd $save
+    removeDirectory ce3a211dcb
+} -result 1
 
 test filesystem-2.0 {new native path} {unix} {
    foreach f [lsort [glob -nocomplain /usr/bin/c*]] {
diff --git a/tests/scan.test b/tests/scan.test
index dcf8ceb..1f32b9f 100644
--- a/tests/scan.test
+++ b/tests/scan.test
@@ -553,7 +553,7 @@ test scan-5.18 {bigint scanning underflow} -setup {
     list [scan "-207698809136909011942886895" \
 	    %llu a] $a
 } -returnCodes 1 -result {unsigned bignum scans are invalid}
-test scan-5.18 {bigint scanning invalid} -setup {
+test scan-5.19 {bigint scanning invalid} -setup {
     set a {};
 } -body {
     list [scan "207698809136909011942886895" \
diff --git a/tests/utf.test b/tests/utf.test
index d0fa7be..95775a8 100644
--- a/tests/utf.test
+++ b/tests/utf.test
@@ -124,7 +124,7 @@ test utf-4.10 {Tcl_NumUtfChars: #u0000, calc len, overcomplete} {testnumutfchars
 test utf-5.1 {Tcl_UtfFindFirst} {testfindfirst testbytestring} {
     testfindfirst [testbytestring "abcbc"] 98
 } {bcbc}
-test utf-5.1 {Tcl_UtfFindLast} {testfindlast testbytestring} {
+test utf-5.2 {Tcl_UtfFindLast} {testfindlast testbytestring} {
     testfindlast [testbytestring "abcbc"] 98
 } {bc}
 
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 032b5ac..f3b9782 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -2050,9 +2050,7 @@ dist: $(UNIX_DIR)/configure $(UNIX_DIR)/tclConfig.h.in $(UNIX_DIR)/tcl.pc.in $(M
 	cp -p $(TOP_DIR)/win/*.[ch] $(TOP_DIR)/win/*.ico $(TOP_DIR)/win/*.rc \
 		$(DISTDIR)/win
 	cp -p $(TOP_DIR)/win/*.bat $(DISTDIR)/win
-	cp -p $(TOP_DIR)/win/makefile.* $(DISTDIR)/win
-	cp -p $(TOP_DIR)/win/rules.vc $(DISTDIR)/win
-	cp -p $(TOP_DIR)/win/coffbase.txt $(DISTDIR)/win
+	cp -p $(TOP_DIR)/win/*.vc $(DISTDIR)/win
 	cp -p $(TOP_DIR)/win/tcl.hpj.in $(DISTDIR)/win
 	cp -p $(TOP_DIR)/win/tcl.ds* $(DISTDIR)/win
 	cp -p $(TOP_DIR)/win/README $(DISTDIR)/win
diff --git a/unix/tclUnixInit.c b/unix/tclUnixInit.c
index feeffa6..cc66569 100644
--- a/unix/tclUnixInit.c
+++ b/unix/tclUnixInit.c
@@ -39,11 +39,6 @@ DLLIMPORT extern __stdcall void FreeLibrary(void *);
 DLLIMPORT extern __stdcall void *GetProcAddress(void *, const char *);
 DLLIMPORT extern __stdcall void GetSystemInfo(void *);
 
-#define NUMPLATFORMS 4
-static const char *const platforms[NUMPLATFORMS] = {
-    "Win32s", "Windows 95", "Windows NT", "Windows CE"
-};
-
 #define NUMPROCESSORS 11
 static const char *const processors[NUMPROCESSORS] = {
     "intel", "mips", "alpha", "ppc", "shx", "arm", "ia64", "alpha64", "msil",
@@ -453,7 +448,7 @@ TclpInitPlatform(void)
 void
 TclpInitLibraryPath(
     char **valuePtr,
-    size_t *lengthPtr,
+    unsigned int *lengthPtr,
     Tcl_Encoding *encodingPtr)
 {
 #define LIBRARY_SIZE	    32
@@ -890,10 +885,7 @@ TclpSetVariables(
 
     GetSystemInfo(&sysInfo);
 
-    if (osInfo.dwPlatformId < NUMPLATFORMS) {
-	Tcl_SetVar2(interp, "tcl_platform", "os",
-		platforms[osInfo.dwPlatformId], TCL_GLOBAL_ONLY);
-    }
+    Tcl_SetVar2(interp, "tcl_platform", "os", "Windows NT", TCL_GLOBAL_ONLY);
     sprintf(buffer, "%d.%d", osInfo.dwMajorVersion, osInfo.dwMinorVersion);
     Tcl_SetVar2(interp, "tcl_platform", "osVersion", buffer, TCL_GLOBAL_ONLY);
     if (sysInfo.wProcessorArchitecture < NUMPROCESSORS) {
diff --git a/unix/tclUnixNotfy.c b/unix/tclUnixNotfy.c
index 5bc753a..b7df740 100644
--- a/unix/tclUnixNotfy.c
+++ b/unix/tclUnixNotfy.c
@@ -532,13 +532,13 @@ TclUnixWaitForFile(
 	numFound = poll(pollFds, 1, pollTimeout);
 	if (numFound == 1) {
 	    result = 0;
-	    if (pollFds[0].events & (POLLIN | POLLHUP)) {
+	    if (pollFds[0].revents & (POLLIN | POLLHUP)) {
 		result |= TCL_READABLE;
 	    }
-	    if (pollFds[0].events & POLLOUT) {
+	    if (pollFds[0].revents & POLLOUT) {
 		result |= TCL_WRITABLE;
 	    }
-	    if (pollFds[0].events & POLLERR) {
+	    if (pollFds[0].revents & POLLERR) {
 		result |= TCL_EXCEPTION;
 	    }
 	    if (result) {
diff --git a/unix/tclUnixSock.c b/unix/tclUnixSock.c
index 45abc01..980ab4d 100644
--- a/unix/tclUnixSock.c
+++ b/unix/tclUnixSock.c
@@ -217,7 +217,7 @@ printaddrinfo(
 static void
 InitializeHostName(
     char **valuePtr,
-    size_t *lengthPtr,
+    unsigned int *lengthPtr,
     Tcl_Encoding *encodingPtr)
 {
     const char *native = NULL;
diff --git a/win/coffbase.txt b/win/coffbase.txt
deleted file mode 100644
index 3314f26..0000000
--- a/win/coffbase.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-;

-; This file defines the virtual base addresses for the Dynamic Link Libraries

-; that are part of the Tcl system.  The first token on a line is the key (or name

-; of the DLL) and the second token is the virtual base address, in hexidecimal.

-; The third token is the maximum size of the DLL image file, including symbols.

-;

-; Using a specified "prefered load address" should speed loading time by avoiding

-; relocations (NT supported only).  It is assumed extension authors will contribute

-; their modules to this grand-master list.  You can use the dumpbin utility with

-; the /headers option to get the "size of image" data (already in hex).  If the

-; maximum size is too small a linker warning will occur.  Modules can overlap when

-; they're mutually exclusive.  This info is placed in the DLL's PE header by the

-; linker with the `-base:@$(TCLDIR)\win\coffbase.txt,<key>` option.

-

-tcl		0x10000000	0x00200000

-tcldde		0x10200000	0x00010000

-tclreg		0x10210000	0x00010000

-tk		0x10220000	0x00200000

-expect		0x10480000	0x00080000

-itcl		0x10500000	0x00080000

-itk		0x10580000	0x00080000

-bltlite		0x10600000	0x00080000

-blt		0x10680000	0x00080000

-iocpsock	0x10700000	0x00080000

-tls		0x10780000	0x00100000

-winico		0x10880000	0x00010000

-sample		0x108B0000	0x00010000

-tile		0x10900000	0x00080000

-memchan		0x109D0000	0x00010000

-tdom		0x109E0000	0x00080000

-tclvfs		0x10A70000	0x00010000

-tkvideo		0x10B00000	0x00010000

-tclsdl		0x10B20000	0x00080000

-vqtcl		0x10C00000	0x00010000

-tdbc		0x10C40000	0x00010000

-thread		0x10C80000	0x00020000

-nsf		0x10ca0000	0x00080000

-;

-; insert new packages here

-;

-snack		0x1E000000	0x00400000

-sound		0x1E400000	0x00400000

-snackogg	0x1E800000	0x00200000

diff --git a/win/configure b/win/configure
index fdd3adb..59bc5de 100755
--- a/win/configure
+++ b/win/configure
@@ -706,7 +706,6 @@ CFLAGS_WARNING
 CFLAGS_OPTIMIZE
 CFLAGS_DEBUG
 DL_LIBS
-CELIB_DIR
 CYGPATH
 TCL_THREADS
 SET_MAKE
@@ -768,8 +767,6 @@ enable_threads
 with_encoding
 enable_shared
 enable_64bit
-enable_wince
-with_celib
 enable_symbols
 enable_embedded_manifest
 '
@@ -1392,7 +1389,6 @@ Optional Features:
   --enable-threads        build with threads (default: on)
   --enable-shared         build and link with shared libraries (default: on)
   --enable-64bit          enable 64bit support (where applicable)
-  --enable-wince          enable Win/CE support (where applicable)
   --enable-symbols        build with debugging symbols (default: off)
   --enable-embedded-manifest
                           embed manifest if possible (default: yes)
@@ -1401,7 +1397,6 @@ Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-encoding         encoding for configuration values
-  --with-celib=DIR        use Windows/CE support library from DIR
 
 Some influential environment variables:
   CC          C compiler command
@@ -3811,33 +3806,6 @@ fi
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $do64bit" >&5
 $as_echo "$do64bit" >&6; }
 
-    # Cross-compiling options for Windows/CE builds
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if Windows/CE build is requested" >&5
-$as_echo_n "checking if Windows/CE build is requested... " >&6; }
-    # Check whether --enable-wince was given.
-if test "${enable_wince+set}" = set; then :
-  enableval=$enable_wince; doWince=$enableval
-else
-  doWince=no
-fi
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $doWince" >&5
-$as_echo "$doWince" >&6; }
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Windows/CE celib directory" >&5
-$as_echo_n "checking for Windows/CE celib directory... " >&6; }
-
-# Check whether --with-celib was given.
-if test "${with_celib+set}" = set; then :
-  withval=$with_celib; CELIB_DIR=$withval
-else
-  CELIB_DIR=NO_CELIB
-fi
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CELIB_DIR" >&5
-$as_echo "$CELIB_DIR" >&6; }
-
     # Set some defaults (may get changed below)
     EXTRA_CFLAGS=""
 
@@ -4336,107 +4304,7 @@ fi
 	    LINKBIN="link"
 	fi
 
-	if test "$doWince" != "no" ; then
-	    # Set defaults for common evc4/PPC2003 setup
-	    # Currently Tcl requires 300+, possibly 420+ for sockets
-	    CEVERSION=420; 		# could be 211 300 301 400 420 ...
-	    TARGETCPU=ARMV4;	# could be ARMV4 ARM MIPS SH3 X86 ...
-	    ARCH=ARM;		# could be ARM MIPS X86EM ...
-	    PLATFORM="Pocket PC 2003"; # or "Pocket PC 2002"
-	    if test "$doWince" != "yes"; then
-		# If !yes then the user specified something
-		# Reset ARCH to allow user to skip specifying it
-		ARCH=
-		eval `echo $doWince | awk -F "," '{ \
-	if (length($1)) { printf "CEVERSION=\"%s\"\n", $1; \
-	if ($1 < 400)	  { printf "PLATFORM=\"Pocket PC 2002\"\n" } }; \
-	if (length($2)) { printf "TARGETCPU=\"%s\"\n", toupper($2) }; \
-	if (length($3)) { printf "ARCH=\"%s\"\n", toupper($3) }; \
-	if (length($4)) { printf "PLATFORM=\"%s\"\n", $4 }; \
-		}'`
-		if test "x${ARCH}" = "x" ; then
-		    ARCH=$TARGETCPU;
-		fi
-	    fi
-	    OSVERSION=WCE$CEVERSION;
-	    if test "x${WCEROOT}" = "x" ; then
-		WCEROOT="C:/Program Files/Microsoft eMbedded C++ 4.0"
-		if test ! -d "${WCEROOT}" ; then
-		    WCEROOT="C:/Program Files/Microsoft eMbedded Tools"
-		fi
-	    fi
-	    if test "x${SDKROOT}" = "x" ; then
-		SDKROOT="C:/Program Files/Windows CE Tools"
-		if test ! -d "${SDKROOT}" ; then
-		    SDKROOT="C:/Windows CE Tools"
-		fi
-	    fi
-	    # The space-based-path will work for the Makefile, but will
-	    # not work if AC_TRY_COMPILE is called.
-	    WCEROOT=`echo "$WCEROOT" | sed -e 's!\\\!/!g'`
-	    SDKROOT=`echo "$SDKROOT" | sed -e 's!\\\!/!g'`
-	    CELIB_DIR=`echo "$CELIB_DIR" | sed -e 's!\\\!/!g'`
-	    if test ! -d "${CELIB_DIR}/inc"; then
-		as_fn_error $? "Invalid celib directory \"${CELIB_DIR}\"" "$LINENO" 5
-	    fi
-	    if test ! -d "${SDKROOT}/${OSVERSION}/${PLATFORM}/Lib/${TARGETCPU}"\
-		-o ! -d "${WCEROOT}/EVC/${OSVERSION}/bin"; then
-		as_fn_error $? "could not find PocketPC SDK or target compiler to enable WinCE mode $CEVERSION,$TARGETCPU,$ARCH,$PLATFORM" "$LINENO" 5
-	    else
-		CEINCLUDE="${SDKROOT}/${OSVERSION}/${PLATFORM}/include"
-		if test -d "${CEINCLUDE}/${TARGETCPU}" ; then
-		    CEINCLUDE="${CEINCLUDE}/${TARGETCPU}"
-		fi
-		CELIBPATH="${SDKROOT}/${OSVERSION}/${PLATFORM}/Lib/${TARGETCPU}"
-	    fi
-	fi
-
-	if test "$doWince" != "no" ; then
-	    CEBINROOT="${WCEROOT}/EVC/${OSVERSION}/bin"
-	    if test "${TARGETCPU}" = "X86"; then
-		CC="${CEBINROOT}/cl.exe"
-	    else
-		CC="${CEBINROOT}/cl${ARCH}.exe"
-	    fi
-	    CC="\"${CC}\" -I\"${CELIB_DIR}/inc\" -I\"${CEINCLUDE}\""
-	    RC="\"${WCEROOT}/Common/EVC/bin/rc.exe\""
-	    arch=`echo ${ARCH} | awk '{print tolower($0)}'`
-	    defs="${ARCH} _${ARCH}_ ${arch} PALM_SIZE _MT _DLL _WINDOWS"
-	    for i in $defs ; do
-		cat >>confdefs.h <<_ACEOF
-#define $i 1
-_ACEOF
-
-	    done
-#	    if test "${ARCH}" = "X86EM"; then
-#		AC_DEFINE_UNQUOTED(_WIN32_WCE_EMULATION)
-#	    fi
-	    cat >>confdefs.h <<_ACEOF
-#define _WIN32_WCE $CEVERSION
-_ACEOF
-
-	    cat >>confdefs.h <<_ACEOF
-#define UNDER_CE $CEVERSION
-_ACEOF
-
-	    CFLAGS_DEBUG="-nologo -Zi -Od"
-	    CFLAGS_OPTIMIZE="-nologo -O2"
-	    lversion=`echo ${CEVERSION} | sed -e 's/\(.\)\(..\)/\1\.\2/'`
-	    lflags="-nodefaultlib -MACHINE:${ARCH} -LIBPATH:\"${CELIBPATH}\" -subsystem:windowsce,${lversion} -nologo"
-	    LINKBIN="\"${CEBINROOT}/link.exe\""
-
-	    if test "${CEVERSION}" -lt 400 ; then
-		LIBS="coredll.lib corelibc.lib winsock.lib"
-	    else
-		LIBS="coredll.lib corelibc.lib ws2.lib"
-	    fi
-	    # celib currently stuck at wce300 status
-	    #LIBS="$LIBS \${CELIB_DIR}/wince-${ARCH}-pocket-${OSVERSION}-release/celib.lib"
-	    LIBS="$LIBS \"\${CELIB_DIR}/wince-${ARCH}-pocket-wce300-release/celib.lib\""
-	    LIBS_GUI="commctrl.lib commdlg.lib"
-	else
-	    LIBS_GUI="gdi32.lib comdlg32.lib imm32.lib comctl32.lib shell32.lib uuid.lib"
-	fi
+	LIBS_GUI="gdi32.lib comdlg32.lib imm32.lib comctl32.lib shell32.lib uuid.lib"
 
 	SHLIB_LD="${LINKBIN} -dll -incremental:no ${lflags}"
 	SHLIB_LD_LIBS='${LIBS}'
@@ -4467,7 +4335,7 @@ _ACEOF
 
 	# Specify linker flags depending on the type of app being
 	# built -- Console vs. Window.
-	if test "$doWince" != "no" -a "${TARGETCPU}" != "X86"; then
+	if test "${TARGETCPU}" != "X86"; then
 	    LDFLAGS_CONSOLE="-link ${lflags}"
 	    LDFLAGS_WINDOW=${LDFLAGS_CONSOLE}
 	else
diff --git a/win/makefile.vc b/win/makefile.vc
index 2bff871..de80452 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -1,1257 +1,947 @@
-#-------------------------------------------------------------

-# makefile.vc --

-#

-#	Microsoft Visual C++ makefile for use with nmake.exe v1.62+ (VC++ 5.0+)

-#

-# See the file "license.terms" for information on usage and redistribution

-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.

-#

-# Copyright (c) 1995-1996 Sun Microsystems, Inc.

-# Copyright (c) 1998-2000 Ajuba Solutions.

-# Copyright (c) 2001-2005 ActiveState Corporation.

-# Copyright (c) 2001-2004 David Gravereaux.

-# Copyright (c) 2003-2008 Pat Thoyts.

-#------------------------------------------------------------------------------

-

-# 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^

-the build instructions.

-!error $(MSG)

-!endif

-

-#------------------------------------------------------------------------------

-# HOW TO USE this makefile:

-#

-# 1)  It is now necessary to have MSVCDir, MSDevDir or MSSDK set in the

-#     environment.  This is used as a check to see if vcvars32.bat had been

-#     run prior to running nmake or during the installation of Microsoft

-#     Visual C++, MSVCDir had been set globally and the PATH adjusted.

-#     Either way is valid.

-#

-#     You'll need to run vcvars32.bat contained in the MsDev's vc(98)/bin

-#     directory to setup the proper environment, if needed, for your

-#     current setup.  This is a needed bootstrap requirement and allows the

-#     swapping of different environments to be easier.

-#

-# 2)  To use the Platform SDK (not expressly needed), run setenv.bat after

-#     vcvars32.bat according to the instructions for it.  This can also

-#     turn on the 64-bit compiler, if your SDK has it.

-#

-# 3)  Targets are:

-#	release  -- Builds the core, the shell and the dlls. (default)

-#	dlls     -- Just builds the windows extensions

-#	shell    -- Just builds the shell and the core.

-#	core     -- Only builds the core [tclXX.(dll|lib)].

-#	all      -- Builds everything.

-#	test     -- Builds and runs the test suite.

-#	tcltest  -- Just builds the test shell.

-#	install  -- Installs the built binaries and libraries to $(INSTALLDIR)

-#		    as the root of the install tree.

-#	tidy/clean/hose -- varying levels of cleaning.

-#	genstubs -- Rebuilds the Stubs table and support files (dev only).

-#	depend   -- Generates an accurate set of source dependancies for this

-#		    makefile.  Helpful to avoid problems when the sources are

-#		    refreshed and you rebuild, but can "overbuild" when common

-#		    headers like tclInt.h just get small changes.

-#	htmlhelp -- Builds a Windows .chm help file for Tcl and Tk from the

-#		    troff manual pages found in $(ROOT)\doc. You need to

-#		    have installed the HTML Help Compiler package from Microsoft

-#		    to produce the .chm file.

-#	winhelp  -- (deprecated) Builds the windows .hlp file for Tcl from

-#		    the troff man files found in $(ROOT)\doc. This type of

-#		    help file is deprecated by Microsoft in favour of html

-#		    help files (.chm)

-#

-# 4)  Macros usable on the commandline:

-#	INSTALLDIR=<path>

-#		Sets where to install Tcl from the built binaries.

-#		C:\Progra~1\Tcl is assumed when not specified.

-#

-#	OPTS=loimpact,msvcrt,nothreads,pdbs,profile,static,staticpkg,symbols,thrdalloc,tclalloc,unchecked,none

-#		Sets special options for the core.  The default is for none.

-#		Any combination of the above may be used (comma separated).

-#		'none' will over-ride everything to nothing.

-#

-#		loimpact = Adds a flag for how NT treats the heap to keep memory

-#			   in use, low.  This is said to impact alloc performance.

-#		msvcrt   = Affects the static option only to switch it from

-#			   using libcmt(d) as the C runtime [by default] to

-#			   msvcrt(d). This is useful for static embedding

-#			   support.

-#		nothreads= Turns off full multithreading support.

-#		pdbs     = Build detached symbols for release builds.

-#		profile  = Adds profiling hooks.  Map file is assumed.

-#		static   = Builds a static library of the core instead of a

-#			   dll.  The static library will contain the dde and reg

-#			   extensions. External applications who want to use

-#			   this, need to link with the stub library as well as

-#			   the static Tcl library.The shell will be static (and

-#			   large), as well.

-#		staticpkg = Affects the static option only to switch

-#			   tclshXX.exe to have the dde and reg extension linked

-#			   inside it.

-#		symbols  = Debug build. Links to the debug C runtime, disables

-#			   optimizations and creates pdb symbols files.

-#		thrdalloc = Use the thread allocator (shared global free pool)

-#			   This is the default on threaded builds.

-#		tclalloc = Use the old non-thread allocator

-#		unchecked= Allows a symbols build to not use the debug

-#			   enabled runtime (msvcrt.dll not msvcrtd.dll

-#			   or libcmt.lib not libcmtd.lib).

-#

-#	STATS=compdbg,memdbg,none

-#		Sets optional memory and bytecode compiler debugging code added

-#		to the core.  The default is for none.  Any combination of the

-#		above may be used (comma separated).  'none' will over-ride

-#		everything to nothing.

-#

-#		compdbg  = Enables byte compilation logging.

-#		memdbg   = Enables the debugging memory allocator.

-#

-#	CHECKS=64bit,fullwarn,nodep,none

-#		Sets special macros for checking compatibility.

-#

-#		64bit    = Enable 64bit portability warnings (if available)

-#		fullwarn = Builds with full compiler and link warnings enabled.

-#			    Very verbose.

-#		nodep	 = Turns off compatibility macros to ensure the core

-#			    isn't being built with deprecated functions.

-#

-#	MACHINE=(ARM|AMD64|IA64|IX86)

-#		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

-#		when not specified. If the CPU environment variable has been

-#		set (ie: recent Platform SDK) then MACHINE is set from CPU.

-#

-#	TMP_DIR=<path>

-#	OUT_DIR=<path>

-#		Hooks to allow the intermediate and output directories to be

-#		changed.  $(OUT_DIR) is assumed to be

-#		$(BINROOT)\(Release|Debug) based on if symbols are requested.

-#		$(TMP_DIR) will de $(OUT_DIR)\<buildtype> by default.

-#

-#	TESTPAT=<file>

-#		Reads the tests requested to be run from this file.

-#

-#	CFG_ENCODING=encoding

-#		name of encoding for configuration information. Defaults

-#		to cp1252

-#

-# 5)  Examples:

-#

-#	Basic syntax of calling nmake looks like this:

-#	nmake [-nologo] -f makefile.vc [target|macrodef [target|macrodef] [...]]

-#

-#                        Standard (no frills)

-#       c:\tcl_src\win\>c:\progra~1\micros~1\vc98\bin\vcvars32.bat

-#       Setting environment for using Microsoft Visual C++ tools.

-#       c:\tcl_src\win\>nmake -f makefile.vc release

-#       c:\tcl_src\win\>nmake -f makefile.vc install INSTALLDIR=c:\progra~1\tcl

-#

-#                         Building for Win64

-#       c:\tcl_src\win\>c:\progra~1\micros~1\vc98\bin\vcvars32.bat

-#       Setting environment for using Microsoft Visual C++ tools.

-#       c:\tcl_src\win\>c:\progra~1\platfo~1\setenv.bat /pre64 /RETAIL

-#       Targeting Windows pre64 RETAIL

-#       c:\tcl_src\win\>nmake -f makefile.vc MACHINE=IA64

-#

-#------------------------------------------------------------------------------

-#==============================================================================

-###############################################################################

-

-

-#    //==================================================================\\

-#   >>[               -> Do not modify below this line. <-               ]<<

-#   >>[  Please, use the commandline macros to modify how Tcl is built.  ]<<

-#   >>[  If you need more features, send us a patch for more macros.     ]<<

-#    \\==================================================================//

-

-

-###############################################################################

-#==============================================================================

-#------------------------------------------------------------------------------

-

-!if !exist("makefile.vc")

-MSG = ^

-You must run this makefile only from the directory it is in.^

-Please `cd` to its location first.

-!error $(MSG)

-!endif

-

-PROJECT = tcl

-!include "rules.vc"

-

-STUBPREFIX      = $(PROJECT)stub

-DOTVERSION      = $(TCL_MAJOR_VERSION).$(TCL_MINOR_VERSION)

-VERSION         = $(TCL_MAJOR_VERSION)$(TCL_MINOR_VERSION)

-

-DDEDOTVERSION = 1.4

-DDEVERSION = $(DDEDOTVERSION:.=)

-

-REGDOTVERSION = 1.3

-REGVERSION = $(REGDOTVERSION:.=)

-

-BINROOT		= $(MAKEDIR)     # originally .

-ROOT		= $(MAKEDIR)\..  # originally ..

-

-TCLIMPLIB	= $(OUT_DIR)\$(PROJECT)$(VERSION)$(SUFX).lib

-TCLLIBNAME	= $(PROJECT)$(VERSION)$(SUFX).$(EXT)

-TCLLIB		= $(OUT_DIR)\$(TCLLIBNAME)

-

-TCLSTUBLIBNAME	= $(STUBPREFIX)$(VERSION).lib

-TCLSTUBLIB	= $(OUT_DIR)\$(TCLSTUBLIBNAME)

-

-TCLSHNAME	= $(PROJECT)sh$(VERSION)$(SUFX).exe

-TCLSH		= $(OUT_DIR)\$(TCLSHNAME)

-

-TCLREGLIBNAME	= $(PROJECT)reg$(REGVERSION)$(SUFX:t=).$(EXT)

-TCLREGLIB	= $(OUT_DIR)\$(TCLREGLIBNAME)

-

-TCLDDELIBNAME	= $(PROJECT)dde$(DDEVERSION)$(SUFX:t=).$(EXT)

-TCLDDELIB	= $(OUT_DIR)\$(TCLDDELIBNAME)

-

-TCLTEST		= $(OUT_DIR)\$(PROJECT)test.exe

-CAT32		= $(OUT_DIR)\cat32.exe

-

-# Can we run what we build? IX86 runs on all architectures.

-!ifndef TCLSH_NATIVE

-!if "$(MACHINE)" == "IX86" || "$(MACHINE)" == "$(NATIVE_ARCH)"

-TCLSH_NATIVE	= $(TCLSH)

-!else

-!error You must explicitly set TCLSH_NATIVE for cross-compilation

-!endif

-!endif

-

-### Make sure we use backslash only.

-LIB_INSTALL_DIR		= $(_INSTALLDIR)\lib

-BIN_INSTALL_DIR		= $(_INSTALLDIR)\bin

-DOC_INSTALL_DIR		= $(_INSTALLDIR)\doc

-SCRIPT_INSTALL_DIR	= $(_INSTALLDIR)\lib\tcl$(DOTVERSION)

-INCLUDE_INSTALL_DIR	= $(_INSTALLDIR)\include

-

-TCLSHOBJS = \

-	$(TMP_DIR)\tclAppInit.obj \

-!if !$(STATIC_BUILD)

-!if $(TCL_USE_STATIC_PACKAGES)

-	$(TMP_DIR)\tclWinReg.obj \

-	$(TMP_DIR)\tclWinDde.obj \

-!endif

-!endif

-	$(TMP_DIR)\tclsh.res

-

-TCLTESTOBJS = \

-	$(TMP_DIR)\tclTest.obj \

-	$(TMP_DIR)\tclTestObj.obj \

-	$(TMP_DIR)\tclTestProcBodyObj.obj \

-	$(TMP_DIR)\tclThreadTest.obj \

-	$(TMP_DIR)\tclWinTest.obj \

-!if !$(STATIC_BUILD)

-!if $(TCL_USE_STATIC_PACKAGES)

-	$(TMP_DIR)\tclWinReg.obj \

-	$(TMP_DIR)\tclWinDde.obj \

-!endif

-!endif

-	$(TMP_DIR)\testMain.obj

-

-COREOBJS = \

-	$(TMP_DIR)\regcomp.obj \

-	$(TMP_DIR)\regerror.obj \

-	$(TMP_DIR)\regexec.obj \

-	$(TMP_DIR)\regfree.obj \

-	$(TMP_DIR)\tclAlloc.obj \

-	$(TMP_DIR)\tclAssembly.obj \

-	$(TMP_DIR)\tclAsync.obj \

-	$(TMP_DIR)\tclBasic.obj \

-	$(TMP_DIR)\tclBinary.obj \

-	$(TMP_DIR)\tclCkalloc.obj \

-	$(TMP_DIR)\tclClock.obj \

-	$(TMP_DIR)\tclCmdAH.obj \

-	$(TMP_DIR)\tclCmdIL.obj \

-	$(TMP_DIR)\tclCmdMZ.obj \

-	$(TMP_DIR)\tclCompCmds.obj \

-	$(TMP_DIR)\tclCompCmdsGR.obj \

-	$(TMP_DIR)\tclCompCmdsSZ.obj \

-	$(TMP_DIR)\tclCompExpr.obj \

-	$(TMP_DIR)\tclCompile.obj \

-	$(TMP_DIR)\tclConfig.obj \

-	$(TMP_DIR)\tclDate.obj \

-	$(TMP_DIR)\tclDictObj.obj \

-	$(TMP_DIR)\tclDisassemble.obj \

-	$(TMP_DIR)\tclEncoding.obj \

-	$(TMP_DIR)\tclEnsemble.obj \

-	$(TMP_DIR)\tclEnv.obj \

-	$(TMP_DIR)\tclEvent.obj \

-	$(TMP_DIR)\tclExecute.obj \

-	$(TMP_DIR)\tclFCmd.obj \

-	$(TMP_DIR)\tclFileName.obj \

-	$(TMP_DIR)\tclGet.obj \

-	$(TMP_DIR)\tclHash.obj \

-	$(TMP_DIR)\tclHistory.obj \

-	$(TMP_DIR)\tclIndexObj.obj \

-	$(TMP_DIR)\tclInterp.obj \

-	$(TMP_DIR)\tclIO.obj \

-	$(TMP_DIR)\tclIOCmd.obj \

-	$(TMP_DIR)\tclIOGT.obj \

-	$(TMP_DIR)\tclIOSock.obj \

-	$(TMP_DIR)\tclIOUtil.obj \

-	$(TMP_DIR)\tclIORChan.obj \

-	$(TMP_DIR)\tclIORTrans.obj \

-	$(TMP_DIR)\tclLink.obj \

-	$(TMP_DIR)\tclListObj.obj \

-	$(TMP_DIR)\tclLiteral.obj \

-	$(TMP_DIR)\tclLoad.obj \

-	$(TMP_DIR)\tclMain.obj \

-	$(TMP_DIR)\tclMain2.obj \

-	$(TMP_DIR)\tclNamesp.obj \

-	$(TMP_DIR)\tclNotify.obj \

-	$(TMP_DIR)\tclOO.obj \

-	$(TMP_DIR)\tclOOBasic.obj \

-	$(TMP_DIR)\tclOOCall.obj \

-	$(TMP_DIR)\tclOODefineCmds.obj \

-	$(TMP_DIR)\tclOOInfo.obj \

-	$(TMP_DIR)\tclOOMethod.obj \

-	$(TMP_DIR)\tclOOStubInit.obj \

-	$(TMP_DIR)\tclObj.obj \

-	$(TMP_DIR)\tclOptimize.obj \

-	$(TMP_DIR)\tclPanic.obj \

-	$(TMP_DIR)\tclParse.obj \

-	$(TMP_DIR)\tclPathObj.obj \

-	$(TMP_DIR)\tclPipe.obj \

-	$(TMP_DIR)\tclPkg.obj \

-	$(TMP_DIR)\tclPkgConfig.obj \

-	$(TMP_DIR)\tclPosixStr.obj \

-	$(TMP_DIR)\tclPreserve.obj \

-	$(TMP_DIR)\tclProc.obj \

-	$(TMP_DIR)\tclRegexp.obj \

-	$(TMP_DIR)\tclResolve.obj \

-	$(TMP_DIR)\tclResult.obj \

-	$(TMP_DIR)\tclScan.obj \

-	$(TMP_DIR)\tclStringObj.obj \

-	$(TMP_DIR)\tclStrToD.obj \

-	$(TMP_DIR)\tclStubInit.obj \

-	$(TMP_DIR)\tclThread.obj \

-	$(TMP_DIR)\tclThreadAlloc.obj \

-	$(TMP_DIR)\tclThreadJoin.obj \

-	$(TMP_DIR)\tclThreadStorage.obj \

-	$(TMP_DIR)\tclTimer.obj \

-	$(TMP_DIR)\tclTomMathInterface.obj \

-	$(TMP_DIR)\tclTrace.obj \

-	$(TMP_DIR)\tclUtf.obj \

-	$(TMP_DIR)\tclUtil.obj \

-	$(TMP_DIR)\tclVar.obj \

-	$(TMP_DIR)\tclZlib.obj

-

-ZLIBOBJS = \

-	$(TMP_DIR)\adler32.obj \

-	$(TMP_DIR)\compress.obj \

-	$(TMP_DIR)\crc32.obj \

-	$(TMP_DIR)\deflate.obj \

-	$(TMP_DIR)\infback.obj \

-	$(TMP_DIR)\inffast.obj \

-	$(TMP_DIR)\inflate.obj \

-	$(TMP_DIR)\inftrees.obj \

-	$(TMP_DIR)\trees.obj \

-	$(TMP_DIR)\uncompr.obj \

-	$(TMP_DIR)\zutil.obj

-

-TOMMATHOBJS = \

-	$(TMP_DIR)\bncore.obj \

-	$(TMP_DIR)\bn_reverse.obj \

-	$(TMP_DIR)\bn_fast_s_mp_mul_digs.obj \

-	$(TMP_DIR)\bn_fast_s_mp_sqr.obj \

-	$(TMP_DIR)\bn_mp_add.obj \

-	$(TMP_DIR)\bn_mp_add_d.obj \

-	$(TMP_DIR)\bn_mp_and.obj \

-	$(TMP_DIR)\bn_mp_clamp.obj \

-	$(TMP_DIR)\bn_mp_clear.obj \

-	$(TMP_DIR)\bn_mp_clear_multi.obj \

-	$(TMP_DIR)\bn_mp_cmp.obj \

-	$(TMP_DIR)\bn_mp_cmp_d.obj \

-	$(TMP_DIR)\bn_mp_cmp_mag.obj \

-	$(TMP_DIR)\bn_mp_cnt_lsb.obj \

-	$(TMP_DIR)\bn_mp_copy.obj \

-	$(TMP_DIR)\bn_mp_count_bits.obj \

-	$(TMP_DIR)\bn_mp_div.obj \

-	$(TMP_DIR)\bn_mp_div_d.obj \

-	$(TMP_DIR)\bn_mp_div_2.obj \

-	$(TMP_DIR)\bn_mp_div_2d.obj \

-	$(TMP_DIR)\bn_mp_div_3.obj \

-	$(TMP_DIR)\bn_mp_exch.obj \

-	$(TMP_DIR)\bn_mp_expt_d.obj \

-	$(TMP_DIR)\bn_mp_expt_d_ex.obj \

-	$(TMP_DIR)\bn_mp_get_int.obj \

-	$(TMP_DIR)\bn_mp_get_long.obj \

-	$(TMP_DIR)\bn_mp_get_long_long.obj \

-	$(TMP_DIR)\bn_mp_grow.obj \

-	$(TMP_DIR)\bn_mp_init.obj \

-	$(TMP_DIR)\bn_mp_init_copy.obj \

-	$(TMP_DIR)\bn_mp_init_multi.obj \

-	$(TMP_DIR)\bn_mp_init_set.obj \

-	$(TMP_DIR)\bn_mp_init_set_int.obj \

-	$(TMP_DIR)\bn_mp_init_size.obj \

-	$(TMP_DIR)\bn_mp_karatsuba_mul.obj \

-	$(TMP_DIR)\bn_mp_karatsuba_sqr.obj \

-	$(TMP_DIR)\bn_mp_lshd.obj \

-	$(TMP_DIR)\bn_mp_mod.obj \

-	$(TMP_DIR)\bn_mp_mod_2d.obj \

-	$(TMP_DIR)\bn_mp_mul.obj \

-	$(TMP_DIR)\bn_mp_mul_2.obj \

-	$(TMP_DIR)\bn_mp_mul_2d.obj \

-	$(TMP_DIR)\bn_mp_mul_d.obj \

-	$(TMP_DIR)\bn_mp_neg.obj \

-	$(TMP_DIR)\bn_mp_or.obj \

-	$(TMP_DIR)\bn_mp_radix_size.obj \

-	$(TMP_DIR)\bn_mp_radix_smap.obj \

-	$(TMP_DIR)\bn_mp_read_radix.obj \

-	$(TMP_DIR)\bn_mp_rshd.obj \

-	$(TMP_DIR)\bn_mp_set.obj \

-	$(TMP_DIR)\bn_mp_set_int.obj \

-	$(TMP_DIR)\bn_mp_set_long.obj \

-	$(TMP_DIR)\bn_mp_set_long_long.obj \

-	$(TMP_DIR)\bn_mp_shrink.obj \

-	$(TMP_DIR)\bn_mp_sqr.obj \

-	$(TMP_DIR)\bn_mp_sqrt.obj \

-	$(TMP_DIR)\bn_mp_sub.obj \

-	$(TMP_DIR)\bn_mp_sub_d.obj \

-	$(TMP_DIR)\bn_mp_to_unsigned_bin.obj \

-	$(TMP_DIR)\bn_mp_to_unsigned_bin_n.obj \

-	$(TMP_DIR)\bn_mp_toom_mul.obj \

-	$(TMP_DIR)\bn_mp_toom_sqr.obj \

-	$(TMP_DIR)\bn_mp_toradix_n.obj \

-	$(TMP_DIR)\bn_mp_unsigned_bin_size.obj \

-	$(TMP_DIR)\bn_mp_xor.obj \

-	$(TMP_DIR)\bn_mp_zero.obj \

-	$(TMP_DIR)\bn_s_mp_add.obj \

-	$(TMP_DIR)\bn_s_mp_mul_digs.obj \

-	$(TMP_DIR)\bn_s_mp_sqr.obj \

-	$(TMP_DIR)\bn_s_mp_sub.obj

-

-PLATFORMOBJS = \

-	$(TMP_DIR)\tclWin32Dll.obj \

-	$(TMP_DIR)\tclWinChan.obj \

-	$(TMP_DIR)\tclWinConsole.obj \

-	$(TMP_DIR)\tclWinError.obj \

-	$(TMP_DIR)\tclWinFCmd.obj \

-	$(TMP_DIR)\tclWinFile.obj \

-	$(TMP_DIR)\tclWinInit.obj \

-	$(TMP_DIR)\tclWinLoad.obj \

-	$(TMP_DIR)\tclWinNotify.obj \

-	$(TMP_DIR)\tclWinPipe.obj \

-	$(TMP_DIR)\tclWinSerial.obj \

-	$(TMP_DIR)\tclWinSock.obj \

-	$(TMP_DIR)\tclWinThrd.obj \

-	$(TMP_DIR)\tclWinTime.obj \

-!if $(STATIC_BUILD)

-	$(TMP_DIR)\tclWinReg.obj \

-	$(TMP_DIR)\tclWinDde.obj \

-!else

-	$(TMP_DIR)\tcl.res

-!endif

-

-TCLOBJS = $(COREOBJS) $(ZLIBOBJS) $(TOMMATHOBJS) $(PLATFORMOBJS)

-

-TCLSTUBOBJS = \

-	$(TMP_DIR)\tclStubLib.obj \

-	$(TMP_DIR)\tclTomMathStubLib.obj \

-	$(TMP_DIR)\tclOOStubLib.obj

-

-### The following paths CANNOT have spaces in them.

-COMPATDIR	= $(ROOT)\compat

-DOCDIR		= $(ROOT)\doc

-GENERICDIR	= $(ROOT)\generic

-TOMMATHDIR	= $(ROOT)\libtommath

-TOOLSDIR	= $(ROOT)\tools

-WINDIR		= $(ROOT)\win

-PKGSDIR		= $(ROOT)\pkgs

-

-#---------------------------------------------------------------------

-# Compile flags

-#---------------------------------------------------------------------

-

-!if !$(DEBUG)

-!if $(OPTIMIZING)

-### This cranks the optimization level to maximize speed

-cdebug	= -O2 $(OPTIMIZATIONS)

-!else

-cdebug	=

-!endif

-!if $(SYMBOLS)

-cdebug	= $(cdebug) -Zi

-!endif

-!else if "$(MACHINE)" == "IA64" || "$(MACHINE)" == "AMD64"

-### Warnings are too many, can't support warnings into errors.

-cdebug	= -Zi -Od $(DEBUGFLAGS)

-!else

-cdebug	= -Zi -WX $(DEBUGFLAGS)

-!endif

-

-### Common compiler options that are architecture specific

-!if "$(MACHINE)" == "ARM"

-carch = -D_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE

-!else

-carch =

-!endif

-

-### Declarations common to all compiler options

-cwarn = $(WARNINGS) -D _CRT_SECURE_NO_DEPRECATE -D _CRT_NONSTDC_NO_DEPRECATE

-cflags = -nologo -c $(COMPILERFLAGS) $(carch) $(cwarn) -Fp$(TMP_DIR)^\

-

-!if $(MSVCRT)

-!if $(DEBUG) && !$(UNCHECKED)

-crt = -MDd

-!else

-crt = -MD

-!endif

-!else

-!if $(DEBUG) && !$(UNCHECKED)

-crt = -MTd

-!else

-crt = -MT

-!endif

-!endif

-

-TCL_INCLUDES	= -I"$(WINDIR)" -I"$(GENERICDIR)" -I"$(TOMMATHDIR)"

-TCL_DEFINES	= -DMP_PREC=4 -Dinline=__inline -DHAVE_ZLIB=1

-BASE_CFLAGS	= $(cflags) $(cdebug) $(crt) $(TCL_INCLUDES) $(TCL_DEFINES)

-CON_CFLAGS	= $(cflags) $(cdebug) $(crt) -DCONSOLE

-TCL_CFLAGS	= $(BASE_CFLAGS) $(OPTDEFINES)

-STUB_CFLAGS     = $(cflags) $(cdebug) $(OPTDEFINES)

-

-

-#---------------------------------------------------------------------

-# Link flags

-#---------------------------------------------------------------------

-

-!if $(DEBUG)

-ldebug	= -debug -debugtype:cv

-!else

-ldebug	= -release -opt:ref -opt:icf,3

-!if $(SYMBOLS)

-ldebug	= $(ldebug) -debug -debugtype:cv

-!endif

-!endif

-

-### Declarations common to all linker options

-lflags	= -nologo -machine:$(MACHINE) $(LINKERFLAGS) $(ldebug)

-

-!if $(PROFILE)

-lflags	= $(lflags) -profile

-!endif

-

-!if $(MSVCRT) && !($(DEBUG) && !$(UNCHECKED)) && $(VCVERSION) >= 1900

-lflags	= $(lflags) -nodefaultlib:libucrt.lib

-!endif

-

-!if $(ALIGN98_HACK) && !$(STATIC_BUILD)

-### Align sections for PE size savings.

-lflags	= $(lflags) -opt:nowin98

-!else if !$(ALIGN98_HACK) && $(STATIC_BUILD)

-### Align sections for speed in loading by choosing the virtual page size.

-lflags	= $(lflags) -align:4096

-!endif

-

-!if $(LOIMPACT)

-lflags	= $(lflags) -ws:aggressive

-!endif

-

-dlllflags = $(lflags) -dll

-conlflags = $(lflags) -subsystem:console

-guilflags = $(lflags) -subsystem:windows

-

-baselibs   = netapi32.lib kernel32.lib user32.lib advapi32.lib userenv.lib ws2_32.lib

-# Avoid 'unresolved external symbol __security_cookie' errors.

-# c.f. http://support.microsoft.com/?id=894573

-!if "$(MACHINE)" == "IA64" || "$(MACHINE)" == "AMD64"

-!if $(VCVERSION) > 1399 && $(VCVERSION) < 1500

-baselibs   = $(baselibs) bufferoverflowU.lib

-!endif

-!endif

-!if $(MSVCRT) && !($(DEBUG) && !$(UNCHECKED)) && $(VCVERSION) >= 1900

-baselibs   = $(baselibs) ucrt.lib

-!endif

-

-#---------------------------------------------------------------------

-# TclTest flags

-#---------------------------------------------------------------------

-

-!if "$(TESTPAT)" != ""

-TESTFLAGS = $(TESTFLAGS) -file $(TESTPAT)

-!endif

-

-

-#---------------------------------------------------------------------

-# Project specific targets

-#---------------------------------------------------------------------

-

-release:    setup $(TCLSH) $(TCLSTUBLIB) dlls pkgs

-core:	    setup $(TCLLIB) $(TCLSTUBLIB)

-shell:	    setup $(TCLSH)

-dlls:	    setup $(TCLREGLIB) $(TCLDDELIB)

-all:	    setup $(TCLSH) $(TCLSTUBLIB) dlls $(CAT32) pkgs

-tcltest:    setup $(TCLTEST) dlls $(CAT32)

-install:    install-binaries install-libraries install-docs install-pkgs

-

-test: test-core test-pkgs

-test-core: setup $(TCLTEST) dlls $(CAT32)

-	set TCL_LIBRARY=$(ROOT:\=/)/library

-!if "$(OS)" == "Windows_NT"  || "$(MSVCDIR)" == "IDE"

-	$(DEBUGGER) $(TCLTEST) "$(ROOT:\=/)/tests/all.tcl" $(TESTFLAGS) -loadfile <<

-		package ifneeded dde 1.4.0 [list load "$(TCLDDELIB:\=/)" dde]

-		package ifneeded registry 1.3.2 [list load "$(TCLREGLIB:\=/)" registry]

-<<

-!else

-	@echo Please wait while the tests are collected...

-	$(TCLTEST) "$(ROOT:\=/)/tests/all.tcl" $(TESTFLAGS) -loadfile << > tests.log

-		package ifneeded dde 1.4.0 "$(TCLDDELIB:\=/)" dde]

-		package ifneeded registry 1.3.2 "$(TCLREGLIB:\=/)" registry]

-<<

-	type tests.log | more

-!endif

-

-runtest: setup $(TCLTEST) dlls $(CAT32)

-	set TCL_LIBRARY=$(ROOT:\=/)/library

-	$(DEBUGGER) $(TCLTEST) $(SCRIPT)

-

-runshell: setup $(TCLSH) dlls

-	set TCL_LIBRARY=$(ROOT:\=/)/library

-	$(DEBUGGER) $(TCLSH) $(SCRIPT)

-

-setup:

-	@if not exist $(OUT_DIR)\nul mkdir $(OUT_DIR)

-	@if not exist $(TMP_DIR)\nul mkdir $(TMP_DIR)

-

-!if !$(STATIC_BUILD)

-$(TCLIMPLIB): $(TCLLIB)

-!endif

-

-$(TCLLIB): $(TCLOBJS)

-!if $(STATIC_BUILD)

-	$(lib32) -nologo $(LINKERFLAGS) -out:$@ @<<

-$**

-<<

-!else

-	$(link32) $(dlllflags) -base:@$(WINDIR)\coffbase.txt,tcl -out:$@ \

-		$(baselibs) @<<

-$**

-<<

-	$(_VC_MANIFEST_EMBED_DLL)

-!endif

-

-$(TCLSTUBLIB): $(TCLSTUBOBJS)

-	$(lib32) -nologo $(LINKERFLAGS) -nodefaultlib -out:$@ $(TCLSTUBOBJS)

-

-$(TCLSH): $(TCLSHOBJS) $(TCLSTUBLIB) $(TCLIMPLIB)

-	$(link32) $(conlflags) -stack:2300000 -out:$@ $(baselibs) $**

-	$(_VC_MANIFEST_EMBED_EXE)

-

-$(TCLTEST): $(TCLTESTOBJS) $(TCLSTUBLIB) $(TCLIMPLIB)

-	$(link32) $(conlflags) -stack:2300000 -out:$@ $(baselibs) $**

-	$(_VC_MANIFEST_EMBED_EXE)

-

-!if $(STATIC_BUILD)

-$(TCLDDELIB): $(TMP_DIR)\tclWinDde.obj

-	$(lib32) -nologo $(LINKERFLAGS) -out:$@ $**

-!else

-$(TCLDDELIB): $(TMP_DIR)\tclWinDde.obj $(TCLSTUBLIB)

-	$(link32) $(dlllflags) -base:@$(WINDIR)\coffbase.txt,tcldde -out:$@ \

-		$** $(baselibs)

-	$(_VC_MANIFEST_EMBED_DLL)

-!endif

-

-!if $(STATIC_BUILD)

-$(TCLREGLIB): $(TMP_DIR)\tclWinReg.obj

-	$(lib32) -nologo $(LINKERFLAGS) -out:$@ $**

-!else

-$(TCLREGLIB): $(TMP_DIR)\tclWinReg.obj $(TCLSTUBLIB)

-	$(link32) $(dlllflags) -base:@$(WINDIR)\coffbase.txt,tclreg -out:$@ \

-		$** $(baselibs)

-	$(_VC_MANIFEST_EMBED_DLL)

-!endif

-

-pkgs:

-	@for /d %d in ($(PKGSDIR)\*) do \

-	  @if exist "%~fd\win\makefile.vc" ( \

-	    pushd "%~fd\win" & \

-	    $(MAKE) -$(MAKEFLAGS) -f makefile.vc TCLDIR=$(ROOT) &\

-	    popd \

-	  )

-

-test-pkgs:

-	@for /d %d in ($(PKGSDIR)\*) do \

-	  @if exist "%~fd\win\makefile.vc" ( \

-	    pushd "%~fd\win" & \

-	    $(MAKE) -$(MAKEFLAGS) -f makefile.vc TCLDIR=$(ROOT) test &\

-	    popd \

-	  )

-

-install-pkgs:

-	@for /d %d in ($(PKGSDIR)\*) do \

-	  @if exist "%~fd\win\makefile.vc" ( \

-	    pushd "%~fd\win" & \

-	    $(MAKE) -$(MAKEFLAGS) -f makefile.vc TCLDIR=$(ROOT) install &\

-	    popd \

-	  )

-

-clean-pkgs:

-	@for /d %d in ($(PKGSDIR)\*) do \

-	  @if exist "%~fd\win\makefile.vc" ( \

-	    pushd "%~fd\win" & \

-	    $(MAKE) -$(MAKEFLAGS) -f makefile.vc TCLDIR=$(ROOT) clean &\

-	    popd \

-	  )

-

-$(CAT32): $(WINDIR)\cat.c

-	$(cc32) $(CON_CFLAGS) -Fo$(TMP_DIR)\ $?

-	$(link32) $(conlflags) -out:$@ -stack:16384 $(TMP_DIR)\cat.obj \

-		$(baselibs)

-	$(_VC_MANIFEST_EMBED_EXE)

-

-#---------------------------------------------------------------------

-# Regenerate the stubs files.  [Development use only]

-#---------------------------------------------------------------------

-

-genstubs:

-!if !exist($(TCLSH))

-	@echo Build tclsh first!

-!else

-	$(TCLSH) $(TOOLSDIR:\=/)/genStubs.tcl $(GENERICDIR:\=/) \

-		$(GENERICDIR:\=/)/tcl.decls $(GENERICDIR:\=/)/tclInt.decls \

-		$(GENERICDIR:\=/)/tclTomMath.decls

-	$(TCLSH) $(TOOLSDIR:\=/)/genStubs.tcl $(GENERICDIR:\=/) \

-		$(GENERICDIR:\=/)/tclOO.decls

-!endif

-

-

-#----------------------------------------------------------------------

-# The following target generates the file generic/tclTomMath.h.

-# It needs to be run (and the results checked) after updating

-# to a new release of libtommath.

-#----------------------------------------------------------------------

-

-gentommath_h:

-!if !exist($(TCLSH))

-	@echo Build tclsh first!

-!else

-	$(TCLSH) "$(TOOLSDIR:\=/)/fix_tommath_h.tcl" \

-		"$(TOMMATHDIR:\=/)/tommath.h" \

-		> "$(GENERICDIR)\tclTomMath.h"

-!endif

-

-#---------------------------------------------------------------------

-# Build the Windows HTML help file.

-#---------------------------------------------------------------------

-

-# NOTE: you can define HHC on the command-line to override this

-!ifndef HHC

-HHC=""%ProgramFiles%\HTML Help Workshop\hhc.exe""

-!endif

-HTMLDIR=$(OUT_DIR)\html

-HTMLBASE=TclTk$(VERSION)

-HHPFILE=$(HTMLDIR)\$(HTMLBASE).hhp

-CHMFILE=$(HTMLDIR)\$(HTMLBASE).chm

-

-htmlhelp: chmsetup $(CHMFILE)

-

-$(CHMFILE): $(DOCDIR)\*

-	@$(TCLSH) $(TOOLSDIR)\tcltk-man2html.tcl "--htmldir=$(HTMLDIR)"

-	@echo Compiling HTML help project

-	-$(HHC) <<$(HHPFILE) >NUL

-[OPTIONS]

-Compatibility=1.1 or later

-Compiled file=$(HTMLBASE).chm

-Default topic=contents.htm

-Display compile progress=no

-Error log file=$(HTMLBASE).log

-Full-text search=Yes

-Language=0x409 English (United States)

-Title=Tcl/Tk $(DOT_VERSION) Help

-[FILES]

-contents.htm

-docs.css

-Keywords\*.htm

-TclCmd\*.htm

-TclLib\*.htm

-TkCmd\*.htm

-TkLib\*.htm

-UserCmd\*.htm

-<<

-

-chmsetup:

-	@if not exist $(HTMLDIR)\nul mkdir $(HTMLDIR)

-

-#-------------------------------------------------------------------------

-# Build the old-style Windows .hlp file

-#-------------------------------------------------------------------------

-

-TCLHLPBASE	= $(PROJECT)$(VERSION)

-HELPFILE	= $(OUT_DIR)\$(TCLHLPBASE).hlp

-HELPCNT		= $(OUT_DIR)\$(TCLHLPBASE).cnt

-DOCTMP_DIR	= $(OUT_DIR)\$(PROJECT)_docs

-HELPRTF		= $(DOCTMP_DIR)\$(PROJECT).rtf

-MAN2HELP	= $(DOCTMP_DIR)\man2help.tcl

-MAN2HELP2	= $(DOCTMP_DIR)\man2help2.tcl

-INDEX		= $(DOCTMP_DIR)\index.tcl

-BMP		= $(DOCTMP_DIR)\feather.bmp

-BMP_NOPATH	= feather.bmp

-MAN2TCL		= $(DOCTMP_DIR)\man2tcl.exe

-

-winhelp: docsetup $(HELPFILE)

-

-docsetup:

-	@if not exist $(DOCTMP_DIR)\nul mkdir $(DOCTMP_DIR)

-

-$(MAN2HELP) $(MAN2HELP2) $(INDEX) $(BMP): $(TOOLSDIR)\$$(@F)

-	@$(CPY) $(TOOLSDIR)\$(@F) $(@D)

-

-$(HELPFILE): $(HELPRTF) $(BMP)

-	cd $(DOCTMP_DIR)

-	start /wait hcrtf.exe -x <<$(PROJECT).hpj

-[OPTIONS]

-COMPRESS=12 Hall Zeck

-LCID=0x409 0x0 0x0 ; English (United States)

-TITLE=Tcl/Tk Reference Manual

-BMROOT=.

-CNT=$(@B).cnt

-HLP=$(@B).hlp

-

-[FILES]

-$(PROJECT).rtf

-

-[WINDOWS]

-main="Tcl/Tk Reference Manual",,27648,(r15263976),(r65535)

-

-[CONFIG]

-BrowseButtons()

-CreateButton(1, "Web", ExecFile("http://www.tcl.tk"))

-CreateButton(2, "SF", ExecFile("http://sf.net/projects/tcl"))

-CreateButton(3, "Wiki", ExecFile("http://wiki.tcl.tk"))

-CreateButton(4, "FAQ", ExecFile("http://www.purl.org/NET/Tcl-FAQ/"))

-<<

-	cd $(MAKEDIR)

-	@$(CPY) "$(DOCTMP_DIR)\$(@B).hlp" "$(OUT_DIR)"

-	@$(CPY) "$(DOCTMP_DIR)\$(@B).cnt" "$(OUT_DIR)"

-

-$(MAN2TCL): $(TOOLSDIR)\$$(@B).c

-	$(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:\=/)

-

-install-docs:

-!if exist("$(CHMFILE)")

-	@echo Installing compiled HTML help

-	@$(CPY) "$(CHMFILE)" "$(DOC_INSTALL_DIR)\"

-!endif

-!if exist("$(HELPFILE)")

-	@echo Installing Windows help

-	@$(CPY) "$(HELPFILE)" "$(DOC_INSTALL_DIR)\"

-	@$(CPY) "$(HELPCNT)" "$(DOC_INSTALL_DIR)\"

-!endif

-

-#---------------------------------------------------------------------

-# Build tclConfig.sh for the TEA build system.

-#---------------------------------------------------------------------

-

-tclConfig: $(OUT_DIR)\tclConfig.sh

-

-$(OUT_DIR)\tclConfig.sh: $(WINDIR)\tclConfig.sh.in

-	@echo Creating tclConfig.sh

-        @nmakehlp -s << $** >$@

-@TCL_DLL_FILE@       $(TCLLIBNAME)

-@TCL_VERSION@        $(DOTVERSION)

-@TCL_MAJOR_VERSION@  $(TCL_MAJOR_VERSION)

-@TCL_MINOR_VERSION@  $(TCL_MINOR_VERSION)

-@TCL_PATCH_LEVEL@    $(TCL_PATCH_LEVEL)

-@CC@                 $(CC)

-@DEFS@               $(TCL_CFLAGS)

-@CFLAGS_DEBUG@       -nologo -c -W3 -YX -Fp$(TMP_DIR)\ -MDd

-@CFLAGS_OPTIMIZE@    -nologo -c -W3 -YX -Fp$(TMP_DIR)\ -MD

-@LDFLAGS_DEBUG@      -nologo -machine:$(MACHINE) -debug -debugtype:cv

-@LDFLAGS_OPTIMIZE@   -nologo -machine:$(MACHINE) -release -opt:ref -opt:icf,3

-@TCL_DBGX@           $(SUFX)

-@TCL_LIB_FILE@       $(PROJECT)$(VERSION)$(SUFX).lib

-@TCL_NEEDS_EXP_FILE@

-@LIBS@               $(baselibs)

-@prefix@             $(_INSTALLDIR)

-@exec_prefix@        $(BIN_INSTALL_DIR)

-@SHLIB_CFLAGS@

-@STLIB_CFLAGS@

-@CFLAGS_WARNING@     -W3

-@EXTRA_CFLAGS@       -YX

-@SHLIB_LD@           $(link32) $(dlllflags)

-@STLIB_LD@           $(lib32) -nologo

-@SHLIB_LD_LIBS@      $(baselibs)

-@SHLIB_SUFFIX@       .dll

-@DL_LIBS@

-@LDFLAGS@

-@TCL_CC_SEARCH_FLAGS@

-@TCL_LD_SEARCH_FLAGS@

-@LIBOBJS@

-@RANLIB@

-@TCL_LIB_FLAG@

-@TCL_BUILD_LIB_SPEC@

-@TCL_LIB_SPEC@       $(LIB_INSTALL_DIR)\$(PROJECT)$(VERSION)$(SUFX).lib

-@TCL_INCLUDE_SPEC@   -I$(INCLUDE_INSTALL_DIR)

-@TCL_LIB_VERSIONS_OK@

-@TCL_SRC_DIR@        $(ROOT)

-@TCL_PACKAGE_PATH@

-@TCL_STUB_LIB_FILE@  $(TCLSTUBLIBNAME)

-@TCL_STUB_LIB_FLAG@  $(TCLSTUBLIBNAME)

-@TCL_STUB_LIB_SPEC@  -L$(LIB_INSTALL_DIR) $(TCLSTUBLIBNAME)

-@TCL_THREADS@        $(TCL_THREADS)

-@TCL_BUILD_STUB_LIB_SPEC@ -L$(OUT_DIR) $(TCLSTUBLIBNAME)

-@TCL_BUILD_STUB_LIB_PATH@ $(TCLSTUBLIB)

-@TCL_STUB_LIB_PATH@  $(LIB_INSTALL_DIR)\$(TCLSTUBLIBNAME)

-@CFG_TCL_EXPORT_FILE_SUFFIX@  $(VERSION)$(SUFX).lib

-@CFG_TCL_SHARED_LIB_SUFFIX@   $(VERSION)$(SUFX).dll

-@CFG_TCL_UNSHARED_LIB_SUFFIX@ $(VERSION)$(SUFX).lib

-!if $(STATIC_BUILD)

-@TCL_SHARED_BUILD@   0

-!else

-@TCL_SHARED_BUILD@   1

-!endif

-<<

-

-

-#---------------------------------------------------------------------

-# The following target generates the file generic/tclDate.c

-# from the yacc grammar found in generic/tclGetDate.y.  This is

-# only run by hand as yacc is not available in all environments.

-# The name of the .c file is different than the name of the .y file

-# so that make doesn't try to automatically regenerate the .c file.

-#---------------------------------------------------------------------

-

-gendate:

-	bison --output-file=$(GENERICDIR)/tclDate.c \

-	--name-prefix=TclDate \

-	$(GENERICDIR)/tclGetDate.y

-

-#---------------------------------------------------------------------

-# Special case object file targets

-#---------------------------------------------------------------------

-

-$(TMP_DIR)\testMain.obj: $(WINDIR)\tclAppInit.c

-	$(cc32) $(TCL_CFLAGS) -DTCL_TEST \

-	    -DTCL_USE_STATIC_PACKAGES=$(TCL_USE_STATIC_PACKAGES) \

-	    -Fo$@ $?

-

-$(TMP_DIR)\tclMain2.obj: $(GENERICDIR)\tclMain.c

-	$(cc32) $(TCL_CFLAGS) -DBUILD_tcl -DTCL_ASCII_MAIN \

-	    -Fo$@ $?

-

-$(TMP_DIR)\tclTest.obj: $(GENERICDIR)\tclTest.c

-	$(cc32) $(TCL_CFLAGS) -Fo$@ $?

-

-$(TMP_DIR)\tclTestObj.obj: $(GENERICDIR)\tclTestObj.c

-	$(cc32) $(TCL_CFLAGS) -Fo$@ $?

-

-$(TMP_DIR)\tclWinTest.obj: $(WINDIR)\tclWinTest.c

-	$(cc32) $(TCL_CFLAGS) -Fo$@ $?

-

-$(TMP_DIR)\tclZlib.obj: $(GENERICDIR)\tclZlib.c

-	$(cc32) $(TCL_CFLAGS) -I$(COMPATDIR)\zlib -DBUILD_tcl -Fo$@ $?

-

-$(TMP_DIR)\tclPkgConfig.obj: $(GENERICDIR)\tclPkgConfig.c

-	$(cc32) -DBUILD_tcl $(TCL_CFLAGS) \

-	-DCFG_INSTALL_LIBDIR="\"$(LIB_INSTALL_DIR:\=\\)\"" \

-	-DCFG_INSTALL_BINDIR="\"$(BIN_INSTALL_DIR:\=\\)\"" \

-	-DCFG_INSTALL_SCRDIR="\"$(SCRIPT_INSTALL_DIR:\=\\)\"" \

-	-DCFG_INSTALL_INCDIR="\"$(INCLUDE_INSTALL_DIR:\=\\)\"" \

-	-DCFG_INSTALL_DOCDIR="\"$(DOC_INSTALL_DIR:\=\\)\""	\

-	-DCFG_RUNTIME_LIBDIR="\"$(LIB_INSTALL_DIR:\=\\)\"" \

-	-DCFG_RUNTIME_BINDIR="\"$(BIN_INSTALL_DIR:\=\\)\"" \

-	-DCFG_RUNTIME_SCRDIR="\"$(SCRIPT_INSTALL_DIR:\=\\)\"" \

-	-DCFG_RUNTIME_INCDIR="\"$(INCLUDE_INSTALL_DIR:\=\\)\"" \

-	-DCFG_RUNTIME_DOCDIR="\"$(DOC_INSTALL_DIR:\=\\)\""     \

-	-Fo$@ $?

-

-$(TMP_DIR)\tclAppInit.obj: $(WINDIR)\tclAppInit.c

-	$(cc32) $(TCL_CFLAGS) \

-	    -DTCL_USE_STATIC_PACKAGES=$(TCL_USE_STATIC_PACKAGES) \

-	    -Fo$@ $?

-

-### The following objects should be built using the stub interfaces

-### *ALL* extensions need to built with -DTCL_THREADS=1

-

-$(TMP_DIR)\tclWinReg.obj: $(WINDIR)\tclWinReg.c

-!if $(STATIC_BUILD)

-	$(cc32) $(TCL_CFLAGS) -DTCL_THREADS=1 -DSTATIC_BUILD -Fo$@ $?

-!else

-	$(cc32) $(TCL_CFLAGS) -DTCL_THREADS=1 -DUSE_TCL_STUBS -Fo$@ $?

-!endif

-

-

-$(TMP_DIR)\tclWinDde.obj: $(WINDIR)\tclWinDde.c

-!if $(STATIC_BUILD)

-	$(cc32) $(TCL_CFLAGS) -DTCL_THREADS=1 -DSTATIC_BUILD -Fo$@ $?

-!else

-	$(cc32) $(TCL_CFLAGS) -DTCL_THREADS=1 -DUSE_TCL_STUBS -Fo$@ $?

-!endif

-

-

-### The following objects are part of the stub library and should not

-### be built as DLL objects.  -Zl is used to avoid a dependency on any

-### specific C run-time.

-

-$(TMP_DIR)\tclStubLib.obj: $(GENERICDIR)\tclStubLib.c

-	$(cc32) $(STUB_CFLAGS) -Zl -DSTATIC_BUILD $(TCL_INCLUDES) -Fo$@ $?

-

-$(TMP_DIR)\tclTomMathStubLib.obj: $(GENERICDIR)\tclTomMathStubLib.c

-	$(cc32) $(STUB_CFLAGS) -Zl -DSTATIC_BUILD $(TCL_INCLUDES) -Fo$@ $?

-

-$(TMP_DIR)\tclOOStubLib.obj: $(GENERICDIR)\tclOOStubLib.c

-	$(cc32) $(STUB_CFLAGS) -Zl -DSTATIC_BUILD $(TCL_INCLUDES) -Fo$@ $?

-

-$(TMP_DIR)\tclsh.exe.manifest: $(WINDIR)\tclsh.exe.manifest.in

-	@nmakehlp -s << $** >$@

-@MACHINE@	  $(MACHINE:IX86=X86)

-@TCL_WIN_VERSION@  $(DOTVERSION).0.0

-<<

-

-#---------------------------------------------------------------------

-# Generate the source dependencies.  Having dependency rules will

-# improve incremental build accuracy without having to resort to a

-# full rebuild just because some non-global header file like

-# tclCompile.h was changed.  These rules aren't needed when building

-# from scratch.

-#---------------------------------------------------------------------

-

-depend:

-!if !exist($(TCLSH))

-	@echo Build tclsh first!

-!else

-	$(TCLSH) $(TOOLSDIR:\=/)/mkdepend.tcl -vc32 -out:"$(OUT_DIR)\depend.mk" \

-		-passthru:"-DBUILD_tcl $(TCL_INCLUDES)" $(GENERICDIR),$$(GENERICDIR) \

-		$(COMPATDIR),$$(COMPATDIR) $(TOMMATHDIR),$$(TOMMATHDIR) $(WINDIR),$$(WINDIR) @<<

-$(TCLOBJS)

-<<

-!endif

-

-#---------------------------------------------------------------------

-# Dependency rules

-#---------------------------------------------------------------------

-

-!if exist("$(OUT_DIR)\depend.mk")

-!include "$(OUT_DIR)\depend.mk"

-!message *** Dependency rules in use.

-!else

-!message *** Dependency rules are not being used.

-!endif

-

-### add a spacer in the output

-!message

-

-

-#---------------------------------------------------------------------

-# Implicit rules.  A limitation exists with nmake that requires that

-# source directory can not contain spaces in the path.  This an

-# absolute.

-#---------------------------------------------------------------------

-

-{$(WINDIR)}.c{$(TMP_DIR)}.obj::

-	$(cc32) $(TCL_CFLAGS) -DBUILD_tcl -Fo$(TMP_DIR)\ @<<

-$<

-<<

-

-{$(TOMMATHDIR)}.c{$(TMP_DIR)}.obj::

-	$(cc32) $(TCL_CFLAGS) -DBUILD_tcl -Fo$(TMP_DIR)\ @<<

-$<

-<<

-

-{$(GENERICDIR)}.c{$(TMP_DIR)}.obj::

-	$(cc32) $(TCL_CFLAGS) -DBUILD_tcl -Fo$(TMP_DIR)\ @<<

-$<

-<<

-

-{$(COMPATDIR)}.c{$(TMP_DIR)}.obj::

-	$(cc32) $(TCL_CFLAGS) -DBUILD_tcl -Fo$(TMP_DIR)\ @<<

-$<

-<<

-

-{$(COMPATDIR)\zlib}.c{$(TMP_DIR)}.obj::

-	$(cc32) $(TCL_CFLAGS) -DBUILD_tcl -Fo$(TMP_DIR)\ @<<

-$<

-<<

-

-{$(WINDIR)}.rc{$(TMP_DIR)}.res:

-	$(rc32) -fo $@ -r -i "$(GENERICDIR)" -i "$(TMP_DIR)" \

-	    -d DEBUG=$(DEBUG) -d UNCHECKED=$(UNCHECKED) \

-	    -d TCL_THREADS=$(TCL_THREADS) \

-	    -d STATIC_BUILD=$(STATIC_BUILD) \

-	    $<

-

-$(TMP_DIR)\tclsh.res: $(TMP_DIR)\tclsh.exe.manifest

-

-.SUFFIXES:

-.SUFFIXES:.c .rc

-

-

-#---------------------------------------------------------------------

-# Installation.

-#---------------------------------------------------------------------

-

-install-binaries:

-	@echo Installing to '$(_INSTALLDIR)'

-	@echo Installing $(TCLLIBNAME)

-!if "$(TCLLIB)" != "$(TCLIMPLIB)"

-	@$(CPY) "$(TCLLIB)" "$(BIN_INSTALL_DIR)\"

-!endif

-	@$(CPY) "$(TCLIMPLIB)" "$(LIB_INSTALL_DIR)\"

-!if exist($(TCLSH))

-	@echo Installing $(TCLSHNAME)

-	@$(CPY) "$(TCLSH)" "$(BIN_INSTALL_DIR)\"

-!endif

-	@echo Installing $(TCLSTUBLIBNAME)

-	@$(CPY) "$(TCLSTUBLIB)" "$(LIB_INSTALL_DIR)\"

-

-#" emacs fix

-

-install-libraries: tclConfig install-msgs install-tzdata

-	@if not exist "$(SCRIPT_INSTALL_DIR)$(NULL)" \

-		$(MKDIR) "$(SCRIPT_INSTALL_DIR)"

-	@if not exist "$(SCRIPT_INSTALL_DIR)\..\tcl8$(NULL)" \

-		$(MKDIR) "$(SCRIPT_INSTALL_DIR)\..\tcl8"

-	@if not exist "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.4$(NULL)" \

-		$(MKDIR) "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.4"

-	@if not exist "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.4\platform$(NULL)" \

-		$(MKDIR) "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.4\platform"

-	@if not exist "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.5$(NULL)" \

-		$(MKDIR) "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.5"

-	@if not exist "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.6$(NULL)" \

-		$(MKDIR) "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.6"

-	@echo Installing header files

-	@$(CPY) "$(GENERICDIR)\tcl.h"             "$(INCLUDE_INSTALL_DIR)\"

-	@$(CPY) "$(GENERICDIR)\tclDecls.h"        "$(INCLUDE_INSTALL_DIR)\"

-	@$(CPY) "$(GENERICDIR)\tclOO.h"           "$(INCLUDE_INSTALL_DIR)\"

-	@$(CPY) "$(GENERICDIR)\tclOODecls.h"      "$(INCLUDE_INSTALL_DIR)\"

-	@$(CPY) "$(GENERICDIR)\tclPlatDecls.h"    "$(INCLUDE_INSTALL_DIR)\"

-	@$(CPY) "$(GENERICDIR)\tclTomMath.h"      "$(INCLUDE_INSTALL_DIR)\"

-	@$(CPY) "$(GENERICDIR)\tclTomMathDecls.h" "$(INCLUDE_INSTALL_DIR)\"

-	@$(CPY) "$(TOMMATHDIR)\tommath_class.h"   "$(INCLUDE_INSTALL_DIR)\"

-	@$(CPY) "$(TOMMATHDIR)\tommath_superclass.h" "$(INCLUDE_INSTALL_DIR)\"

-	@echo Installing library files to $(SCRIPT_INSTALL_DIR)

-	@$(CPY) "$(ROOT)\library\history.tcl"     "$(SCRIPT_INSTALL_DIR)\"

-	@$(CPY) "$(ROOT)\library\init.tcl"        "$(SCRIPT_INSTALL_DIR)\"

-	@$(CPY) "$(ROOT)\library\clock.tcl"       "$(SCRIPT_INSTALL_DIR)\"

-	@$(CPY) "$(ROOT)\library\tm.tcl"          "$(SCRIPT_INSTALL_DIR)\"

-	@$(CPY) "$(ROOT)\library\parray.tcl"      "$(SCRIPT_INSTALL_DIR)\"

-	@$(CPY) "$(ROOT)\library\safe.tcl"        "$(SCRIPT_INSTALL_DIR)\"

-	@$(CPY) "$(ROOT)\library\tclIndex"        "$(SCRIPT_INSTALL_DIR)\"

-	@$(CPY) "$(ROOT)\library\package.tcl"     "$(SCRIPT_INSTALL_DIR)\"

-	@$(CPY) "$(ROOT)\library\word.tcl"        "$(SCRIPT_INSTALL_DIR)\"

-	@$(CPY) "$(ROOT)\library\auto.tcl"        "$(SCRIPT_INSTALL_DIR)\"

-	@$(CPY) "$(OUT_DIR)\tclConfig.sh"         "$(LIB_INSTALL_DIR)\"

-	@$(CPY) "$(WINDIR)\tclooConfig.sh"        "$(LIB_INSTALL_DIR)\"

-	@echo Installing library http1.0 directory

-	@$(CPY) "$(ROOT)\library\http1.0\*.tcl" \

-	    "$(SCRIPT_INSTALL_DIR)\http1.0\"

-	@echo Installing library opt0.4 directory

-	@$(CPY) "$(ROOT)\library\opt\*.tcl" \

-	    "$(SCRIPT_INSTALL_DIR)\opt0.4\"

-	@echo Installing package http $(PKG_HTTP_VER) as a Tcl Module

-	@$(COPY) "$(ROOT)\library\http\http.tcl" \

-	    "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.6\http-$(PKG_HTTP_VER).tm"

-	@echo Installing package msgcat $(PKG_MSGCAT_VER) as a Tcl Module

-	@$(COPY) "$(ROOT)\library\msgcat\msgcat.tcl" \

-	    "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.5\msgcat-$(PKG_MSGCAT_VER).tm"

-	@echo Installing package tcltest $(PKG_TCLTEST_VER) as a Tcl Module

-	@$(COPY) "$(ROOT)\library\tcltest\tcltest.tcl" \

-	    "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.5\tcltest-$(PKG_TCLTEST_VER).tm"

-	@echo Installing package platform $(PKG_PLATFORM_VER) as a Tcl Module

-	@$(COPY) "$(ROOT)\library\platform\platform.tcl" \

-	    "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.4\platform-$(PKG_PLATFORM_VER).tm"

-	@echo Installing package platform::shell $(PKG_SHELL_VER) as a Tcl Module

-	@$(COPY) "$(ROOT)\library\platform\shell.tcl" \

-	    "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.4\platform\shell-$(PKG_SHELL_VER).tm"

-	@echo Installing $(TCLDDELIBNAME)

-!if $(STATIC_BUILD)

-!if !$(TCL_USE_STATIC_PACKAGES)

-	@$(CPY) "$(TCLDDELIB)" "$(LIB_INSTALL_DIR)\"

-!endif

-!else

-	@$(CPY) "$(TCLDDELIB)" "$(LIB_INSTALL_DIR)\dde$(DDEDOTVERSION)\"

-	@$(CPY) "$(ROOT)\library\dde\pkgIndex.tcl" \

-	    "$(LIB_INSTALL_DIR)\dde$(DDEDOTVERSION)\"

-!endif

-	@echo Installing $(TCLREGLIBNAME)

-!if $(STATIC_BUILD)

-!if !$(TCL_USE_STATIC_PACKAGES)

-	@$(CPY) "$(TCLREGLIB)" "$(LIB_INSTALL_DIR)\"

-!endif

-!else

-	@$(CPY) "$(TCLREGLIB)" "$(LIB_INSTALL_DIR)\reg$(REGDOTVERSION)\"

-	@$(CPY) "$(ROOT)\library\reg\pkgIndex.tcl" \

-	    "$(LIB_INSTALL_DIR)\reg$(REGDOTVERSION)\"

-!endif

-	@echo Installing encodings

-	@$(CPY) "$(ROOT)\library\encoding\*.enc" \

-		"$(SCRIPT_INSTALL_DIR)\encoding\"

-

-#" emacs fix

-

-install-tzdata:

-	@echo Installing time zone data

-	@set TCL_LIBRARY=$(ROOT:\=/)/library

-	@$(TCLSH_NATIVE) "$(ROOT:\=/)/tools/installData.tcl" \

-	    "$(ROOT:\=/)/library/tzdata" "$(SCRIPT_INSTALL_DIR)/tzdata"

-

-install-msgs:

-	@echo Installing message catalogs

-	@set TCL_LIBRARY=$(ROOT:\=/)/library

-	@$(TCLSH_NATIVE) "$(ROOT:\=/)/tools/installData.tcl" \

-	    "$(ROOT:\=/)/library/msgs" "$(SCRIPT_INSTALL_DIR)/msgs"

-

-#---------------------------------------------------------------------

-# Clean up

-#---------------------------------------------------------------------

-

-tidy:

-!if "$(TCLLIB)" != "$(TCLIMPLIB)"

-	@echo Removing $(TCLLIB) ...

-	@if exist $(TCLLIB) del $(TCLLIB)

-!endif

-	@echo Removing $(TCLIMPLIB) ...

-	@if exist $(TCLIMPLIB) del $(TCLIMPLIB)

-	@echo Removing $(TCLSH) ...

-	@if exist $(TCLSH) del $(TCLSH)

-	@echo Removing $(TCLTEST) ...

-	@if exist $(TCLTEST) del $(TCLTEST)

-	@echo Removing $(TCLDDELIB) ...

-	@if exist $(TCLDDELIB) del $(TCLDDELIB)

-	@echo Removing $(TCLREGLIB) ...

-	@if exist $(TCLREGLIB) del $(TCLREGLIB)

-

-clean: clean-pkgs

-	@echo Cleaning $(TMP_DIR)\* ...

-	@if exist $(TMP_DIR)\nul $(RMDIR) $(TMP_DIR)

-	@echo Cleaning $(WINDIR)\nmakehlp.obj ...

-	@if exist $(WINDIR)\nmakehlp.obj del $(WINDIR)\nmakehlp.obj

-	@echo Cleaning $(WINDIR)\nmakehlp.exe ...

-	@if exist $(WINDIR)\nmakehlp.exe del $(WINDIR)\nmakehlp.exe

-	@echo Cleaning $(WINDIR)\nmhlp-out.txt ...

-	@if exist $(WINDIR)\nmhlp-out.txt del $(WINDIR)\nmhlp-out.txt

-	@echo Cleaning $(WINDIR)\_junk.pch ...

-	@if exist $(WINDIR)\_junk.pch del $(WINDIR)\_junk.pch

-	@echo Cleaning $(WINDIR)\vercl.x ...

-	@if exist $(WINDIR)\vercl.x del $(WINDIR)\vercl.x

-	@echo Cleaning $(WINDIR)\vercl.i ...

-	@if exist $(WINDIR)\vercl.i del $(WINDIR)\vercl.i

-	@echo Cleaning $(WINDIR)\versions.vc ...

-	@if exist $(WINDIR)\versions.vc del $(WINDIR)\versions.vc

-

-realclean: hose

-

-hose:

-	@echo Hosing $(OUT_DIR)\* ...

-	@if exist $(OUT_DIR)\nul $(RMDIR) $(OUT_DIR)

-

-# Local Variables:

-# mode: makefile

-# End:

+#------------------------------------------------------------- -*- makefile -*-
+#
+#	Microsoft Visual C++ makefile for building Tcl with nmake
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+#
+# Copyright (c) 1995-1996 Sun Microsystems, Inc.
+# Copyright (c) 1998-2000 Ajuba Solutions.
+# Copyright (c) 2001-2005 ActiveState Corporation.
+# Copyright (c) 2001-2004 David Gravereaux.
+# Copyright (c) 2003-2008 Pat Thoyts.
+# Copyright (c) 2017 Ashok P. Nadkarni
+#------------------------------------------------------------------------------
+
+# General usage:
+#   nmake [-nologo] -f makefile.vc [TARGET|MACRODEF [TARGET|MACRODEF] [...]]
+#
+# For MACRODEF, see TIP 477 (https://core.tcl.tk/tips/doc/trunk/tip/477.md)
+# or examine Sections 6-8 in rules.vc.
+#
+# Possible values of TARGET are:
+#	release  -- Builds the core, the shell and the dlls. (default)
+#	dlls     -- Just builds the windows extensions
+#	shell    -- Just builds the shell and the core.
+#	core     -- Only builds the core [tclXX.(dll|lib)].
+#	all      -- Builds everything.
+#	test     -- Builds and runs the test suite.
+#	tcltest  -- Just builds the test shell.
+#	install  -- Installs the built binaries and libraries to $(INSTALLDIR)
+#		    as the root of the install tree.
+#	tidy/clean/hose -- varying levels of cleaning.
+#	genstubs -- Rebuilds the Stubs table and support files (dev only).
+#	depend   -- Generates an accurate set of source dependancies for this
+#		    makefile.  Helpful to avoid problems when the sources are
+#		    refreshed and you rebuild, but can "overbuild" when common
+#		    headers like tclInt.h just get small changes.
+#	htmlhelp -- Builds a Windows .chm help file for Tcl and Tk from the
+#		    troff manual pages found in $(ROOT)\doc. You need to
+#		    have installed the HTML Help Compiler package from Microsoft
+#		    to produce the .chm file.
+#
+# The steps to setup a Visual C++ environment depend on which
+# version of Visual Studio and/or the Windows SDK you are building
+# against and are not described here. The simplest method is generally
+# to start a command shell using one of the short cuts installed by
+# Visual Studio/Windows SDK for the appropriate target architecture.
+#
+# NOTE: For older (Visual C++ 6 or the 2003 SDK), to use the Platform
+# SDK (not expressly needed), run setenv.bat after
+# vcvars32.bat according to the instructions for it.  This can also
+# turn on the 64-bit compiler, if your SDK has it.
+#
+# Examples:
+#       c:\tcl_src\win\>nmake -f makefile.vc release
+#       c:\tcl_src\win\>nmake -f makefile.vc test
+#       c:\tcl_src\win\>nmake -f makefile.vc install INSTALLDIR=c:\progra~1\tcl
+#       c:\tcl_src\win\>nmake -f makefile.vc release OPTS=pdbs 
+#       c:\tcl_src\win\>nmake -f makefile.vc release OPTS=symbols
+#
+
+# NOTE:
+# Before modifying this file, check whether the modification is applicable
+# to building extensions as well and if so, modify rules.vc instead.
+
+# The PROJECT macro is used by rules.vc for generating appropriate
+# macros and rules.
+PROJECT = tcl
+
+# Default target to build if no target is specified. If unspecified, the
+# rules.vc file will set up "all" as the target.
+DEFAULT_BUILD_TARGET = release
+
+# We want to use our own resource file, not the standard template one.
+RCFILE = tcl.rc
+
+# The rules.vc file does most of the hard work in terms of defining
+# the build configuration, macros, output directories etc.
+!include "rules.vc"
+
+# Tcl version info based on macros set up by rules.vc
+DOTVERSION      = $(TCL_MAJOR_VERSION).$(TCL_MINOR_VERSION)
+VERSION         = $(TCL_MAJOR_VERSION)$(TCL_MINOR_VERSION)
+
+# We need versions of various core packages to generate appropriate
+# file names during installation.
+!if [echo REM = This file is generated from makefile.vc > versions.vc]
+!endif
+!if [echo PKG_HTTP_VER = \>> versions.vc] \
+   && [nmakehlp -V ..\library\http\pkgIndex.tcl http >> versions.vc]
+!endif
+!if [echo PKG_TCLTEST_VER = \>> versions.vc] \
+   && [nmakehlp -V ..\library\tcltest\pkgIndex.tcl tcltest >> versions.vc]
+!endif
+!if [echo PKG_MSGCAT_VER = \>> versions.vc] \
+   && [nmakehlp -V ..\library\msgcat\pkgIndex.tcl msgcat >> versions.vc]
+!endif
+!if [echo PKG_PLATFORM_VER = \>> versions.vc] \
+   && [nmakehlp -V ..\library\platform\pkgIndex.tcl "platform " >> versions.vc]
+!endif
+!if [echo PKG_SHELL_VER = \>> versions.vc] \
+   && [nmakehlp -V ..\library\platform\pkgIndex.tcl "platform::shell" >> versions.vc]
+!endif
+!if [echo PKG_DDE_VER = \>> versions.vc] \
+   && [nmakehlp -V ..\library\dde\pkgIndex.tcl "dde " >> versions.vc]
+!endif
+!if [echo PKG_REG_VER =\>> versions.vc] \
+   && [nmakehlp -V ..\library\reg\pkgIndex.tcl registry >> versions.vc]
+!endif
+
+!include versions.vc
+
+DDEDOTVERSION = 1.4
+DDEVERSION = $(DDEDOTVERSION:.=)
+
+REGDOTVERSION = 1.3
+REGVERSION = $(REGDOTVERSION:.=)
+
+TCLREGLIBNAME	= $(PROJECT)reg$(REGVERSION)$(SUFX:t=).$(EXT)
+TCLREGLIB	= $(OUT_DIR)\$(TCLREGLIBNAME)
+
+TCLDDELIBNAME	= $(PROJECT)dde$(DDEVERSION)$(SUFX:t=).$(EXT)
+TCLDDELIB	= $(OUT_DIR)\$(TCLDDELIBNAME)
+
+TCLTEST		= $(OUT_DIR)\$(PROJECT)test.exe
+CAT32		= $(OUT_DIR)\cat32.exe
+
+TCLSHOBJS = \
+	$(TMP_DIR)\tclAppInit.obj \
+!if !$(STATIC_BUILD)
+!if $(TCL_USE_STATIC_PACKAGES)
+	$(TMP_DIR)\tclWinReg.obj \
+	$(TMP_DIR)\tclWinDde.obj \
+!endif
+!endif
+	$(TMP_DIR)\tclsh.res
+
+TCLTESTOBJS = \
+	$(TMP_DIR)\tclTest.obj \
+	$(TMP_DIR)\tclTestObj.obj \
+	$(TMP_DIR)\tclTestProcBodyObj.obj \
+	$(TMP_DIR)\tclThreadTest.obj \
+	$(TMP_DIR)\tclWinTest.obj \
+!if !$(STATIC_BUILD)
+!if $(TCL_USE_STATIC_PACKAGES)
+	$(TMP_DIR)\tclWinReg.obj \
+	$(TMP_DIR)\tclWinDde.obj \
+!endif
+!endif
+	$(TMP_DIR)\testMain.obj
+
+COREOBJS = \
+	$(TMP_DIR)\regcomp.obj \
+	$(TMP_DIR)\regerror.obj \
+	$(TMP_DIR)\regexec.obj \
+	$(TMP_DIR)\regfree.obj \
+	$(TMP_DIR)\tclAlloc.obj \
+	$(TMP_DIR)\tclAssembly.obj \
+	$(TMP_DIR)\tclAsync.obj \
+	$(TMP_DIR)\tclBasic.obj \
+	$(TMP_DIR)\tclBinary.obj \
+	$(TMP_DIR)\tclCkalloc.obj \
+	$(TMP_DIR)\tclClock.obj \
+	$(TMP_DIR)\tclCmdAH.obj \
+	$(TMP_DIR)\tclCmdIL.obj \
+	$(TMP_DIR)\tclCmdMZ.obj \
+	$(TMP_DIR)\tclCompCmds.obj \
+	$(TMP_DIR)\tclCompCmdsGR.obj \
+	$(TMP_DIR)\tclCompCmdsSZ.obj \
+	$(TMP_DIR)\tclCompExpr.obj \
+	$(TMP_DIR)\tclCompile.obj \
+	$(TMP_DIR)\tclConfig.obj \
+	$(TMP_DIR)\tclDate.obj \
+	$(TMP_DIR)\tclDictObj.obj \
+	$(TMP_DIR)\tclDisassemble.obj \
+	$(TMP_DIR)\tclEncoding.obj \
+	$(TMP_DIR)\tclEnsemble.obj \
+	$(TMP_DIR)\tclEnv.obj \
+	$(TMP_DIR)\tclEvent.obj \
+	$(TMP_DIR)\tclExecute.obj \
+	$(TMP_DIR)\tclFCmd.obj \
+	$(TMP_DIR)\tclFileName.obj \
+	$(TMP_DIR)\tclGet.obj \
+	$(TMP_DIR)\tclHash.obj \
+	$(TMP_DIR)\tclHistory.obj \
+	$(TMP_DIR)\tclIndexObj.obj \
+	$(TMP_DIR)\tclInterp.obj \
+	$(TMP_DIR)\tclIO.obj \
+	$(TMP_DIR)\tclIOCmd.obj \
+	$(TMP_DIR)\tclIOGT.obj \
+	$(TMP_DIR)\tclIOSock.obj \
+	$(TMP_DIR)\tclIOUtil.obj \
+	$(TMP_DIR)\tclIORChan.obj \
+	$(TMP_DIR)\tclIORTrans.obj \
+	$(TMP_DIR)\tclLink.obj \
+	$(TMP_DIR)\tclListObj.obj \
+	$(TMP_DIR)\tclLiteral.obj \
+	$(TMP_DIR)\tclLoad.obj \
+	$(TMP_DIR)\tclMain.obj \
+	$(TMP_DIR)\tclMain2.obj \
+	$(TMP_DIR)\tclNamesp.obj \
+	$(TMP_DIR)\tclNotify.obj \
+	$(TMP_DIR)\tclOO.obj \
+	$(TMP_DIR)\tclOOBasic.obj \
+	$(TMP_DIR)\tclOOCall.obj \
+	$(TMP_DIR)\tclOODefineCmds.obj \
+	$(TMP_DIR)\tclOOInfo.obj \
+	$(TMP_DIR)\tclOOMethod.obj \
+	$(TMP_DIR)\tclOOStubInit.obj \
+	$(TMP_DIR)\tclObj.obj \
+	$(TMP_DIR)\tclOptimize.obj \
+	$(TMP_DIR)\tclPanic.obj \
+	$(TMP_DIR)\tclParse.obj \
+	$(TMP_DIR)\tclPathObj.obj \
+	$(TMP_DIR)\tclPipe.obj \
+	$(TMP_DIR)\tclPkg.obj \
+	$(TMP_DIR)\tclPkgConfig.obj \
+	$(TMP_DIR)\tclPosixStr.obj \
+	$(TMP_DIR)\tclPreserve.obj \
+	$(TMP_DIR)\tclProc.obj \
+	$(TMP_DIR)\tclRegexp.obj \
+	$(TMP_DIR)\tclResolve.obj \
+	$(TMP_DIR)\tclResult.obj \
+	$(TMP_DIR)\tclScan.obj \
+	$(TMP_DIR)\tclStringObj.obj \
+	$(TMP_DIR)\tclStrToD.obj \
+	$(TMP_DIR)\tclStubInit.obj \
+	$(TMP_DIR)\tclThread.obj \
+	$(TMP_DIR)\tclThreadAlloc.obj \
+	$(TMP_DIR)\tclThreadJoin.obj \
+	$(TMP_DIR)\tclThreadStorage.obj \
+	$(TMP_DIR)\tclTimer.obj \
+	$(TMP_DIR)\tclTomMathInterface.obj \
+	$(TMP_DIR)\tclTrace.obj \
+	$(TMP_DIR)\tclUtf.obj \
+	$(TMP_DIR)\tclUtil.obj \
+	$(TMP_DIR)\tclVar.obj \
+	$(TMP_DIR)\tclZlib.obj
+
+ZLIBOBJS = \
+	$(TMP_DIR)\adler32.obj \
+	$(TMP_DIR)\compress.obj \
+	$(TMP_DIR)\crc32.obj \
+	$(TMP_DIR)\deflate.obj \
+	$(TMP_DIR)\infback.obj \
+	$(TMP_DIR)\inffast.obj \
+	$(TMP_DIR)\inflate.obj \
+	$(TMP_DIR)\inftrees.obj \
+	$(TMP_DIR)\trees.obj \
+	$(TMP_DIR)\uncompr.obj \
+	$(TMP_DIR)\zutil.obj
+
+TOMMATHOBJS = \
+	$(TMP_DIR)\bncore.obj \
+	$(TMP_DIR)\bn_reverse.obj \
+	$(TMP_DIR)\bn_fast_s_mp_mul_digs.obj \
+	$(TMP_DIR)\bn_fast_s_mp_sqr.obj \
+	$(TMP_DIR)\bn_mp_add.obj \
+	$(TMP_DIR)\bn_mp_add_d.obj \
+	$(TMP_DIR)\bn_mp_and.obj \
+	$(TMP_DIR)\bn_mp_clamp.obj \
+	$(TMP_DIR)\bn_mp_clear.obj \
+	$(TMP_DIR)\bn_mp_clear_multi.obj \
+	$(TMP_DIR)\bn_mp_cmp.obj \
+	$(TMP_DIR)\bn_mp_cmp_d.obj \
+	$(TMP_DIR)\bn_mp_cmp_mag.obj \
+	$(TMP_DIR)\bn_mp_cnt_lsb.obj \
+	$(TMP_DIR)\bn_mp_copy.obj \
+	$(TMP_DIR)\bn_mp_count_bits.obj \
+	$(TMP_DIR)\bn_mp_div.obj \
+	$(TMP_DIR)\bn_mp_div_d.obj \
+	$(TMP_DIR)\bn_mp_div_2.obj \
+	$(TMP_DIR)\bn_mp_div_2d.obj \
+	$(TMP_DIR)\bn_mp_div_3.obj \
+	$(TMP_DIR)\bn_mp_exch.obj \
+	$(TMP_DIR)\bn_mp_expt_d.obj \
+	$(TMP_DIR)\bn_mp_expt_d_ex.obj \
+	$(TMP_DIR)\bn_mp_get_int.obj \
+	$(TMP_DIR)\bn_mp_get_long.obj \
+	$(TMP_DIR)\bn_mp_get_long_long.obj \
+	$(TMP_DIR)\bn_mp_grow.obj \
+	$(TMP_DIR)\bn_mp_init.obj \
+	$(TMP_DIR)\bn_mp_init_copy.obj \
+	$(TMP_DIR)\bn_mp_init_multi.obj \
+	$(TMP_DIR)\bn_mp_init_set.obj \
+	$(TMP_DIR)\bn_mp_init_set_int.obj \
+	$(TMP_DIR)\bn_mp_init_size.obj \
+	$(TMP_DIR)\bn_mp_karatsuba_mul.obj \
+	$(TMP_DIR)\bn_mp_karatsuba_sqr.obj \
+	$(TMP_DIR)\bn_mp_lshd.obj \
+	$(TMP_DIR)\bn_mp_mod.obj \
+	$(TMP_DIR)\bn_mp_mod_2d.obj \
+	$(TMP_DIR)\bn_mp_mul.obj \
+	$(TMP_DIR)\bn_mp_mul_2.obj \
+	$(TMP_DIR)\bn_mp_mul_2d.obj \
+	$(TMP_DIR)\bn_mp_mul_d.obj \
+	$(TMP_DIR)\bn_mp_neg.obj \
+	$(TMP_DIR)\bn_mp_or.obj \
+	$(TMP_DIR)\bn_mp_radix_size.obj \
+	$(TMP_DIR)\bn_mp_radix_smap.obj \
+	$(TMP_DIR)\bn_mp_read_radix.obj \
+	$(TMP_DIR)\bn_mp_rshd.obj \
+	$(TMP_DIR)\bn_mp_set.obj \
+	$(TMP_DIR)\bn_mp_set_int.obj \
+	$(TMP_DIR)\bn_mp_set_long.obj \
+	$(TMP_DIR)\bn_mp_set_long_long.obj \
+	$(TMP_DIR)\bn_mp_shrink.obj \
+	$(TMP_DIR)\bn_mp_sqr.obj \
+	$(TMP_DIR)\bn_mp_sqrt.obj \
+	$(TMP_DIR)\bn_mp_sub.obj \
+	$(TMP_DIR)\bn_mp_sub_d.obj \
+	$(TMP_DIR)\bn_mp_to_unsigned_bin.obj \
+	$(TMP_DIR)\bn_mp_to_unsigned_bin_n.obj \
+	$(TMP_DIR)\bn_mp_toom_mul.obj \
+	$(TMP_DIR)\bn_mp_toom_sqr.obj \
+	$(TMP_DIR)\bn_mp_toradix_n.obj \
+	$(TMP_DIR)\bn_mp_unsigned_bin_size.obj \
+	$(TMP_DIR)\bn_mp_xor.obj \
+	$(TMP_DIR)\bn_mp_zero.obj \
+	$(TMP_DIR)\bn_s_mp_add.obj \
+	$(TMP_DIR)\bn_s_mp_mul_digs.obj \
+	$(TMP_DIR)\bn_s_mp_sqr.obj \
+	$(TMP_DIR)\bn_s_mp_sub.obj
+
+PLATFORMOBJS = \
+	$(TMP_DIR)\tclWin32Dll.obj \
+	$(TMP_DIR)\tclWinChan.obj \
+	$(TMP_DIR)\tclWinConsole.obj \
+	$(TMP_DIR)\tclWinError.obj \
+	$(TMP_DIR)\tclWinFCmd.obj \
+	$(TMP_DIR)\tclWinFile.obj \
+	$(TMP_DIR)\tclWinInit.obj \
+	$(TMP_DIR)\tclWinLoad.obj \
+	$(TMP_DIR)\tclWinNotify.obj \
+	$(TMP_DIR)\tclWinPipe.obj \
+	$(TMP_DIR)\tclWinSerial.obj \
+	$(TMP_DIR)\tclWinSock.obj \
+	$(TMP_DIR)\tclWinThrd.obj \
+	$(TMP_DIR)\tclWinTime.obj \
+!if $(STATIC_BUILD)
+	$(TMP_DIR)\tclWinReg.obj \
+	$(TMP_DIR)\tclWinDde.obj \
+!else
+	$(TMP_DIR)\tcl.res
+!endif
+
+TCLOBJS = $(COREOBJS) $(ZLIBOBJS) $(TOMMATHOBJS) $(PLATFORMOBJS)
+
+TCLSTUBOBJS = \
+	$(TMP_DIR)\tclStubLib.obj \
+	$(TMP_DIR)\tclTomMathStubLib.obj \
+	$(TMP_DIR)\tclOOStubLib.obj
+
+### The following paths CANNOT have spaces in them as they appear on
+### the left side of implicit rules.
+TOMMATHDIR	= $(ROOT)\libtommath
+PKGSDIR		= $(ROOT)\pkgs
+
+# Additional include and C macro definitions for the implicit rules
+# defined in rules.vc
+PRJ_INCLUDES	= -I"$(TOMMATHDIR)"
+PRJ_DEFINES	= -DTCL_TOMMATH -DMP_PREC=4 -Dinline=__inline -DHAVE_ZLIB=1 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE
+
+# Additional Link libraries needed beyond those in rules.vc
+PRJ_LIBS   = netapi32.lib user32.lib userenv.lib ws2_32.lib
+
+#---------------------------------------------------------------------
+# TclTest flags
+#---------------------------------------------------------------------
+
+!if "$(TESTPAT)" != ""
+TESTFLAGS = $(TESTFLAGS) -file $(TESTPAT)
+!endif
+
+
+#---------------------------------------------------------------------
+# Project specific targets
+#---------------------------------------------------------------------
+
+release:    setup $(TCLSH) $(TCLSTUBLIB) dlls pkgs
+core:	    setup $(TCLLIB) $(TCLSTUBLIB)
+shell:	    setup $(TCLSH)
+dlls:	    setup $(TCLREGLIB) $(TCLDDELIB)
+all:	    setup $(TCLSH) $(TCLSTUBLIB) dlls $(CAT32) pkgs
+tcltest:    setup $(TCLTEST) dlls $(CAT32)
+install:    install-binaries install-libraries install-docs install-pkgs
+setup:      default-setup
+
+test: test-core test-pkgs
+test-core: setup $(TCLTEST) dlls $(CAT32)
+	set TCL_LIBRARY=$(ROOT:\=/)/library
+	$(DEBUGGER) $(TCLTEST) "$(ROOT:\=/)/tests/all.tcl" $(TESTFLAGS) -loadfile <<
+		package ifneeded dde 1.4.0 [list load "$(TCLDDELIB:\=/)" dde]
+		package ifneeded registry 1.3.2 [list load "$(TCLREGLIB:\=/)" registry]
+<<
+
+runtest: setup $(TCLTEST) dlls $(CAT32)
+	set TCL_LIBRARY=$(ROOT:\=/)/library
+	$(DEBUGGER) $(TCLTEST) $(SCRIPT)
+
+runshell: setup $(TCLSH) dlls
+	set TCL_LIBRARY=$(ROOT:\=/)/library
+	$(DEBUGGER) $(TCLSH) $(SCRIPT)
+
+!if $(STATIC_BUILD)
+
+$(TCLLIB): $(TCLOBJS)
+	$(LIBCMD) @<<
+$**
+<<
+
+!else
+
+$(TCLLIB): $(TCLOBJS)
+	$(DLLCMD) @<<
+$**
+<<
+	$(_VC_MANIFEST_EMBED_DLL)
+$(TCLIMPLIB): $(TCLLIB)
+
+!endif # $(STATIC_BUILD)
+
+
+$(TCLSTUBLIB): $(TCLSTUBOBJS)
+	$(LIBCMD) -nodefaultlib $(TCLSTUBOBJS)
+
+$(TCLSH): $(TCLSHOBJS) $(TCLSTUBLIB) $(TCLIMPLIB)
+	$(CONEXECMD) -stack:2300000 $**
+	$(_VC_MANIFEST_EMBED_EXE)
+
+$(TCLTEST): $(TCLTESTOBJS) $(TCLSTUBLIB) $(TCLIMPLIB)
+	$(CONEXECMD) -stack:2300000 $**
+	$(_VC_MANIFEST_EMBED_EXE)
+
+!if $(STATIC_BUILD)
+$(TCLDDELIB): $(TMP_DIR)\tclWinDde.obj
+	$(LIBCMD) $**
+!else
+$(TCLDDELIB): $(TMP_DIR)\tclWinDde.obj $(TCLSTUBLIB)
+	$(DLLCMD) $**
+	$(_VC_MANIFEST_EMBED_DLL)
+!endif
+
+!if $(STATIC_BUILD)
+$(TCLREGLIB): $(TMP_DIR)\tclWinReg.obj
+	$(LIBCMD) $**
+!else
+$(TCLREGLIB): $(TMP_DIR)\tclWinReg.obj $(TCLSTUBLIB)
+	$(DLLCMD) $**
+	$(_VC_MANIFEST_EMBED_DLL)
+!endif
+
+pkgs:
+	@for /d %d in ($(PKGSDIR)\*) do \
+	  @if exist "%~fd\win\makefile.vc" ( \
+	    pushd "%~fd\win" & \
+	    $(MAKE) -$(MAKEFLAGS) -f makefile.vc TCLDIR=$(ROOT) &\
+	    popd \
+	  )
+
+test-pkgs:
+	@for /d %d in ($(PKGSDIR)\*) do \
+	  @if exist "%~fd\win\makefile.vc" ( \
+	    pushd "%~fd\win" & \
+	    $(MAKE) -$(MAKEFLAGS) -f makefile.vc TCLDIR=$(ROOT) test &\
+	    popd \
+	  )
+
+install-pkgs:
+	@for /d %d in ($(PKGSDIR)\*) do \
+	  @if exist "%~fd\win\makefile.vc" ( \
+	    pushd "%~fd\win" & \
+	    $(MAKE) -$(MAKEFLAGS) -f makefile.vc TCLDIR=$(ROOT) install &\
+	    popd \
+	  )
+
+clean-pkgs:
+	@for /d %d in ($(PKGSDIR)\*) do \
+	  @if exist "%~fd\win\makefile.vc" ( \
+	    pushd "%~fd\win" & \
+	    $(MAKE) -$(MAKEFLAGS) -f makefile.vc TCLDIR=$(ROOT) clean &\
+	    popd \
+	  )
+
+$(CAT32): $(WINDIR)\cat.c
+	$(cc32) $(cflags) $(crt) -D_CRT_NONSTDC_NO_DEPRECATE -DCONSOLE -Fo$(TMP_DIR)\ $?
+	$(CONEXECMD) -stack:16384 $(TMP_DIR)\cat.obj
+	$(_VC_MANIFEST_EMBED_EXE)
+
+#---------------------------------------------------------------------
+# Regenerate the stubs files.  [Development use only]
+#---------------------------------------------------------------------
+
+genstubs:
+!if !exist($(TCLSH))
+	@echo Build tclsh first!
+!else
+	$(TCLSH) $(TOOLSDIR:\=/)/genStubs.tcl $(GENERICDIR:\=/) \
+		$(GENERICDIR:\=/)/tcl.decls $(GENERICDIR:\=/)/tclInt.decls \
+		$(GENERICDIR:\=/)/tclTomMath.decls
+	$(TCLSH) $(TOOLSDIR:\=/)/genStubs.tcl $(GENERICDIR:\=/) \
+		$(GENERICDIR:\=/)/tclOO.decls
+!endif
+
+
+#----------------------------------------------------------------------
+# The following target generates the file generic/tclTomMath.h.
+# It needs to be run (and the results checked) after updating
+# to a new release of libtommath.
+#----------------------------------------------------------------------
+
+gentommath_h:
+!if !exist($(TCLSH))
+	@echo Build tclsh first!
+!else
+	$(TCLSH) "$(TOOLSDIR:\=/)/fix_tommath_h.tcl" \
+		"$(TOMMATHDIR:\=/)/tommath.h" \
+		> "$(GENERICDIR)\tclTomMath.h"
+!endif
+
+#---------------------------------------------------------------------
+# Build the Windows HTML help file.
+#---------------------------------------------------------------------
+
+# NOTE: you can define HHC on the command-line to override this.
+# nmake does not set macro values if already set on the command line.
+!if defined(PROCESSOR_ARCHITECTURE) && "$(PROCESSOR_ARCHITECTURE)" == "AMD64"
+HHC="%ProgramFiles(x86)%\HTML Help Workshop\hhc.exe"
+!else
+HHC="%ProgramFiles%\HTML Help Workshop\hhc.exe"
+!endif
+HTMLDIR=$(OUT_DIR)\html
+HTMLBASE=TclTk$(VERSION)
+HHPFILE=$(HTMLDIR)\$(HTMLBASE).hhp
+CHMFILE=$(HTMLDIR)\$(HTMLBASE).chm
+
+htmlhelp: chmsetup $(CHMFILE)
+
+$(CHMFILE): $(DOCDIR)\*
+	@$(TCLSH) $(TOOLSDIR)\tcltk-man2html.tcl "--htmldir=$(HTMLDIR)"
+	@echo Compiling HTML help project
+	-"$(HHC)" <<$(HHPFILE) >NUL
+[OPTIONS]
+Compatibility=1.1 or later
+Compiled file=$(HTMLBASE).chm
+Default topic=contents.htm
+Display compile progress=no
+Error log file=$(HTMLBASE).log
+Full-text search=Yes
+Language=0x409 English (United States)
+Title=Tcl/Tk $(DOTVERSION) Help
+[FILES]
+contents.htm
+docs.css
+Keywords\*.htm
+TclCmd\*.htm
+TclLib\*.htm
+TkCmd\*.htm
+TkLib\*.htm
+UserCmd\*.htm
+<<
+
+chmsetup:
+	@if not exist $(HTMLDIR)\nul mkdir $(HTMLDIR)
+
+install-docs:
+!if exist("$(CHMFILE)")
+	@echo Installing compiled HTML help
+	@$(CPY) "$(CHMFILE)" "$(DOC_INSTALL_DIR)\"
+!endif
+
+# "emacs font-lock highlighting fix
+
+#---------------------------------------------------------------------
+# Generate the tcl.nmake file which contains the options used to build
+# Tcl itself. This is used when building extensions.
+#---------------------------------------------------------------------
+tcl-nmake: $(OUT_DIR)\tcl.nmake
+$(OUT_DIR)\tcl.nmake:
+	@type << >$@
+CORE_MACHINE = $(MACHINE)
+CORE_DEBUG = $(DEBUG)
+CORE_TCL_THREADS = $(TCL_THREADS)
+CORE_USE_THREAD_ALLOC = $(USE_THREAD_ALLOC)
+CORE_USE_WIDECHAR_API = $(USE_WIDECHAR_API)
+<<
+
+#---------------------------------------------------------------------
+# Build tclConfig.sh for the TEA build system.
+#---------------------------------------------------------------------
+
+tclConfig: $(OUT_DIR)\tclConfig.sh
+
+# TBD - is this tclConfig.sh file ever used? The values are incorrect!
+$(OUT_DIR)\tclConfig.sh: $(WINDIR)\tclConfig.sh.in
+	@echo Creating tclConfig.sh
+        @nmakehlp -s << $** >$@
+@TCL_DLL_FILE@       $(TCLLIBNAME)
+@TCL_VERSION@        $(DOTVERSION)
+@TCL_MAJOR_VERSION@  $(TCL_MAJOR_VERSION)
+@TCL_MINOR_VERSION@  $(TCL_MINOR_VERSION)
+@TCL_PATCH_LEVEL@    $(TCL_PATCH_LEVEL)
+@CC@                 $(CC)
+@DEFS@               $(pkgcflags)
+@CFLAGS_DEBUG@       -nologo -c -W3 -YX -Fp$(TMP_DIR)\ -MDd
+@CFLAGS_OPTIMIZE@    -nologo -c -W3 -YX -Fp$(TMP_DIR)\ -MD
+@LDFLAGS_DEBUG@      -nologo -machine:$(MACHINE) -debug -debugtype:cv
+@LDFLAGS_OPTIMIZE@   -nologo -machine:$(MACHINE) -release -opt:ref -opt:icf,3
+@TCL_DBGX@           $(SUFX)
+@TCL_LIB_FILE@       $(PROJECT)$(VERSION)$(SUFX).lib
+@TCL_NEEDS_EXP_FILE@
+@LIBS@               $(baselibs) $(PRJ_LIBS)
+@prefix@             $(_INSTALLDIR)
+@exec_prefix@        $(BIN_INSTALL_DIR)
+@SHLIB_CFLAGS@
+@STLIB_CFLAGS@
+@CFLAGS_WARNING@     -W3
+@EXTRA_CFLAGS@       -YX
+@SHLIB_LD@           $(link32) $(dlllflags)
+@STLIB_LD@           $(lib32) -nologo
+@SHLIB_LD_LIBS@      $(baselibs) $(PRJ_LIBS)
+@SHLIB_SUFFIX@       .dll
+@DL_LIBS@
+@LDFLAGS@
+@TCL_CC_SEARCH_FLAGS@
+@TCL_LD_SEARCH_FLAGS@
+@LIBOBJS@
+@RANLIB@
+@TCL_LIB_FLAG@
+@TCL_BUILD_LIB_SPEC@
+@TCL_LIB_SPEC@       $(LIB_INSTALL_DIR)\$(PROJECT)$(VERSION)$(SUFX).lib
+@TCL_INCLUDE_SPEC@   -I$(INCLUDE_INSTALL_DIR)
+@TCL_LIB_VERSIONS_OK@
+@TCL_SRC_DIR@        $(ROOT)
+@TCL_PACKAGE_PATH@
+@TCL_STUB_LIB_FILE@  $(TCLSTUBLIBNAME)
+@TCL_STUB_LIB_FLAG@  $(TCLSTUBLIBNAME)
+@TCL_STUB_LIB_SPEC@  -L$(LIB_INSTALL_DIR) $(TCLSTUBLIBNAME)
+@TCL_THREADS@        $(TCL_THREADS)
+@TCL_BUILD_STUB_LIB_SPEC@ -L$(OUT_DIR) $(TCLSTUBLIBNAME)
+@TCL_BUILD_STUB_LIB_PATH@ $(TCLSTUBLIB)
+@TCL_STUB_LIB_PATH@  $(LIB_INSTALL_DIR)\$(TCLSTUBLIBNAME)
+@CFG_TCL_EXPORT_FILE_SUFFIX@  $(VERSION)$(SUFX).lib
+@CFG_TCL_SHARED_LIB_SUFFIX@   $(VERSION)$(SUFX).dll
+@CFG_TCL_UNSHARED_LIB_SUFFIX@ $(VERSION)$(SUFX).lib
+!if $(STATIC_BUILD)
+@TCL_SHARED_BUILD@   0
+!else
+@TCL_SHARED_BUILD@   1
+!endif
+<<
+
+
+#---------------------------------------------------------------------
+# The following target generates the file generic/tclDate.c
+# from the yacc grammar found in generic/tclGetDate.y.  This is
+# only run by hand as yacc is not available in all environments.
+# The name of the .c file is different than the name of the .y file
+# so that make doesn't try to automatically regenerate the .c file.
+#---------------------------------------------------------------------
+
+gendate:
+	bison --output-file=$(GENERICDIR)/tclDate.c \
+	--name-prefix=TclDate \
+	$(GENERICDIR)/tclGetDate.y
+
+#---------------------------------------------------------------------
+# Special case object file targets
+#---------------------------------------------------------------------
+
+$(TMP_DIR)\testMain.obj: $(WINDIR)\tclAppInit.c
+	$(cc32) $(appcflags) -DTCL_TEST \
+	    -DTCL_USE_STATIC_PACKAGES=$(TCL_USE_STATIC_PACKAGES) \
+	    -Fo$@ $?
+
+$(TMP_DIR)\tclMain2.obj: $(GENERICDIR)\tclMain.c
+	$(cc32) $(pkgcflags) -DTCL_ASCII_MAIN \
+	    -Fo$@ $?
+
+$(TMP_DIR)\tclTest.obj: $(GENERICDIR)\tclTest.c
+	$(cc32) $(appcflags) -Fo$@ $?
+
+$(TMP_DIR)\tclTestObj.obj: $(GENERICDIR)\tclTestObj.c
+	$(cc32) $(appcflags) -Fo$@ $?
+
+$(TMP_DIR)\tclWinTest.obj: $(WINDIR)\tclWinTest.c
+	$(CCAPPCMD) $?
+
+$(TMP_DIR)\tclZlib.obj: $(GENERICDIR)\tclZlib.c
+	$(cc32) $(pkgcflags) -I$(COMPATDIR)\zlib -Fo$@ $?
+
+$(TMP_DIR)\tclPkgConfig.obj: $(GENERICDIR)\tclPkgConfig.c
+	$(cc32) $(pkgcflags) \
+	-DCFG_INSTALL_LIBDIR="\"$(LIB_INSTALL_DIR:\=\\)\"" \
+	-DCFG_INSTALL_BINDIR="\"$(BIN_INSTALL_DIR:\=\\)\"" \
+	-DCFG_INSTALL_SCRDIR="\"$(SCRIPT_INSTALL_DIR:\=\\)\"" \
+	-DCFG_INSTALL_INCDIR="\"$(INCLUDE_INSTALL_DIR:\=\\)\"" \
+	-DCFG_INSTALL_DOCDIR="\"$(DOC_INSTALL_DIR:\=\\)\""	\
+	-DCFG_RUNTIME_LIBDIR="\"$(LIB_INSTALL_DIR:\=\\)\"" \
+	-DCFG_RUNTIME_BINDIR="\"$(BIN_INSTALL_DIR:\=\\)\"" \
+	-DCFG_RUNTIME_SCRDIR="\"$(SCRIPT_INSTALL_DIR:\=\\)\"" \
+	-DCFG_RUNTIME_INCDIR="\"$(INCLUDE_INSTALL_DIR:\=\\)\"" \
+	-DCFG_RUNTIME_DOCDIR="\"$(DOC_INSTALL_DIR:\=\\)\""     \
+	-Fo$@ $?
+
+$(TMP_DIR)\tclAppInit.obj: $(WINDIR)\tclAppInit.c
+	$(cc32) $(appcflags) \
+	    -DTCL_USE_STATIC_PACKAGES=$(TCL_USE_STATIC_PACKAGES) \
+	    -Fo$@ $?
+
+### The following objects should be built using the stub interfaces
+### *ALL* extensions need to built with -DTCL_THREADS=1
+
+$(TMP_DIR)\tclWinReg.obj: $(WINDIR)\tclWinReg.c
+!if $(STATIC_BUILD)
+	$(cc32) $(appcflags) -DSTATIC_BUILD -Fo$@ $?
+!else
+	$(cc32) $(appcflags) -DUSE_TCL_STUBS -Fo$@ $?
+!endif
+
+
+$(TMP_DIR)\tclWinDde.obj: $(WINDIR)\tclWinDde.c
+!if $(STATIC_BUILD)
+	$(cc32) $(appcflags) -DSTATIC_BUILD -Fo$@ $?
+!else
+	$(cc32) $(appcflags) -DUSE_TCL_STUBS -Fo$@ $?
+!endif
+
+
+### The following objects are part of the stub library and should not
+### be built as DLL objects.  -Zl is used to avoid a dependency on any
+### specific C run-time.
+
+$(TMP_DIR)\tclStubLib.obj: $(GENERICDIR)\tclStubLib.c
+	$(cc32) $(stubscflags) -Fo$@ $?
+
+$(TMP_DIR)\tclTomMathStubLib.obj: $(GENERICDIR)\tclTomMathStubLib.c
+	$(cc32) $(stubscflags) -Fo$@ $?
+
+$(TMP_DIR)\tclOOStubLib.obj: $(GENERICDIR)\tclOOStubLib.c
+	$(cc32) $(stubscflags) -Fo$@ $?
+
+$(TMP_DIR)\tclsh.exe.manifest: $(WINDIR)\tclsh.exe.manifest.in
+	@nmakehlp -s << $** >$@
+@MACHINE@	  $(MACHINE:IX86=X86)
+@TCL_WIN_VERSION@  $(DOTVERSION).0.0
+<<
+
+#---------------------------------------------------------------------
+# Generate the source dependencies.  Having dependency rules will
+# improve incremental build accuracy without having to resort to a
+# full rebuild just because some non-global header file like
+# tclCompile.h was changed.  These rules aren't needed when building
+# from scratch.
+#---------------------------------------------------------------------
+
+depend:
+!if !exist($(TCLSH))
+	@echo Build tclsh first!
+!else
+	$(TCLSH) $(TOOLSDIR:\=/)/mkdepend.tcl -vc32 -out:"$(OUT_DIR)\depend.mk" \
+		-passthru:"-DBUILD_tcl $(TCL_INCLUDES) $(PRJ_INCLUDES)" $(GENERICDIR),$$(GENERICDIR) \
+		$(COMPATDIR),$$(COMPATDIR) $(TOMMATHDIR),$$(TOMMATHDIR) $(WINDIR),$$(WINDIR) @<<
+$(TCLOBJS)
+<<
+!endif
+
+#---------------------------------------------------------------------
+# Dependency rules
+#---------------------------------------------------------------------
+
+!if exist("$(OUT_DIR)\depend.mk")
+!include "$(OUT_DIR)\depend.mk"
+!message *** Dependency rules in use.
+!else
+!message *** Dependency rules are not being used.
+!endif
+
+### add a spacer in the output
+!message
+
+
+#---------------------------------------------------------------------
+# Implicit rules that are not covered by the common ones defined in
+# rules.vc. A limitation exists with nmake that requires that
+# source directory can not contain spaces in the path.  This an
+# absolute.
+#---------------------------------------------------------------------
+
+{$(TOMMATHDIR)}.c{$(TMP_DIR)}.obj::
+	$(cc32) $(pkgcflags) -Fo$(TMP_DIR)\ @<<
+$<
+<<
+
+{$(COMPATDIR)\zlib}.c{$(TMP_DIR)}.obj::
+	$(cc32) $(pkgcflags) -Fo$(TMP_DIR)\ @<<
+$<
+<<
+
+$(TMP_DIR)\tclsh.res: $(TMP_DIR)\tclsh.exe.manifest $(WINDIR)\tclsh.rc
+
+
+#---------------------------------------------------------------------
+# Installation.
+#---------------------------------------------------------------------
+
+install-binaries:
+	@echo Installing to '$(_INSTALLDIR)'
+	@echo Installing $(TCLLIBNAME)
+!if "$(TCLLIB)" != "$(TCLIMPLIB)"
+	@$(CPY) "$(TCLLIB)" "$(BIN_INSTALL_DIR)\"
+!endif
+	@$(CPY) "$(TCLIMPLIB)" "$(LIB_INSTALL_DIR)\"
+!if exist($(TCLSH))
+	@echo Installing $(TCLSHNAME)
+	@$(CPY) "$(TCLSH)" "$(BIN_INSTALL_DIR)\"
+!endif
+	@echo Installing $(TCLSTUBLIBNAME)
+	@$(CPY) "$(TCLSTUBLIB)" "$(LIB_INSTALL_DIR)\"
+
+install-libraries: tclConfig tcl-nmake install-msgs install-tzdata
+	@if not exist "$(SCRIPT_INSTALL_DIR)" \
+		$(MKDIR) "$(SCRIPT_INSTALL_DIR)"
+	@if not exist "$(SCRIPT_INSTALL_DIR)\..\tcl8" \
+		$(MKDIR) "$(SCRIPT_INSTALL_DIR)\..\tcl8"
+	@if not exist "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.4" \
+		$(MKDIR) "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.4"
+	@if not exist "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.4\platform" \
+		$(MKDIR) "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.4\platform"
+	@if not exist "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.5" \
+		$(MKDIR) "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.5"
+	@if not exist "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.6" \
+		$(MKDIR) "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.6"
+	@if not exist "$(LIB_INSTALL_DIR)\nmake" \
+		$(MKDIR) "$(LIB_INSTALL_DIR)\nmake"
+	@echo Installing header files
+	@$(CPY) "$(GENERICDIR)\tcl.h"             "$(INCLUDE_INSTALL_DIR)\"
+	@$(CPY) "$(GENERICDIR)\tclDecls.h"        "$(INCLUDE_INSTALL_DIR)\"
+	@$(CPY) "$(GENERICDIR)\tclOO.h"           "$(INCLUDE_INSTALL_DIR)\"
+	@$(CPY) "$(GENERICDIR)\tclOODecls.h"      "$(INCLUDE_INSTALL_DIR)\"
+	@$(CPY) "$(GENERICDIR)\tclPlatDecls.h"    "$(INCLUDE_INSTALL_DIR)\"
+	@$(CPY) "$(GENERICDIR)\tclTomMath.h"      "$(INCLUDE_INSTALL_DIR)\"
+	@$(CPY) "$(GENERICDIR)\tclTomMathDecls.h" "$(INCLUDE_INSTALL_DIR)\"
+	@$(CPY) "$(TOMMATHDIR)\tommath_class.h"   "$(INCLUDE_INSTALL_DIR)\"
+	@$(CPY) "$(TOMMATHDIR)\tommath_superclass.h" "$(INCLUDE_INSTALL_DIR)\"
+	@echo Installing library files to $(SCRIPT_INSTALL_DIR)
+	@$(CPY) "$(ROOT)\library\history.tcl"     "$(SCRIPT_INSTALL_DIR)\"
+	@$(CPY) "$(ROOT)\library\init.tcl"        "$(SCRIPT_INSTALL_DIR)\"
+	@$(CPY) "$(ROOT)\library\clock.tcl"       "$(SCRIPT_INSTALL_DIR)\"
+	@$(CPY) "$(ROOT)\library\tm.tcl"          "$(SCRIPT_INSTALL_DIR)\"
+	@$(CPY) "$(ROOT)\library\parray.tcl"      "$(SCRIPT_INSTALL_DIR)\"
+	@$(CPY) "$(ROOT)\library\safe.tcl"        "$(SCRIPT_INSTALL_DIR)\"
+	@$(CPY) "$(ROOT)\library\tclIndex"        "$(SCRIPT_INSTALL_DIR)\"
+	@$(CPY) "$(ROOT)\library\package.tcl"     "$(SCRIPT_INSTALL_DIR)\"
+	@$(CPY) "$(ROOT)\library\word.tcl"        "$(SCRIPT_INSTALL_DIR)\"
+	@$(CPY) "$(ROOT)\library\auto.tcl"        "$(SCRIPT_INSTALL_DIR)\"
+	@$(CPY) "$(OUT_DIR)\tclConfig.sh"         "$(LIB_INSTALL_DIR)\"
+	@$(CPY) "$(WINDIR)\tclooConfig.sh"        "$(LIB_INSTALL_DIR)\"
+	@$(CPY) "$(WINDIR)\rules.vc"              "$(LIB_INSTALL_DIR)\nmake\"
+	@$(CPY) "$(WINDIR)\targets.vc"              "$(LIB_INSTALL_DIR)\nmake\"
+	@$(CPY) "$(WINDIR)\nmakehlp.c"            "$(LIB_INSTALL_DIR)\nmake\"
+	@$(CPY) "$(OUT_DIR)\tcl.nmake"            "$(LIB_INSTALL_DIR)\nmake\"
+	@echo Installing library http1.0 directory
+	@$(CPY) "$(ROOT)\library\http1.0\*.tcl" \
+	    "$(SCRIPT_INSTALL_DIR)\http1.0\"
+	@echo Installing library opt0.4 directory
+	@$(CPY) "$(ROOT)\library\opt\*.tcl" \
+	    "$(SCRIPT_INSTALL_DIR)\opt0.4\"
+	@echo Installing package http $(PKG_HTTP_VER) as a Tcl Module
+	@$(COPY) "$(ROOT)\library\http\http.tcl" \
+	    "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.6\http-$(PKG_HTTP_VER).tm"
+	@echo Installing package msgcat $(PKG_MSGCAT_VER) as a Tcl Module
+	@$(COPY) "$(ROOT)\library\msgcat\msgcat.tcl" \
+	    "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.5\msgcat-$(PKG_MSGCAT_VER).tm"
+	@echo Installing package tcltest $(PKG_TCLTEST_VER) as a Tcl Module
+	@$(COPY) "$(ROOT)\library\tcltest\tcltest.tcl" \
+	    "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.5\tcltest-$(PKG_TCLTEST_VER).tm"
+	@echo Installing package platform $(PKG_PLATFORM_VER) as a Tcl Module
+	@$(COPY) "$(ROOT)\library\platform\platform.tcl" \
+	    "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.4\platform-$(PKG_PLATFORM_VER).tm"
+	@echo Installing package platform::shell $(PKG_SHELL_VER) as a Tcl Module
+	@$(COPY) "$(ROOT)\library\platform\shell.tcl" \
+	    "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.4\platform\shell-$(PKG_SHELL_VER).tm"
+	@echo Installing $(TCLDDELIBNAME)
+!if $(STATIC_BUILD)
+!if !$(TCL_USE_STATIC_PACKAGES)
+	@$(CPY) "$(TCLDDELIB)" "$(LIB_INSTALL_DIR)\"
+!endif
+!else
+	@$(CPY) "$(TCLDDELIB)" "$(LIB_INSTALL_DIR)\dde$(DDEDOTVERSION)\"
+	@$(CPY) "$(ROOT)\library\dde\pkgIndex.tcl" \
+	    "$(LIB_INSTALL_DIR)\dde$(DDEDOTVERSION)\"
+!endif
+	@echo Installing $(TCLREGLIBNAME)
+!if $(STATIC_BUILD)
+!if !$(TCL_USE_STATIC_PACKAGES)
+	@$(CPY) "$(TCLREGLIB)" "$(LIB_INSTALL_DIR)\"
+!endif
+!else
+	@$(CPY) "$(TCLREGLIB)" "$(LIB_INSTALL_DIR)\reg$(REGDOTVERSION)\"
+	@$(CPY) "$(ROOT)\library\reg\pkgIndex.tcl" \
+	    "$(LIB_INSTALL_DIR)\reg$(REGDOTVERSION)\"
+!endif
+	@echo Installing encodings
+	@$(CPY) "$(ROOT)\library\encoding\*.enc" \
+		"$(SCRIPT_INSTALL_DIR)\encoding\"
+# "emacs font-lock highlighting fix
+
+install-tzdata:
+	@echo Installing time zone data
+	@set TCL_LIBRARY=$(ROOT:\=/)/library
+	@$(TCLSH_NATIVE) "$(ROOT:\=/)/tools/installData.tcl" \
+	    "$(ROOT:\=/)/library/tzdata" "$(SCRIPT_INSTALL_DIR)/tzdata"
+
+install-msgs:
+	@echo Installing message catalogs
+	@set TCL_LIBRARY=$(ROOT:\=/)/library
+	@$(TCLSH_NATIVE) "$(ROOT:\=/)/tools/installData.tcl" \
+	    "$(ROOT:\=/)/library/msgs" "$(SCRIPT_INSTALL_DIR)/msgs"
+
+#---------------------------------------------------------------------
+# Clean up
+#---------------------------------------------------------------------
+
+tidy:
+!if "$(TCLLIB)" != "$(TCLIMPLIB)"
+	@echo Removing $(TCLLIB) ...
+	@if exist $(TCLLIB) del $(TCLLIB)
+!endif
+	@echo Removing $(TCLIMPLIB) ...
+	@if exist $(TCLIMPLIB) del $(TCLIMPLIB)
+	@echo Removing $(TCLSH) ...
+	@if exist $(TCLSH) del $(TCLSH)
+	@echo Removing $(TCLTEST) ...
+	@if exist $(TCLTEST) del $(TCLTEST)
+	@echo Removing $(TCLDDELIB) ...
+	@if exist $(TCLDDELIB) del $(TCLDDELIB)
+	@echo Removing $(TCLREGLIB) ...
+	@if exist $(TCLREGLIB) del $(TCLREGLIB)
+
+clean: default-clean clean-pkgs
+hose: default-hose
+realclean: hose
+
+# Local Variables:
+# mode: makefile
+# End:
diff --git a/win/nmakehlp.c b/win/nmakehlp.c
index 0439d1c..025bb99 100644
--- a/win/nmakehlp.c
+++ b/win/nmakehlp.c
@@ -39,7 +39,6 @@
 #endif
 
 
-
 /* protos */
 
 static int CheckForCompilerFeature(const char *option);
@@ -47,6 +46,7 @@ static int CheckForLinkerFeature(const char **options, int count);
 static int IsIn(const char *string, const char *substring);
 static int SubstituteFile(const char *substs, const char *filename);
 static int QualifyPath(const char *path);
+static int LocateDependency(const char *keyfile);
 static const char *GetVersionFromFile(const char *filename, const char *match, int numdots);
 static DWORD WINAPI ReadFromPipe(LPVOID args);
 
@@ -172,6 +172,18 @@ main(
 		return 2;
 	    }
 	    return QualifyPath(argv[2]);
+
+	case 'L':
+	    if (argc != 3) {
+		chars = snprintf(msg, sizeof(msg) - 1,
+		    "usage: %s -L keypath\n"
+		    "Emit the fully qualified path of directory containing keypath\n"
+		    "exitcodes: 0 == success, 1 == not found, 2 == error\n", argv[0]);
+		WriteFile(GetStdHandle(STD_ERROR_HANDLE), msg, chars,
+		    &dwWritten, NULL);
+		return 2;
+	    }
+	    return LocateDependency(argv[2]);
 	}
     }
     chars = snprintf(msg, sizeof(msg) - 1,
@@ -701,6 +713,97 @@ QualifyPath(
 }
 
 /*
+ * Implements LocateDependency for a single directory. See that command
+ * for an explanation.
+ * Returns 0 if found after printing the directory.
+ * Returns 1 if not found but no errors.
+ * Returns 2 on any kind of error
+ * Basically, these are used as exit codes for the process.
+ */
+static int LocateDependencyHelper(const char *dir, const char *keypath)
+{
+    HANDLE hSearch;
+    char path[MAX_PATH+1];
+    int dirlen, keylen, ret;
+    WIN32_FIND_DATA finfo;
+
+    if (dir == NULL || keypath == NULL)
+	return 2; /* Have no real error reporting mechanism into nmake */
+    dirlen = strlen(dir);
+    if ((dirlen + 3) > sizeof(path))
+	return 2;
+    strncpy(path, dir, dirlen);
+    strncpy(path+dirlen, "\\*", 3);	/* Including terminating \0 */
+    keylen = strlen(keypath);
+
+#if 0 /* This function is not available in Visual C++ 6 */
+    /*
+     * Use numerics 0 -> FindExInfoStandard,
+     * 1 -> FindExSearchLimitToDirectories, 
+     * as these are not defined in Visual C++ 6
+     */
+    hSearch = FindFirstFileEx(path, 0, &finfo, 1, NULL, 0);
+#else
+    hSearch = FindFirstFile(path, &finfo);
+#endif
+    if (hSearch == INVALID_HANDLE_VALUE)
+	return 1; /* Not found */
+
+    /* Loop through all subdirs checking if the keypath is under there */
+    ret = 1; /* Assume not found */
+    do {
+	int sublen;
+	/*
+	 * We need to check it is a directory despite the 
+	 * FindExSearchLimitToDirectories in the above call. See SDK docs
+	 */
+	if ((finfo.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0)
+	    continue;
+	sublen = strlen(finfo.cFileName);
+	if ((dirlen+1+sublen+1+keylen+1) > sizeof(path))
+	    continue;		/* Path does not fit, assume not matched */
+	strncpy(path+dirlen+1, finfo.cFileName, sublen);
+	path[dirlen+1+sublen] = '\\';
+	strncpy(path+dirlen+1+sublen+1, keypath, keylen+1);
+	if (PathFileExists(path)) {
+	    /* Found a match, print to stdout */
+	    path[dirlen+1+sublen] = '\0';
+	    QualifyPath(path);
+	    ret = 0;
+	    break;
+	}
+    } while (FindNextFile(hSearch, &finfo));
+    FindClose(hSearch);
+    return ret;
+}
+
+/*
+ * LocateDependency --
+ *
+ *	Locates a dependency for a package.
+ *        keypath - a relative path within the package directory
+ *          that is used to confirm it is the correct directory.
+ *	The search path for the package directory is currently only
+ *      the parent and grandparent of the current working directory.
+ *      If found, the command prints 
+ *         name_DIRPATH=<full path of located directory>
+ *      and returns 0. If not found, does not print anything and returns 1.
+ */
+static int LocateDependency(const char *keypath)
+{
+    int i, ret;
+    static char *paths[] = {"..", "..\\..", "..\\..\\.."};
+    
+    for (i = 0; i < (sizeof(paths)/sizeof(paths[0])); ++i) {
+	ret = LocateDependencyHelper(paths[i], keypath);
+	if (ret == 0)
+	    return ret;
+    }
+    return ret;
+}
+
+
+/*
  * Local variables:
  *   mode: c
  *   c-basic-offset: 4
diff --git a/win/rules-ext.vc b/win/rules-ext.vc
new file mode 100644
index 0000000..58c70fa
--- /dev/null
+++ b/win/rules-ext.vc
@@ -0,0 +1,118 @@
+# This file should only be included in makefiles for Tcl extensions,

+# NOT in the makefile for Tcl itself.

+

+!ifndef _RULES_EXT_VC

+

+# We need to run from the directory the parent makefile is located in.

+# nmake does not tell us what makefile was used to invoke it so parent

+# makefile has to set the MAKEFILEVC macro or we just make a guess and

+# warn if we think that is not the case.

+!if "$(MAKEFILEVC)" == ""

+

+!if exist("$(PROJECT).vc")

+MAKEFILEVC = $(PROJECT).vc

+!elseif exist("makefile.vc")

+MAKEFILEVC = makefile.vc

+!endif

+!endif # "$(MAKEFILEVC)" == ""

+

+!if !exist("$(MAKEFILEVC)")

+MSG = ^

+You must run nmake from the directory containing the project makefile.^

+If you are doing that and getting this message, set the MAKEFILEVC^

+macro to the name of the project makefile.

+!message WARNING: $(MSG)

+!endif

+

+!if "$(PROJECT)" == "tcl"

+!error The rules-ext.vc file is not intended for Tcl itself.

+!endif

+

+# We extract version numbers using the nmakehlp program. For now use

+# the local copy of nmakehlp. Once we locate Tcl, we will use that

+# one if it is newer.

+!if [$(CC) -nologo "nmakehlp.c" -link -subsystem:console > nul]

+!endif

+

+# First locate the Tcl directory that we are working with.

+!ifdef TCLDIR

+

+_RULESDIR = $(TCLDIR:/=\)

+

+!else

+

+# If an installation path is specified, that is also the Tcl directory.

+# Also Tk never builds against an installed Tcl, it needs Tcl sources

+!if defined(INSTALLDIR) && "$(PROJECT)" != "tk"

+_RULESDIR=$(INSTALLDIR:/=\)

+!else

+# Locate Tcl sources

+!if [echo _RULESDIR = \> nmakehlp.out] \

+   || [nmakehlp -L generic\tcl.h >> nmakehlp.out]

+_RULESDIR = ..\..\tcl

+!else

+!include nmakehlp.out

+!endif

+

+!endif # defined(INSTALLDIR)....

+

+!endif # ifndef TCLDIR

+

+# Now look for the targets.vc file under the Tcl root. Note we check this

+# file and not rules.vc because the latter also exists on older systems.

+!if exist("$(_RULESDIR)\lib\nmake\targets.vc") # Building against installed Tcl

+_RULESDIR = $(_RULESDIR)\lib\nmake

+!elseif exist("$(_RULESDIR)\win\targets.vc")   # Building against Tcl sources

+_RULESDIR = $(_RULESDIR)\win

+!else

+# If we have not located Tcl's targets file, most likely we are compiling

+# against an older version of Tcl and so must use our own support files.

+_RULESDIR = .

+!endif

+

+!if "$(_RULESDIR)" != "."

+# Potentially using Tcl's support files. If this extension has its own

+# nmake support files, need to compare the versions and pick newer.

+

+!if exist("rules.vc") # The extension has its own copy

+

+!if [echo TCL_RULES_MAJOR = \> versions.vc] \

+   && [nmakehlp -V "$(_RULESDIR)\rules.vc" RULES_VERSION_MAJOR >> versions.vc]

+!endif

+!if [echo TCL_RULES_MINOR = \>> versions.vc] \

+   && [nmakehlp -V "$(_RULESDIR)\rules.vc" RULES_VERSION_MINOR >> versions.vc]

+!endif

+

+!if [echo OUR_RULES_MAJOR = \>> versions.vc] \

+   && [nmakehlp -V "rules.vc" RULES_VERSION_MAJOR >> versions.vc]

+!endif

+!if [echo OUR_RULES_MINOR = \>> versions.vc] \

+   && [nmakehlp -V "rules.vc" RULES_VERSION_MINOR >> versions.vc]

+!endif

+!include versions.vc

+# We have a newer version of the support files, use them

+!if ($(TCL_RULES_MAJOR) != $(OUR_RULES_MAJOR)) || ($(TCL_RULES_MINOR) < $(OUR_RULES_MINOR))

+_RULESDIR = .

+!endif

+

+!endif # if exist("rules.vc")

+

+!endif # if $(_RULESDIR) != "."

+

+# Let rules.vc know what copy of nmakehlp.c to use.

+NMAKEHLPC = $(_RULESDIR)\nmakehlp.c

+

+# Get rid of our internal defines before calling rules.vc

+!undef TCL_RULES_MAJOR

+!undef TCL_RULES_MINOR

+!undef OUR_RULES_MAJOR

+!undef OUR_RULES_MINOR

+

+!if exist("$(_RULESDIR)\rules.vc")

+!message *** Using $(_RULESDIR)\rules.vc

+!include "$(_RULESDIR)\rules.vc"

+!else

+!error *** Could not locate rules.vc in $(_RULESDIR)

+!endif

+

+!endif # _RULES_EXT_VC
\ No newline at end of file
diff --git a/win/rules.vc b/win/rules.vc
index 4a3ae26..7fc51c1 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -1,60 +1,435 @@
-#------------------------------------------------------------------------------

+#------------------------------------------------------------- -*- makefile -*-

 # rules.vc --

 #

-#	Microsoft Visual C++ makefile include for decoding the commandline

-#	macros.  This file does not need editing to build Tcl.

+# Part of the nmake based build system for Tcl and its extensions.

+# This file does all the hard work in terms of parsing build options,

+# compiler switches, defining common targets and macros. The Tcl makefile

+# directly includes this. Extensions include it via "rules-ext.vc".

+#

+# See TIP 477 (https://core.tcl.tk/tips/doc/trunk/tip/477.md) for

+# detailed documentation.

 #

 # See the file "license.terms" for information on usage and redistribution

 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.

 #

 # Copyright (c) 2001-2003 David Gravereaux.

 # Copyright (c) 2003-2008 Patrick Thoyts

+# Copyright (c) 2017      Ashok P. Nadkarni

 #------------------------------------------------------------------------------

 

 !ifndef _RULES_VC

 _RULES_VC = 1

 

-cc32		= $(CC)   # built-in default.

-link32		= link

-lib32		= lib

-rc32		= $(RC)   # built-in default.

+# The following macros define the version of the rules.vc nmake build system

+# For modifications that are not backward-compatible, you *must* change

+# the major version.

+RULES_VERSION_MAJOR = 1

+RULES_VERSION_MINOR = 0

 

-!ifndef INSTALLDIR

-### Assume the normal default.

-_INSTALLDIR	= C:\Program Files\Tcl

+# The PROJECT macro must be defined by parent makefile.

+!if "$(PROJECT)" == ""

+!error *** Error: Macro PROJECT not defined! Please define it before including rules.vc

+!endif

+

+!if "$(PRJ_PACKAGE_TCLNAME)" == ""

+PRJ_PACKAGE_TCLNAME = $(PROJECT)

+!endif

+

+# Also special case Tcl and Tk to save some typing later

+DOING_TCL = 0

+DOING_TK  = 0

+!if "$(PROJECT)" == "tcl"

+DOING_TCL = 1

+!elseif "$(PROJECT)" == "tk"

+DOING_TK = 1

+!endif

+

+!ifndef NEED_TK

+# Backwards compatibility

+!ifdef PROJECT_REQUIRES_TK

+NEED_TK = $(PROJECT_REQUIRES_TK)

 !else

-### Fix the path separators.

-_INSTALLDIR	= $(INSTALLDIR:/=\)

+NEED_TK = 0

+!endif

+!endif

+

+!ifndef NEED_TCL_SOURCE

+NEED_TCL_SOURCE = 0

+!endif

+

+!ifdef NEED_TK_SOURCE

+!if $(NEED_TK_SOURCE)

+NEED_TK = 1

+!endif

+!else

+NEED_TK_SOURCE = 0

 !endif

 

+################################################################

+# Nmake is a pretty weak environment in syntax and capabilities

+# so this file is necessarily verbose. It's broken down into

+# the following parts.

+#

+# 0. Sanity check that compiler environment is set up and initialize

+#    any built-in settings from the parent makefile

+# 1. First define the external tools used for compiling, copying etc.

+#    as this is independent of everything else.

+# 2. Figure out our build structure in terms of the directory, whether

+#    we are building Tcl or an extension, etc.

+# 3. Determine the compiler and linker versions

+# 4. Build the nmakehlp helper application

+# 5. Determine the supported compiler options and features

+# 6. Parse the OPTS macro value for user-specified build configuration

+# 7. Parse the STATS macro value for statistics instrumentation

+# 8. Parse the CHECKS macro for additional compilation checks

+# 9. Extract Tcl, and possibly Tk, version numbers from the headers

+# 10. Based on this selected configuration, construct the output

+#     directory and file paths

+# 11. Construct the paths where the package is to be installed

+# 12. Set up the actual options passed to compiler and linker based

+#     on the information gathered above.

+# 13. Define some standard build targets and implicit rules. These may

+#     be optionally disabled by the parent makefile.

+# 14. (For extensions only.) Compare the configuration of the target

+#     Tcl and the extensions and warn against discrepancies.

+#

+# One final note about the macro names used. They are as they are

+# for historical reasons. We would like legacy extensions to

+# continue to work with this make include file so be wary of

+# changing them for consistency or clarity.

+

+# 0. Sanity check compiler environment

+

+# 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 = ^

+Visual C++ compiler environment not initialized.

+!error $(MSG)

+!endif

+

+# We need to run from the directory the parent makefile is located in.

+# nmake does not tell us what makefile was used to invoke it so parent

+# makefile has to set the MAKEFILEVC macro or we just make a guess and

+# warn if we think that is not the case.

+!if "$(MAKEFILEVC)" == ""

+

+!if exist("$(PROJECT).vc")

+MAKEFILEVC = $(PROJECT).vc

+!elseif exist("makefile.vc")

+MAKEFILEVC = makefile.vc

+!endif

+!endif # "$(MAKEFILEVC)" == ""

+

+!if !exist("$(MAKEFILEVC)")

+MSG = ^

+You must run nmake from the directory containing the project makefile.^

+If you are doing that and getting this message, set the MAKEFILEVC^

+macro to the name of the project makefile.

+!message WARNING: $(MSG)

+!endif

+

+

+################################################################

+# 1. Define external programs being used

+

 #----------------------------------------------------------

 # Set the proper copy method to avoid overwrite questions

 # to the user when copying files and selecting the right

 # "delete all" method.

 #----------------------------------------------------------

 

-!if "$(OS)" == "Windows_NT"

 RMDIR	= rmdir /S /Q

-ERRNULL  = 2>NUL

-!if ![ver | find "4.0" > nul]

-CPY	= echo y | xcopy /i >NUL

-COPY	= copy >NUL

-!else

 CPY	= xcopy /i /y >NUL

+CPYDIR  = xcopy /e /i /y >NUL

 COPY	= copy /y >NUL

+MKDIR   = mkdir

+

+######################################################################

+# 2. Figure out our build environment in terms of what we're building.

+#

+# (a) Tcl itself

+# (b) Tk

+# (c) a Tcl extension using libraries/includes from an *installed* Tcl

+# (d) a Tcl extension using libraries/includes from Tcl source directory

+#

+# This last is needed because some extensions still need

+# some Tcl interfaces that are not publicly exposed.

+#

+# The fragment will set the following macros:

+# ROOT - root of this module sources

+# COMPATDIR - source directory that holds compatibility sources

+# DOCDIR - source directory containing documentation files

+# GENERICDIR - platform-independent source directory

+# WINDIR - Windows-specific source directory

+# TESTDIR - directory containing test files

+# TOOLSDIR - directory containing build tools

+# _TCLDIR - root of the Tcl installation OR the Tcl sources. Not set

+#    when building Tcl itself.

+# _INSTALLDIR - native form of the installation path. For Tcl

+#    this will be the root of the Tcl installation. For extensions

+#    this will be the lib directory under the root.

+# TCLINSTALL  - set to 1 if _TCLDIR refers to

+#    headers and libraries from an installed Tcl, and 0 if built against

+#    Tcl sources. Not set when building Tcl itself. Yes, not very well

+#    named.

+# _TCL_H - native path to the tcl.h file

+#

+# If Tk is involved, also sets the following

+# _TKDIR - native form Tk installation OR Tk source. Not set if building

+#    Tk itself.

+# TKINSTALL - set 1 if _TKDIR refers to installed Tk and 0 if Tk sources

+# _TK_H - native path to the tk.h file

+

+# Root directory for sources and assumed subdirectories

+ROOT = $(MAKEDIR)\..

+# The following paths CANNOT have spaces in them as they appear on the

+# left side of implicit rules.

+!ifndef COMPATDIR

+COMPATDIR	= $(ROOT)\compat

+!endif

+!ifndef DOCDIR

+DOCDIR		= $(ROOT)\doc

+!endif

+!ifndef GENERICDIR

+GENERICDIR	= $(ROOT)\generic

+!endif

+!ifndef TOOLSDIR

+TOOLSDIR	= $(ROOT)\tools

+!endif

+!ifndef TESTDIR

+TESTDIR	= $(ROOT)\tests

+!endif

+!ifndef LIBDIR

+!if exist("$(ROOT)\library")

+LIBDIR          = $(ROOT)\library

+!else

+LIBDIR          = $(ROOT)\lib

 !endif

-!else # "$(OS)" != "Windows_NT"

-CPY	= xcopy /i >_JUNK.OUT # On Win98 NUL does not work here.

-COPY	= copy >_JUNK.OUT # On Win98 NUL does not work here.

-RMDIR	= deltree /Y

-NULL    = \NUL # Used in testing directory existence

-ERRNULL = >NUL # Win9x shell cannot redirect stderr

 !endif

-MKDIR   = mkdir

+!ifndef DEMODIR

+!if exist("$(LIBDIR)\demos")

+DEMODIR		= $(LIBDIR)\demos

+!else

+DEMODIR		= $(ROOT)\demos

+!endif

+!endif # ifndef DEMODIR

+# Do NOT enclose WINDIR in a !ifndef because Windows always defines

+# WINDIR env var to point to c:\windows!

+# TBD - This is a potentially dangerous conflict, rename WINDIR to

+# something else

+WINDIR		= $(ROOT)\win

+

+!ifndef RCDIR

+!if exist("$(WINDIR)\rc")

+RCDIR           = $(WINDIR)\rc

+!else

+RCDIR           = $(WINDIR)

+!endif

+!endif

+RCDIR = $(RCDIR:/=\)

 

-#------------------------------------------------------------------------------

-# Determine the host and target architectures and compiler version.

-#------------------------------------------------------------------------------

+# The target directory where the built packages and binaries will be installed.

+# INSTALLDIR is the (optional) path specified by the user.

+# _INSTALLDIR is INSTALLDIR using the backslash separator syntax

+!ifdef INSTALLDIR

+### Fix the path separators.

+_INSTALLDIR	= $(INSTALLDIR:/=\)

+!else

+### Assume the normal default.

+_INSTALLDIR	= $(HOMEDRIVE)\Tcl

+!endif

+

+!if $(DOING_TCL)

+

+# BEGIN Case 2(a) - Building Tcl itself

+

+# Only need to define _TCL_H

+_TCL_H = ..\generic\tcl.h

+

+# END Case 2(a) - Building Tcl itself

+

+!elseif $(DOING_TK)

+

+# BEGIN Case 2(b) - Building Tk

+

+TCLINSTALL = 0 # Tk always builds against Tcl source, not an installed Tcl

+!if "$(TCLDIR)" == ""

+!if [echo TCLDIR = \> nmakehlp.out] \

+   || [nmakehlp -L generic\tcl.h >> nmakehlp.out]

+!error *** Could not locate Tcl source directory.

+!endif

+!include nmakehlp.out

+!endif # TCLDIR == ""

+

+_TCLDIR	= $(TCLDIR:/=\)

+_TCL_H  = $(_TCLDIR)\generic\tcl.h

+!if !exist("$(_TCL_H)")

+!error Could not locate tcl.h. Please set the TCLDIR macro to point to the Tcl *source* directory.

+!endif

+

+_TK_H = ..\generic\tk.h

+

+# END Case 2(b) - Building Tk

+

+!else

+

+# BEGIN Case 2(c) or (d) - Building an extension other than Tk

+

+# If command line has specified Tcl location through TCLDIR, use it

+# else default to the INSTALLDIR setting

+!if "$(TCLDIR)" != ""

+

+_TCLDIR	= $(TCLDIR:/=\)

+!if exist("$(_TCLDIR)\include\tcl.h") # Case 2(c) with TCLDIR defined

+TCLINSTALL	= 1

+_TCL_H          = $(_TCLDIR)\include\tcl.h

+!elseif exist("$(_TCLDIR)\generic\tcl.h") # Case 2(d) with TCLDIR defined

+TCLINSTALL	= 0

+_TCL_H          = $(_TCLDIR)\generic\tcl.h

+!endif

+

+!else  #  # Case 2(c) for extensions with TCLDIR undefined

+

+# Need to locate Tcl depending on whether it needs Tcl source or not.

+# If we don't, check the INSTALLDIR for an installed Tcl first

+

+!if exist("$(_INSTALLDIR)\include\tcl.h") && !$(NEED_TCL_SOURCE)

+

+TCLINSTALL	= 1

+TCLDIR          = $(_INSTALLDIR)\..

+# NOTE: we will be resetting _INSTALLDIR to _INSTALLDIR/lib for extensions

+# later so the \.. accounts for the /lib

+_TCLDIR		= $(_INSTALLDIR)\..

+_TCL_H          = $(_TCLDIR)\include\tcl.h

+

+!else # exist(...) && ! $(NEED_TCL_SOURCE)

+

+!if [echo _TCLDIR = \> nmakehlp.out] \

+   || [nmakehlp -L generic\tcl.h >> nmakehlp.out]

+!error *** Could not locate Tcl source directory.

+!endif

+!include nmakehlp.out

+TCLINSTALL      = 0

+TCLDIR         = $(_TCLDIR)

+_TCL_H          = $(_TCLDIR)\generic\tcl.h

+

+!endif # exist(...) && ! $(NEED_TCL_SOURCE)

+

+!endif # TCLDIR

+

+!ifndef _TCL_H

+MSG =^

+Failed to find tcl.h. The TCLDIR macro is set incorrectly or is not set and default path does not contain tcl.h.

+!error $(MSG)

+!endif

+

+# Now do the same to locate Tk headers and libs if project requires Tk

+!if $(NEED_TK)

+

+!if "$(TKDIR)" != ""

+

+_TKDIR = $(TKDIR:/=\)

+!if exist("$(_TKDIR)\include\tk.h")

+TKINSTALL      = 1

+_TK_H          = $(_TKDIR)\include\tk.h

+!elseif exist("$(_TKDIR)\generic\tk.h")

+TKINSTALL      = 0

+_TK_H          = $(_TKDIR)\generic\tk.h

+!endif

+

+!else # TKDIR not defined

+

+# Need to locate Tcl depending on whether it needs Tcl source or not.

+# If we don't, check the INSTALLDIR for an installed Tcl first

+

+!if exist("$(_INSTALLDIR)\include\tk.h") && !$(NEED_TK_SOURCE)

+

+TKINSTALL      = 1

+# NOTE: we will be resetting _INSTALLDIR to _INSTALLDIR/lib for extensions

+# later so the \.. accounts for the /lib

+_TKDIR         = $(_INSTALLDIR)\..

+_TK_H          = $(_TKDIR)\include\tk.h

+TKDIR          = $(_TKDIR)

+

+!else # exist("$(_INSTALLDIR)\include\tk.h") && !$(NEED_TK_SOURCE)

+

+!if [echo _TKDIR = \> nmakehlp.out] \

+   || [nmakehlp -L generic\tk.h >> nmakehlp.out]

+!error *** Could not locate Tk source directory.

+!endif

+!include nmakehlp.out

+TKINSTALL      = 0

+TKDIR          = $(_TKDIR)

+_TK_H          = $(_TKDIR)\generic\tk.h

+

+!endif # exist("$(_INSTALLDIR)\include\tk.h") && !$(NEED_TK_SOURCE)

+

+!endif # TKDIR

+

+!ifndef _TK_H

+MSG =^

+Failed to find tk.h. The TKDIR macro is set incorrectly or is not set and default path does not contain tk.h.

+!error $(MSG)

+!endif

+

+!endif # NEED_TK

+

+!if $(NEED_TCL_SOURCE) && $(TCLINSTALL)

+MSG = ^

+*** Warning: This extension requires the source distribution of Tcl.^

+*** Please set the TCLDIR macro to point to the Tcl sources.

+!error $(MSG)

+!endif

+

+!if $(NEED_TK_SOURCE)

+!if $(TKINSTALL)

+MSG = ^

+*** Warning: This extension requires the source distribution of Tk.^

+*** Please set the TKDIR macro to point to the Tk sources.

+!error $(MSG)

+!endif

+!endif

+

+

+# If INSTALLDIR set to tcl installation root dir then reset to the

+# lib dir for installing extensions 

+!if exist("$(_INSTALLDIR)\include\tcl.h")

+_INSTALLDIR=$(_INSTALLDIR)\lib

+!endif

+

+# END Case 2(c) or (d) - Building an extension

+!endif # if $(DOING_TCL)

+

+################################################################

+# 3. Determine compiler version and architecture

+# In this section, we figure out the compiler version and the

+# architecture for which we are building. This sets the

+# following macros:

+# VCVERSION - the internal compiler version as 1200, 1400, 1910 etc.

+#     This is also printed by the compiler in dotted form 19.10 etc.

+# VCVER - the "marketing version", for example Visual C++ 6 for internal

+#     compiler version 1200. This is kept only for legacy reasons as it

+#     does not make sense for recent Microsoft compilers. Only used for

+#     output directory names.

+# ARCH - set to IX86 or AMD64 depending on 32- or 64-bit target

+# NATIVE_ARCH - set to IX86 or AMD64 for the host machine

+# MACHINE - same as $(ARCH) - legacy

+# _VC_MANIFEST_EMBED_{DLL,EXE} - commands for embedding a manifest if needed

+# CFG_ENCODING - set to an character encoding.

+#   TBD - this is passed to compiler as TCL_CFGVAL_ENCODING but can't

+#   see where it is used

+

+cc32		= $(CC)   # built-in default.

+link32		= link

+lib32		= lib

+rc32		= $(RC)   # built-in default.

+

+#----------------------------------------------------------------

+# Figure out the compiler architecture and version by writing

+# the C macros to a file, preprocessing them with the C

+# preprocessor and reading back the created file

 

 _HASH=^#

 _VC_MANIFEST_EMBED_EXE=

@@ -66,16 +441,43 @@ VCVER=0
     && ![echo $(_HASH)elif defined(_M_AMD64) >> vercl.x] \

     && ![echo ARCH=AMD64 >> vercl.x] \

     && ![echo $(_HASH)endif >> vercl.x] \

-    && ![cl -nologo -TC -P vercl.x $(ERRNULL)]

+    && ![$(cc32) -nologo -TC -P vercl.x 2>NUL]

 !include vercl.i

+!if $(VCVERSION) < 1900

 !if ![echo VCVER= ^\> vercl.vc] \

     && ![set /a $(VCVERSION) / 100 - 6 >> vercl.vc]

 !include vercl.vc

 !endif

+!else

+# The simple calculation above does not apply to new Visual Studio releases

+# Keep the compiler version in its native form.

+VCVER = $(VCVERSION)

+!endif

+!endif

+

+!if ![del 2>NUL /q/f vercl.x vercl.i vercl.vc]

+!endif

+

+#----------------------------------------------------------------

+# The MACHINE macro is used by legacy makefiles so set it as well

+!ifdef MACHINE

+!if "$(MACHINE)" == "x86"

+!undef MACHINE

+MACHINE = IX86

+!elseif "$(MACHINE)" == "x64"

+!undef MACHINE

+MACHINE = AMD64

+!endif

+!if "$(MACHINE)" != "$(ARCH)"

+!error Specified MACHINE macro $(MACHINE) does not match detected target architecture $(ARCH).

 !endif

-!if ![del $(ERRNUL) /q/f vercl.x vercl.i vercl.vc]

+!else

+MACHINE=$(ARCH)

 !endif

 

+#------------------------------------------------------------

+# Figure out the *host* architecture by reading the registry

+

 !if ![reg query HKLM\Hardware\Description\System\CentralProcessor\0 /v Identifier | findstr /i x86]

 NATIVE_ARCH=IX86

 !else

@@ -88,135 +490,192 @@ _VC_MANIFEST_EMBED_EXE=if exist $@.manifest mt -nologo -manifest $@.manifest -ou
 _VC_MANIFEST_EMBED_DLL=if exist $@.manifest mt -nologo -manifest $@.manifest -outputresource:$@;2

 !endif

 

-!ifndef MACHINE

-MACHINE=$(ARCH)

-!endif

-

 !ifndef CFG_ENCODING

 CFG_ENCODING	= \"cp1252\"

 !endif

 

-!message ===============================================================================

+################################################################

+# 4. Build the nmakehlp program

+# This is a helper app we need to overcome nmake's limiting

+# environment. We will call out to it to get various bits of

+# information about supported compiler options etc.

+#

+# Tcl itself will always use the nmakehlp.c program which is

+# in its own source. This is the "master" copy and kept updated.

+#

+# Extensions built against an installed Tcl will use the installed

+# copy of Tcl's nmakehlp.c if there is one and their own version

+# otherwise. In the latter case, they would also be using their own

+# rules.vc. Note that older versions of Tcl do not install nmakehlp.c

+# or rules.vc.

+#

+# Extensions built against Tcl sources will use the one from the Tcl source.

+#

+# When building an extension using a sufficiently new version of Tcl,

+# rules-ext.vc will define NMAKEHLPC appropriately to point to the

+# copy of nmakehlp.c to be used.

 

-#----------------------------------------------------------

-# build the helper app we need to overcome nmake's limiting

-# environment.

-#----------------------------------------------------------

+!ifndef NMAKEHLPC

+# Default to the one in the current directory (the extension's own nmakehlp.c)

+NMAKEHLPC = nmakehlp.c

 

-!if !exist(nmakehlp.exe)

-!if [$(cc32) -nologo nmakehlp.c -link -subsystem:console > nul]

+!if !$(DOING_TCL)

+!if $(TCLINSTALL)

+!if exist("$(_TCLDIR)\lib\nmake\nmakehlp.c")

+NMAKEHLPC = $(_TCLDIR)\lib\nmake\nmakehlp.c

 !endif

+!else # ! $(TCLINSTALL)

+!if exist("$(_TCLDIR)\win\nmakehlp.c")

+NMAKEHLPC = $(_TCLDIR)\win\nmakehlp.c

 !endif

+!endif # $(TCLINSTALL)

+!endif # !$(DOING_TCL)

 

-#----------------------------------------------------------

-# Test for compiler features

-#----------------------------------------------------------

+!endif # NMAKEHLPC

 

-### test for optimizations

-!if [nmakehlp -c -Ot]

-!message *** Compiler has 'Optimizations'

-OPTIMIZING	= 1

-!else

-!message *** Compiler does not have 'Optimizations'

-OPTIMIZING	= 0

+# We always build nmakehlp even if it exists since we do not know

+# what source it was built from.

+!message *** Using $(NMAKEHLPC)

+!if [$(cc32) -nologo "$(NMAKEHLPC)" -link -subsystem:console > nul]

 !endif

 

-OPTIMIZATIONS   =

+################################################################

+# 5. Test for compiler features

+# Visual C++ compiler options have changed over the years. Check

+# which options are supported by the compiler in use.

+#

+# The following macros are set:

+# OPTIMIZATIONS - the compiler flags to be used for optimized builds

+# DEBUGFLAGS - the compiler flags to be used for debug builds

+# LINKERFLAGS - Flags passed to the linker 

+#

+# Note that these are the compiler settings *available*, not those

+# that will be *used*. The latter depends on the OPTS macro settings

+# which we have not yet parsed.

+#

+# Also note that some of the flags in OPTIMIZATIONS are not really

+# related to optimization. They are placed there only for legacy reasons

+# as some extensions expect them to be included in that macro.

 

-!if [nmakehlp -c -Ot]

-OPTIMIZATIONS  = $(OPTIMIZATIONS) -Ot

+# -Op improves float consistency. Note only needed for older compilers

+# Newer compilers do not need or support this option.

+!if [nmakehlp -c -Op]

+FPOPTS  = -Op

 !endif

 

-!if [nmakehlp -c -Oi]

-OPTIMIZATIONS  = $(OPTIMIZATIONS) -Oi

+# Strict floating point semantics - present in newer compilers in lieu of -Op

+!if [nmakehlp -c -fp:strict]

+FPOPTS  = $(FPOPTS) -fp:strict

 !endif

 

-!if [nmakehlp -c -Op]

-OPTIMIZATIONS  = $(OPTIMIZATIONS) -Op

+!if "$(MACHINE)" == "IX86"

+### test for pentium errata

+!if [nmakehlp -c -QI0f]

+!message *** Compiler has 'Pentium 0x0f fix'

+FPOPTS  = $(FPOPTS) -QI0f

+!else

+!message *** Compiler does not have 'Pentium 0x0f fix'

 !endif

-

-!if [nmakehlp -c -fp:strict]

-OPTIMIZATIONS  = $(OPTIMIZATIONS) -fp:strict

 !endif

 

-!if [nmakehlp -c -Gs]

-OPTIMIZATIONS  = $(OPTIMIZATIONS) -Gs

+### test for optimizations

+# /O2 optimization includes /Og /Oi /Ot /Oy /Ob2 /Gs /GF /Gy as per

+# documentation. Note we do NOT want /Gs as that inserts a _chkstk

+# stack probe at *every* function entry, not just those with more than

+# a page of stack allocation resulting in a performance hit.  However,

+# /O2 documentation is misleading as its stack probes are simply the

+# default page size locals allocation probes and not what is implied

+# by an explicit /Gs option.

+

+OPTIMIZATIONS = $(FPOPTS)

+

+!if [nmakehlp -c -O2]

+!message *** Compiler has 'Optimizations'

+OPTIMIZING = 1

+OPTIMIZATIONS   = $(OPTIMIZATIONS) -O2

+!else

+# Legacy, really. All modern compilers support this

+!message *** Compiler does not have 'Optimizations'

+OPTIMIZING = 0

 !endif

 

+# Checks for buffer overflows in local arrays

 !if [nmakehlp -c -GS]

 OPTIMIZATIONS  = $(OPTIMIZATIONS) -GS

 !endif

 

+# Link time optimization. Note that this option (potentially) makes

+# generated libraries only usable by the specific VC++ version that

+# created it. Requires /LTCG linker option

 !if [nmakehlp -c -GL]

 OPTIMIZATIONS  = $(OPTIMIZATIONS) -GL

+CC_GL_OPT_ENABLED = 1

+!else

+# In newer compilers -GL and -YX are incompatible.

+!if [nmakehlp -c -YX]

+OPTIMIZATIONS  = $(OPTIMIZATIONS) -YX

 !endif

+!endif # [nmakehlp -c -GL]

 

-DEBUGFLAGS     =

+DEBUGFLAGS     = $(FPOPTS)

 

+# Run time error checks. Not available or valid in a release, non-debug build

+# RTC is for modern compilers, -GZ is legacy

 !if [nmakehlp -c -RTC1]

 DEBUGFLAGS     = $(DEBUGFLAGS) -RTC1

 !elseif [nmakehlp -c -GZ]

 DEBUGFLAGS     = $(DEBUGFLAGS) -GZ

 !endif

 

-COMPILERFLAGS  =-W3 /DUNICODE /D_UNICODE /D_ATL_XP_TARGETING

-

-# In v13 -GL and -YX are incompatible.

-!if [nmakehlp -c -YX]

-!if ![nmakehlp -c -GL]

-OPTIMIZATIONS  = $(OPTIMIZATIONS) -YX

-!endif

-!endif

-

-!if "$(MACHINE)" == "IX86"

-### test for pentium errata

-!if [nmakehlp -c -QI0f]

-!message *** Compiler has 'Pentium 0x0f fix'

-COMPILERFLAGS  = $(COMPILERFLAGS) -QI0f

-!else

-!message *** Compiler does not have 'Pentium 0x0f fix'

-!endif

-!endif

-

-!if "$(MACHINE)" == "IA64"

-### test for Itanium errata

-!if [nmakehlp -c -QIA64_Bx]

-!message *** Compiler has 'B-stepping errata workarounds'

-COMPILERFLAGS   = $(COMPILERFLAGS) -QIA64_Bx

-!else

-!message *** Compiler does not have 'B-stepping errata workarounds'

-!endif

-!endif

+#----------------------------------------------------------------

+# Linker flags

 

-# Prevents "LNK1561: entry point must be defined" error compiling from VS-IDE:

+# LINKER_TESTFLAGS are for internal use when we call nmakehlp to test

+# if the linker supports a specific option. Without these flags link will

+# return "LNK1561: entry point must be defined" error compiling from VS-IDE:

+# They are not passed through to the actual application / extension

+# link rules.

 !ifndef LINKER_TESTFLAGS

-LINKER_TESTFLAGS = /DLL /NOENTRY /OUT:nmhlp-out.txt

-!endif

-

-!if "$(MACHINE)" == "IX86"

-### test for -align:4096, when align:512 will do.

-!if [nmakehlp -l -opt:nowin98 $(LINKER_TESTFLAGS)]

-!message *** Linker has 'Win98 alignment problem'

-ALIGN98_HACK	= 1

-!else

-!message *** Linker does not have 'Win98 alignment problem'

-ALIGN98_HACK	= 0

-!endif

-!else

-ALIGN98_HACK	= 0

+LINKER_TESTFLAGS = /DLL /NOENTRY /OUT:nmakehlp.out

 !endif

 

 LINKERFLAGS     =

 

+# If compiler has enabled link time optimization, linker must too with -ltcg

+!ifdef CC_GL_OPT_ENABLED

 !if [nmakehlp -l -ltcg $(LINKER_TESTFLAGS)]

-LINKERFLAGS     =-ltcg

-!endif

-

-#----------------------------------------------------------

-# Decode the options requested.

-#----------------------------------------------------------

-

-!if "$(OPTS)" == "" || [nmakehlp -f "$(OPTS)" "none"]

+LINKERFLAGS     = $(LINKERFLAGS) -ltcg

+!endif

+!endif

+

+########################################################################

+# 6. Parse the OPTS macro to work out the requested build configuration.

+# Based on this, we will construct the actual switches to be passed to the

+# compiler and linker using the macros defined in the previous section.

+# The following macros are defined by this section based on OPTS

+# STATIC_BUILD - 0 -> Tcl is to be built as a shared library

+#                1 -> build as a static library and shell

+# TCL_THREADS - legacy but always 1 on Windows since winsock requires it.

+# DEBUG - 1 -> debug build, 0 -> release builds

+# SYMBOLS - 1 -> generate PDB's, 0 -> no PDB's

+# PROFILE - 1 -> generate profiling info, 0 -> no profiling

+# PGO     - 1 -> profile based optimization, 0 -> no

+# MSVCRT  - 1 -> link to dynamic C runtime even when building static Tcl build

+#           0 -> link to static C runtime for static Tcl build.

+#           Does not impact shared Tcl builds (STATIC_BUILD == 0)

+# TCL_USE_STATIC_PACKAGES - 1 -> statically link the registry and dde extensions

+#           in the Tcl shell. 0 -> keep them as shared libraries

+#           Does not impact shared Tcl builds.

+# USE_THREAD_ALLOC - 1 -> Use a shared global free pool for allocation.

+#           0 -> Use the non-thread allocator.

+# UNCHECKED - 1 -> when doing a debug build with symbols, use the release

+#           C runtime, 0 -> use the debug C runtime.

+# USE_STUBS - 1 -> compile to use stubs interfaces, 0 -> direct linking

+# CONFIG_CHECK - 1 -> check current build configuration against Tcl

+#           configuration (ignored for Tcl itself)

+# Further, LINKERFLAGS are modified based on above.

+

+# Default values for all the above

 STATIC_BUILD	= 0

 TCL_THREADS	= 1

 DEBUG		= 0

@@ -224,17 +683,32 @@ SYMBOLS		= 0
 PROFILE		= 0

 PGO		= 0

 MSVCRT		= 1

-LOIMPACT	= 0

 TCL_USE_STATIC_PACKAGES	= 0

 USE_THREAD_ALLOC = 1

 UNCHECKED	= 0

+CONFIG_CHECK    = 1

+!if $(DOING_TCL)

+USE_STUBS       = 0

 !else

+USE_STUBS       = 1

+!endif

+

+# If OPTS is not empty AND does not contain "none" which turns off all OPTS

+# set the above macros based on OPTS content

+!if "$(OPTS)" != "" && ![nmakehlp -f "$(OPTS)" "none"]

+

+# OPTS are specified, parse them

+

 !if [nmakehlp -f $(OPTS) "static"]

 !message *** Doing static

 STATIC_BUILD	= 1

-!else

-STATIC_BUILD	= 0

 !endif

+

+!if [nmakehlp -f $(OPTS) "nostubs"]

+!message *** Not using stubs

+USE_STUBS	= 0

+!endif

+

 !if [nmakehlp -f $(OPTS) "nomsvcrt"]

 !message *** Doing nomsvcrt

 MSVCRT		= 0

@@ -249,13 +723,15 @@ MSVCRT		= 1
 MSVCRT		= 0

 !endif

 !endif

-!endif

+!endif # [nmakehlp -f $(OPTS) "nomsvcrt"]

+

 !if [nmakehlp -f $(OPTS) "staticpkg"] && $(STATIC_BUILD)

 !message *** Doing staticpkg

 TCL_USE_STATIC_PACKAGES	= 1

 !else

 TCL_USE_STATIC_PACKAGES	= 0

 !endif

+

 !if [nmakehlp -f $(OPTS) "nothreads"]

 !message *** Compile explicitly for non-threaded tcl

 TCL_THREADS	= 0

@@ -264,24 +740,28 @@ USE_THREAD_ALLOC= 0
 TCL_THREADS	= 1

 USE_THREAD_ALLOC= 1

 !endif

+

 !if [nmakehlp -f $(OPTS) "symbols"]

 !message *** Doing symbols

 DEBUG		= 1

 !else

 DEBUG		= 0

 !endif

+

 !if [nmakehlp -f $(OPTS) "pdbs"]

 !message *** Doing pdbs

 SYMBOLS		= 1

 !else

 SYMBOLS		= 0

 !endif

+

 !if [nmakehlp -f $(OPTS) "profile"]

 !message *** Doing profile

 PROFILE		= 1

 !else

 PROFILE		= 0

 !endif

+

 !if [nmakehlp -f $(OPTS) "pgi"]

 !message *** Doing profile guided optimization instrumentation

 PGO		= 1

@@ -291,44 +771,229 @@ PGO		= 2
 !else

 PGO		= 0

 !endif

+

 !if [nmakehlp -f $(OPTS) "loimpact"]

-!message *** Doing loimpact

-LOIMPACT	= 1

-!else

-LOIMPACT	= 0

+!message *** Warning: ignoring option "loimpact" - deprecated on modern Windows.

 !endif

+

+# TBD - should get rid of this option

 !if [nmakehlp -f $(OPTS) "thrdalloc"]

 !message *** Doing thrdalloc

 USE_THREAD_ALLOC = 1

 !endif

+

 !if [nmakehlp -f $(OPTS) "tclalloc"]

-!message *** Doing tclalloc

 USE_THREAD_ALLOC = 0

 !endif

+

 !if [nmakehlp -f $(OPTS) "unchecked"]

 !message *** Doing unchecked

 UNCHECKED = 1

 !else

 UNCHECKED = 0

 !endif

+

+!if [nmakehlp -f $(OPTS) "noconfigcheck"]

+CONFIG_CHECK = 1

+!else

+CONFIG_CHECK = 0

 !endif

 

-#----------------------------------------------------------

-# Figure-out how to name our intermediate and output directories.

-# We wouldn't want different builds to use the same .obj files

-# by accident.

-#----------------------------------------------------------

+!endif # "$(OPTS)" != ""  && ... parsing of OPTS

+

+# Set linker flags based on above

+

+!if $(PGO) > 1

+!if [nmakehlp -l -ltcg:pgoptimize $(LINKER_TESTFLAGS)]

+LINKERFLAGS	= $(LINKERFLAGS:-ltcg=) -ltcg:pgoptimize

+!else

+MSG=^

+This compiler does not support profile guided optimization.

+!error $(MSG)

+!endif

+!elseif $(PGO) > 0

+!if [nmakehlp -l -ltcg:pginstrument $(LINKER_TESTFLAGS)]

+LINKERFLAGS	= $(LINKERFLAGS:-ltcg=) -ltcg:pginstrument

+!else

+MSG=^

+This compiler does not support profile guided optimization.

+!error $(MSG)

+!endif

+!endif

+

+################################################################

+# 7. Parse the STATS macro to configure code instrumentation

+# The following macros are set by this section:

+# TCL_MEM_DEBUG - 1 -> enables memory allocation instrumentation

+#                 0 -> disables

+# TCL_COMPILE_DEBUG - 1 -> enables byte compiler logging

+#                     0 -> disables

+

+# Default both are off

+TCL_MEM_DEBUG	    = 0

+TCL_COMPILE_DEBUG   = 0

+

+!if "$(STATS)" != "" && ![nmakehlp -f "$(STATS)" "none"]

+

+!if [nmakehlp -f $(STATS) "memdbg"]

+!message *** Doing memdbg

+TCL_MEM_DEBUG	    = 1

+!else

+TCL_MEM_DEBUG	    = 0

+!endif

 

-#----------------------------------------

-# Naming convention:

+!if [nmakehlp -f $(STATS) "compdbg"]

+!message *** Doing compdbg

+TCL_COMPILE_DEBUG   = 1

+!else

+TCL_COMPILE_DEBUG   = 0

+!endif

+

+!endif

+

+####################################################################

+# 8. Parse the CHECKS macro to configure additional compiler checks

+# The following macros are set by this section:

+# WARNINGS - compiler switches that control the warnings level

+# TCL_NO_DEPRECATED - 1 -> disable support for deprecated functions

+#                     0 -> enable deprecated functions

+

+# Defaults - Permit deprecated functions and warning level 3

+TCL_NO_DEPRECATED	    = 0

+WARNINGS		    = -W3

+

+!if "$(CHECKS)" != "" && ![nmakehlp -f "$(CHECKS)" "none"]

+

+!if [nmakehlp -f $(CHECKS) "nodep"]

+!message *** Doing nodep check

+TCL_NO_DEPRECATED	    = 1

+!endif

+

+!if [nmakehlp -f $(CHECKS) "fullwarn"]

+!message *** Doing full warnings check

+WARNINGS		    = -W4

+!if [nmakehlp -l -warn:3 $(LINKER_TESTFLAGS)]

+LINKERFLAGS		    = $(LINKERFLAGS) -warn:3

+!endif

+!endif

+

+!if [nmakehlp -f $(CHECKS) "64bit"] && [nmakehlp -c -Wp64]

+!message *** Doing 64bit portability warnings

+WARNINGS		    = $(WARNINGS) -Wp64

+!endif

+

+!endif

+

+################################################################

+# 9. Extract various version numbers

+# For Tcl and Tk, version numbers are extracted from tcl.h and tk.h

+# respectively. For extensions, versions are extracted from the

+# configure.in or configure.ac from the TEA configuration if it

+# exists, and unset otherwise.

+# Sets the following macros:

+# TCL_MAJOR_VERSION

+# TCL_MINOR_VERSION

+# TCL_PATCH_LEVEL

+# TCL_VERSION

+# TK_MAJOR_VERSION

+# TK_MINOR_VERSION

+# TK_PATCH_LEVEL

+# TK_VERSION

+# DOTVERSION - set as (for example) 2.5

+# VERSION - set as (for example 25)

+#--------------------------------------------------------------

+

+!if [echo REM = This file is generated from rules.vc > versions.vc]

+!endif

+!if [echo TCL_MAJOR_VERSION = \>> versions.vc] \

+   && [nmakehlp -V "$(_TCL_H)" TCL_MAJOR_VERSION >> versions.vc]

+!endif

+!if [echo TCL_MINOR_VERSION = \>> versions.vc] \

+   && [nmakehlp -V "$(_TCL_H)" TCL_MINOR_VERSION >> versions.vc]

+!endif

+!if [echo TCL_PATCH_LEVEL = \>> versions.vc] \

+   && [nmakehlp -V "$(_TCL_H)" TCL_PATCH_LEVEL >> versions.vc]

+!endif

+

+!if defined(_TK_H)

+!if [echo TK_MAJOR_VERSION = \>> versions.vc] \

+   && [nmakehlp -V $(_TK_H) TK_MAJOR_VERSION >> versions.vc]

+!endif

+!if [echo TK_MINOR_VERSION = \>> versions.vc] \

+   && [nmakehlp -V $(_TK_H) TK_MINOR_VERSION >> versions.vc]

+!endif

+!if [echo TK_PATCH_LEVEL = \>> versions.vc] \

+   && [nmakehlp -V $(_TK_H) TK_PATCH_LEVEL >> versions.vc]

+!endif

+!endif # _TK_H

+

+!include versions.vc

+

+TCL_VERSION	= $(TCL_MAJOR_VERSION)$(TCL_MINOR_VERSION)

+TCL_DOTVERSION	= $(TCL_MAJOR_VERSION).$(TCL_MINOR_VERSION)

+!if defined(_TK_H)

+TK_VERSION	= $(TK_MAJOR_VERSION)$(TK_MINOR_VERSION)

+TK_DOTVERSION	= $(TK_MAJOR_VERSION).$(TK_MINOR_VERSION)

+!endif

+

+# Set DOTVERSION and VERSION

+!if $(DOING_TCL)

+

+DOTVERSION = $(TCL_MAJOR_VERSION).$(TCL_MINOR_VERSION)

+VERSION = $(TCL_VERSION)

+

+!elseif $(DOING_TK)

+

+DOTVERSION = $(TK_DOTVERSION)

+VERSION = $(TK_VERSION)

+

+!else # Doing a non-Tk extension

+

+# If parent makefile has not defined DOTVERSION, try to get it from TEA

+# first from a configure.in file, and then from configure.ac

+!ifndef DOTVERSION

+!if [echo DOTVERSION = \> versions.vc] \

+   || [nmakehlp -V $(ROOT)\configure.in ^[$(PROJECT)^] >> versions.vc]

+!if [echo DOTVERSION = \> versions.vc] \

+   || [nmakehlp -V $(ROOT)\configure.ac ^[$(PROJECT)^] >> versions.vc]

+!error *** Could not figure out extension version. Please define DOTVERSION in parent makefile before including rules.vc.

+!endif

+!endif

+!include versions.vc

+!endif # DOTVERSION

+VERSION         = $(DOTVERSION:.=)

+

+!endif # $(DOING_TCL) ... etc.

+

+################################################################

+# 10. Construct output directory and file paths

+# Figure-out how to name our intermediate and output directories.

+# In order to avoid inadvertent mixing of object files built using

+# different compilers, build configurations etc.,

+#

+# Naming convention (suffixes):

 #   t = full thread support.

-#   s = static library (as opposed to an

-#	import library)

-#   g = linked to the debug enabled C

-#	run-time.

-#   x = special static build when it

-#	links to the dynamic C run-time.

-#----------------------------------------

+#   s = static library (as opposed to an import library)

+#   g = linked to the debug enabled C run-time.

+#   x = special static build when it links to the dynamic C run-time.

+#

+# The following macros are set in this section:

+# SUFX - the suffix to use for binaries based on above naming convention

+# BUILDDIRTOP - the toplevel default output directory

+#      is of the form {Release,Debug}[_AMD64][_COMPILERVERSION]

+# TMP_DIR - directory where object files are created

+# OUT_DIR - directory where output executables are created

+# Both TMP_DIR and OUT_DIR are defaulted only if not defined by the

+# parent makefile (or command line). The default values are

+# based on BUILDDIRTOP.

+# STUBPREFIX - name of the stubs library for this project

+# PRJIMPLIB - output path of the generated project import library

+# PRJLIBNAME - name of generated project library

+# PRJLIB     - output path of generated project library

+# PRJSTUBLIBNAME - name of the generated project stubs library

+# PRJSTUBLIB - output path of the generated project stubs library

+# RESFILE - output resource file (only if not static build)

+

 SUFX	    = tsgx

 

 !if $(DEBUG)

@@ -381,80 +1046,185 @@ OUT_DIR	    = $(TMP_DIR)
 !endif

 !endif

 

-

-#----------------------------------------------------------

-# Decode the statistics requested.

-#----------------------------------------------------------

-

-!if "$(STATS)" == "" || [nmakehlp -f "$(STATS)" "none"]

-TCL_MEM_DEBUG	    = 0

-TCL_COMPILE_DEBUG   = 0

-!else

-!if [nmakehlp -f $(STATS) "memdbg"]

-!message *** Doing memdbg

-TCL_MEM_DEBUG	    = 1

-!else

-TCL_MEM_DEBUG	    = 0

-!endif

-!if [nmakehlp -f $(STATS) "compdbg"]

-!message *** Doing compdbg

-TCL_COMPILE_DEBUG   = 1

-!else

-TCL_COMPILE_DEBUG   = 0

+# Relative paths -> absolute

+!if [echo OUT_DIR = \> nmakehlp.out] \

+   || [nmakehlp -Q "$(OUT_DIR)" >> nmakehlp.out]

+!error *** Could not fully qualify path OUT_DIR=$(OUT_DIR)

 !endif

+!if [echo TMP_DIR = \>> nmakehlp.out] \

+   || [nmakehlp -Q "$(TMP_DIR)" >> nmakehlp.out]

+!error *** Could not fully qualify path TMP_DIR=$(TMP_DIR)

 !endif

+!include nmakehlp.out

 

+# The name of the stubs library for the project being built

+STUBPREFIX      = $(PROJECT)stub

 

-#----------------------------------------------------------

-# Decode the checks requested.

-#----------------------------------------------------------

+# Set up paths to various Tcl executables and libraries needed by extensions

+!if $(DOING_TCL)

 

-!if "$(CHECKS)" == "" || [nmakehlp -f "$(CHECKS)" "none"]

-TCL_NO_DEPRECATED	    = 0

-WARNINGS		    = -W3

-!else

-!if [nmakehlp -f $(CHECKS) "nodep"]

-!message *** Doing nodep check

-TCL_NO_DEPRECATED	    = 1

-!else

-TCL_NO_DEPRECATED	    = 0

-!endif

-!if [nmakehlp -f $(CHECKS) "fullwarn"]

-!message *** Doing full warnings check

-WARNINGS		    = -W4

-!if [nmakehlp -l -warn:3 $(LINKER_TESTFLAGS)]

-LINKERFLAGS		    = $(LINKERFLAGS) -warn:3

-!endif

-!else

-WARNINGS		    = -W3

-!endif

-!if [nmakehlp -f $(CHECKS) "64bit"] && [nmakehlp -c -Wp64]

-!message *** Doing 64bit portability warnings

-WARNINGS		    = $(WARNINGS) -Wp64

-!endif

+TCLSHNAME       = $(PROJECT)sh$(TCL_VERSION)$(SUFX).exe

+TCLSH		= $(OUT_DIR)\$(TCLSHNAME)

+TCLIMPLIB	= $(OUT_DIR)\$(PROJECT)$(VERSION)$(SUFX).lib

+TCLLIBNAME	= $(PROJECT)$(VERSION)$(SUFX).$(EXT)

+TCLLIB		= $(OUT_DIR)\$(TCLLIBNAME)

+

+TCLSTUBLIBNAME	= $(STUBPREFIX)$(VERSION).lib

+TCLSTUBLIB	= $(OUT_DIR)\$(TCLSTUBLIBNAME)

+TCL_INCLUDES    = -I"$(WINDIR)" -I"$(GENERICDIR)"

+

+!else # ! $(DOING_TCL)

+

+!if $(TCLINSTALL) # Building against an installed Tcl

+

+TCLSH		= $(_TCLDIR)\bin\tclsh$(TCL_VERSION)$(SUFX).exe

+!if !exist("$(TCLSH)") && $(TCL_THREADS)

+TCLSH           = $(_TCLDIR)\bin\tclsh$(TCL_VERSION)t$(SUFX).exe

 !endif

+TCLSTUBLIB	= $(_TCLDIR)\lib\tclstub$(TCL_VERSION).lib

+TCLIMPLIB	= $(_TCLDIR)\lib\tcl$(TCL_VERSION)$(SUFX).lib

+TCL_LIBRARY	= $(_TCLDIR)\lib

+TCLREGLIB	= $(_TCLDIR)\lib\tclreg13$(SUFX:t=).lib

+TCLDDELIB	= $(_TCLDIR)\lib\tcldde14$(SUFX:t=).lib

+TCLTOOLSDIR	= \must\have\tcl\sources\to\build\this\target

+TCL_INCLUDES    = -I"$(_TCLDIR)\include"

 

-!if $(PGO) > 1

-!if [nmakehlp -l -ltcg:pgoptimize $(LINKER_TESTFLAGS)]

-LINKERFLAGS	= $(LINKERFLAGS:-ltcg=) -ltcg:pgoptimize

-!else

-MSG=^

-This compiler does not support profile guided optimization.

-!error $(MSG)

+!else # Building against Tcl sources

+

+TCLSH		= $(_TCLDIR)\win\$(BUILDDIRTOP)\tclsh$(TCL_VERSION)$(SUFX).exe

+!if !exist($(TCLSH)) && $(TCL_THREADS)

+TCLSH		= $(_TCLDIR)\win\$(BUILDDIRTOP)\tclsh$(TCL_VERSION)t$(SUFX).exe

 !endif

-!elseif $(PGO) > 0

-!if [nmakehlp -l -ltcg:pginstrument $(LINKER_TESTFLAGS)]

-LINKERFLAGS	= $(LINKERFLAGS:-ltcg=) -ltcg:pginstrument

+TCLSTUBLIB	= $(_TCLDIR)\win\$(BUILDDIRTOP)\tclstub$(TCL_VERSION).lib

+TCLIMPLIB	= $(_TCLDIR)\win\$(BUILDDIRTOP)\tcl$(TCL_VERSION)$(SUFX).lib

+TCL_LIBRARY	= $(_TCLDIR)\library

+TCLREGLIB	= $(_TCLDIR)\win\$(BUILDDIRTOP)\tclreg13$(SUFX:t=).lib

+TCLDDELIB	= $(_TCLDIR)\win\$(BUILDDIRTOP)\tcldde14$(SUFX:t=).lib

+TCLTOOLSDIR	= $(_TCLDIR)\tools

+TCL_INCLUDES	= -I"$(_TCLDIR)\generic" -I"$(_TCLDIR)\win"

+

+!endif # TCLINSTALL

+

+tcllibs = "$(TCLSTUBLIB)" "$(TCLIMPLIB)"

+

+!endif # $(DOING_TCL)

+

+# We need a tclsh that will run on the host machine as part of the build.

+# IX86 runs on all architectures.

+!ifndef TCLSH_NATIVE

+!if "$(MACHINE)" == "IX86" || "$(MACHINE)" == "$(NATIVE_ARCH)"

+TCLSH_NATIVE	= $(TCLSH)

 !else

-MSG=^

-This compiler does not support profile guided optimization.

-!error $(MSG)

+!error You must explicitly set TCLSH_NATIVE for cross-compilation

 !endif

 !endif

 

-#----------------------------------------------------------

-# Set our defines now armed with our options.

-#----------------------------------------------------------

+# Do the same for Tk and Tk extensions that require the Tk libraries

+!if $(DOING_TK) || $(NEED_TK)

+WISHNAMEPREFIX = wish

+WISHNAME = $(WISHNAMEPREFIX)$(TK_VERSION)$(SUFX).exe

+TKLIBNAME	= $(PROJECT)$(TK_VERSION)$(SUFX).$(EXT)

+TKSTUBLIBNAME	= tkstub$(TK_VERSION).lib

+TKIMPLIBNAME	= tk$(TK_VERSION)$(SUFX).lib

+

+!if $(DOING_TK)

+WISH 		= $(OUT_DIR)\$(WISHNAME)

+TKSTUBLIB	= $(OUT_DIR)\$(TKSTUBLIBNAME)

+TKIMPLIB	= $(OUT_DIR)\$(TKIMPLIBNAME)

+TKLIB		= $(OUT_DIR)\$(TKLIBNAME)

+TK_INCLUDES    = -I"$(WINDIR)" -I"$(GENERICDIR)"

+

+!else # effectively NEED_TK

+

+!if $(TKINSTALL) # Building against installed Tk

+WISH		= $(_TKDIR)\bin\$(WISHNAME)

+TKSTUBLIB	= $(_TKDIR)\lib\$(TKSTUBLIBNAME)

+TKIMPLIB	= $(_TKDIR)\lib\$(TKIMPLIBNAME)

+TK_INCLUDES     = -I"$(_TKDIR)\include"

+!else # Building against Tk sources

+WISH		= $(_TKDIR)\win\$(BUILDDIRTOP)\$(WISHNAME)

+TKSTUBLIB	= $(_TKDIR)\win\$(BUILDDIRTOP)\$(TKSTUBLIBNAME)

+TKIMPLIB	= $(_TKDIR)\win\$(BUILDDIRTOP)\$(TKIMPLIBNAME)

+TK_INCLUDES     = -I"$(_TKDIR)\generic" -I"$(_TKDIR)\win" -I"$(_TKDIR)\xlib"

+!endif # TKINSTALL

+tklibs = "$(TKSTUBLIB)" "$(TKIMPLIB)"

+

+!endif # $(DOING_TK)

+!endif # $(DOING_TK) || $(NEED_TK)

+

+# Various output paths

+PRJIMPLIB	= $(OUT_DIR)\$(PROJECT)$(VERSION)$(SUFX).lib

+PRJLIBNAME	= $(PROJECT)$(VERSION)$(SUFX).$(EXT)

+PRJLIB		= $(OUT_DIR)\$(PRJLIBNAME)

+

+PRJSTUBLIBNAME	= $(STUBPREFIX)$(VERSION).lib

+PRJSTUBLIB	= $(OUT_DIR)\$(PRJSTUBLIBNAME)

+

+# If extension parent makefile has not defined a resource definition file,

+# we will generate one from standard template.

+!if !$(DOING_TCL) && !$(DOING_TK) && !$(STATIC_BUILD)

+!ifdef RCFILE

+RESFILE = $(TMP_DIR)\$(RCFILE:.rc=.res)

+!else

+RESFILE = $(TMP_DIR)\$(PROJECT).res

+!endif

+!endif

+

+###################################################################

+# 11. Construct the paths for the installation directories

+# The following macros get defined in this section:

+# LIB_INSTALL_DIR - where libraries should be installed

+# BIN_INSTALL_DIR - where the executables should be installed

+# DOC_INSTALL_DIR - where documentation should be installed

+# SCRIPT_INSTALL_DIR - where scripts should be installed

+# INCLUDE_INSTALL_DIR - where C include files should be installed

+# DEMO_INSTALL_DIR - where demos should be installed

+# PRJ_INSTALL_DIR - where package will be installed (not set for tcl and tk)

+

+!if $(DOING_TCL) || $(DOING_TK)

+LIB_INSTALL_DIR		= $(_INSTALLDIR)\lib

+BIN_INSTALL_DIR		= $(_INSTALLDIR)\bin

+DOC_INSTALL_DIR		= $(_INSTALLDIR)\doc

+!if $(DOING_TCL)

+SCRIPT_INSTALL_DIR	= $(_INSTALLDIR)\lib\$(PROJECT)$(TCL_MAJOR_VERSION).$(TCL_MINOR_VERSION)

+!else # DOING_TK

+SCRIPT_INSTALL_DIR	= $(_INSTALLDIR)\lib\$(PROJECT)$(TK_MAJOR_VERSION).$(TK_MINOR_VERSION)

+!endif

+DEMO_INSTALL_DIR	= $(SCRIPT_INSTALL_DIR)\demos

+INCLUDE_INSTALL_DIR	= $(_INSTALLDIR)\include

+

+!else # extension other than Tk

+

+PRJ_INSTALL_DIR         = $(_INSTALLDIR)\$(PROJECT)$(DOTVERSION)

+LIB_INSTALL_DIR		= $(PRJ_INSTALL_DIR)

+BIN_INSTALL_DIR		= $(PRJ_INSTALL_DIR)

+DOC_INSTALL_DIR		= $(PRJ_INSTALL_DIR)

+SCRIPT_INSTALL_DIR	= $(PRJ_INSTALL_DIR)

+DEMO_INSTALL_DIR	= $(PRJ_INSTALL_DIR)\demos

+INCLUDE_INSTALL_DIR	= $(_TCLDIR)\include

+

+!endif

+

+###################################################################

+# 12. Set up actual options to be passed to the compiler and linker

+# Now we have all the information we need, set up the actual flags and

+# options that we will pass to the compiler and linker. The main

+# makefile should use these in combination with whatever other flags

+# and switches are specific to it.

+# The following macros are defined, names are for historical compatibility:

+# OPTDEFINES - /Dxxx C macro flags based on user-specified OPTS

+# COMPILERFLAGS - /Dxxx C macro flags independent of any configuration opttions

+# crt - Compiler switch that selects the appropriate C runtime

+# cdebug - Compiler switches related to debug AND optimizations

+# cwarn - Compiler switches that set warning levels

+# cflags - complete compiler switches (subsumes cdebug and cwarn)

+# ldebug - Linker switches controlling debug information and optimization

+# lflags - complete linker switches (subsumes ldebug) except subsystem type

+# dlllflags - complete linker switches to build DLLs (subsumes lflags)

+# conlflags - complete linker switches for console program (subsumes lflags)

+# guilflags - complete linker switches for GUI program (subsumes lflags)

+# baselibs - minimum Windows libraries required. Parent makefile can

+#    define PRJ_LIBS before including rules.rc if additional libs are needed

 

 OPTDEFINES	= -DTCL_CFGVAL_ENCODING=$(CFG_ENCODING) -DSTDC_HEADERS

 

@@ -477,6 +1247,17 @@ OPTDEFINES	= $(OPTDEFINES) -DSTATIC_BUILD
 OPTDEFINES	= $(OPTDEFINES) -DTCL_NO_DEPRECATED

 !endif

 

+!if $(USE_STUBS)

+# Note we do not define USE_TCL_STUBS even when building tk since some

+# test targets in tk do not use stubs

+!if ! $(DOING_TCL)

+USE_STUBS_DEFS  = -DUSE_TCL_STUBS -DUSE_TCLOO_STUBS

+!if $(NEED_TK)

+USE_STUBS_DEFS  = $(USE_STUBS_DEFS) -DUSE_TK_STUBS

+!endif

+!endif

+!endif # USE_STUBS

+

 !if !$(DEBUG)

 OPTDEFINES	= $(OPTDEFINES) -DNDEBUG

 !if $(OPTIMIZING)

@@ -486,223 +1267,457 @@ OPTDEFINES	= $(OPTDEFINES) -DTCL_CFG_OPTIMIZED
 !if $(PROFILE)

 OPTDEFINES	= $(OPTDEFINES) -DTCL_CFG_PROFILED

 !endif

-!if "$(MACHINE)" == "IA64" || "$(MACHINE)" == "AMD64"

+!if "$(MACHINE)" == "AMD64"

 OPTDEFINES	= $(OPTDEFINES) -DTCL_CFG_DO64BIT

 !endif

 !if $(VCVERSION) < 1300

 OPTDEFINES	= $(OPTDEFINES) -DNO_STRTOI64

 !endif

 

-#----------------------------------------------------------

-# Locate the Tcl headers to build against

-#----------------------------------------------------------

-

-!if "$(PROJECT)" == "tcl"

-

-_TCL_H          = ..\generic\tcl.h

+# _ATL_XP_TARGETING - Newer SDK's need this to build for XP

+COMPILERFLAGS  = /D_ATL_XP_TARGETING

 

+# Following is primarily for the benefit of extensions. Tcl 8.5 builds

+# Tcl without /DUNICODE, while 8.6 builds with it defined. When building

+# an extension, it is advisable (but not mandated) to use the same Windows

+# API as the Tcl build. This is accordingly defaulted below. A particular

+# extension can override this by pre-definining USE_WIDECHAR_API.

+!ifndef USE_WIDECHAR_API

+!if $(TCL_VERSION) > 85

+USE_WIDECHAR_API = 1

 !else

+USE_WIDECHAR_API = 0

+!endif

+!endif

 

-# If INSTALLDIR set to tcl root dir then reset to the lib dir.

-!if exist("$(_INSTALLDIR)\include\tcl.h")

-_INSTALLDIR=$(_INSTALLDIR)\lib

+!if $(USE_WIDECHAR_API)

+COMPILERFLAGS = $(COMPILERFLAGS) /DUNICODE /D_UNICODE 

 !endif

 

-!if !defined(TCLDIR)

-!if exist("$(_INSTALLDIR)\..\include\tcl.h")

-TCLINSTALL	= 1

-_TCLDIR		= $(_INSTALLDIR)\..

-_TCL_H          = $(_INSTALLDIR)\..\include\tcl.h

-TCLDIR          = $(_INSTALLDIR)\..

+# Like the TEA system only set this non empty for non-Tk extensions

+# Note: some extensions use PACKAGE_NAME and others use PACKAGE_TCLNAME

+# so we pass both

+!if !$(DOING_TCL) && !$(DOING_TK)

+PKGNAMEFLAGS = -DPACKAGE_NAME="\"$(PRJ_PACKAGE_TCLNAME)\"" \

+               -DPACKAGE_TCLNAME="\"$(PRJ_PACKAGE_TCLNAME)\"" \

+               -DPACKAGE_VERSION="\"$(DOTVERSION)\"" \

+               -DMODULE_SCOPE=extern 

+!endif

+

+# crt picks the C run time based on selected OPTS

+!if $(MSVCRT)

+!if $(DEBUG) && !$(UNCHECKED)

+crt = -MDd

 !else

-MSG=^

-Failed to find tcl.h.  Set the TCLDIR macro.

-!error $(MSG)

+crt = -MD

 !endif

 !else

-_TCLDIR	= $(TCLDIR:/=\)

-!if exist("$(_TCLDIR)\include\tcl.h")

-TCLINSTALL	= 1

-_TCL_H          = $(_TCLDIR)\include\tcl.h

-!elseif exist("$(_TCLDIR)\generic\tcl.h")

-TCLINSTALL	= 0

-_TCL_H          = $(_TCLDIR)\generic\tcl.h

+!if $(DEBUG) && !$(UNCHECKED)

+crt = -MTd

 !else

-MSG =^

-Failed to find tcl.h.  The TCLDIR macro does not appear correct.

-!error $(MSG)

-!endif

+crt = -MT

 !endif

 !endif

 

-#--------------------------------------------------------------

-# Extract various version numbers from tcl headers

-# The generated file is then included in the makefile.

-#--------------------------------------------------------------

+# cdebug includes compiler options for debugging as well as optimization.

+!if $(DEBUG)

 

-!if [echo REM = This file is generated from rules.vc > versions.vc]

-!endif

-!if [echo TCL_MAJOR_VERSION = \>> versions.vc] \

-   && [nmakehlp -V "$(_TCL_H)" TCL_MAJOR_VERSION >> versions.vc]

+# In debugging mode, optimizations need to be disabled

+cdebug = -Zi -Od $(DEBUGFLAGS)

+

+!else

+

+cdebug = $(OPTIMIZATIONS)

+!if $(SYMBOLS)

+cdebug = $(cdebug) -Zi

 !endif

-!if [echo TCL_MINOR_VERSION = \>> versions.vc] \

-   && [nmakehlp -V "$(_TCL_H)" TCL_MINOR_VERSION >> versions.vc]

+

+!endif # $(DEBUG)

+

+# cwarn includes default warning levels.

+cwarn = $(WARNINGS)

+

+!if "$(MACHINE)" == "AMD64"

+# Disable pointer<->int warnings related to cast between different sizes

+# There are a gadzillion of these due to use of ClientData and

+# clutter up compiler

+# output increasing chance of a real warning getting lost. So disable them.

+# Eventually some day, Tcl will be 64-bit clean.

+cwarn = $(cwarn) -wd4311 -wd4312

 !endif

-!if [echo TCL_PATCH_LEVEL = \>> versions.vc] \

-   && [nmakehlp -V "$(_TCL_H)" TCL_PATCH_LEVEL >> versions.vc]

+

+### Common compiler options that are architecture specific

+!if "$(MACHINE)" == "ARM"

+carch = -D_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE

+!else

+carch =

 !endif

 

-# If building the tcl core then we need additional package versions

-!if "$(PROJECT)" == "tcl"

-!if [echo PKG_HTTP_VER = \>> versions.vc] \

-   && [nmakehlp -V ..\library\http\pkgIndex.tcl http >> versions.vc]

+!if $(DEBUG)

+# Turn warnings into errors

+cwarn = $(cwarn) -WX

 !endif

-!if [echo PKG_TCLTEST_VER = \>> versions.vc] \

-   && [nmakehlp -V ..\library\tcltest\pkgIndex.tcl tcltest >> versions.vc]

+

+INCLUDES = $(TCL_INCLUDES) $(TK_INCLUDES) $(PRJ_INCLUDES)

+!if !$(DOING_TCL) && !$(DOING_TK)

+INCLUDES = $(INCLUDES) -I"$(GENERICDIR)" -I"$(WINDIR)" -I"$(COMPATDIR)"

 !endif

-!if [echo PKG_MSGCAT_VER = \>> versions.vc] \

-   && [nmakehlp -V ..\library\msgcat\pkgIndex.tcl msgcat >> versions.vc]

+

+# These flags are defined roughly in the order of the pre-reform

+# rules.vc/makefile.vc to help visually compare that the pre- and

+# post-reform build logs

+

+# cflags contains generic flags used for building practically all object files

+cflags = -nologo -c $(COMPILERFLAGS) $(carch) $(cwarn) -Fp$(TMP_DIR)^\ $(cdebug)

+

+# appcflags contains $(cflags) and flags for building the application

+# object files (e.g. tclsh, or wish) pkgcflags contains $(cflags) plus

+# flags used for building shared object files The two differ in the

+# BUILD_$(PROJECT) macro which should be defined only for the shared

+# library *implementation* and not for its caller interface

+

+appcflags = $(cflags) $(crt) $(INCLUDES) $(TCL_DEFINES) $(PRJ_DEFINES) $(OPTDEFINES) $(USE_STUBS_DEFS)

+appcflags_nostubs = $(cflags) $(crt) $(INCLUDES) $(TCL_DEFINES) $(PRJ_DEFINES) $(OPTDEFINES)

+pkgcflags = $(appcflags) $(PKGNAMEFLAGS) -DBUILD_$(PROJECT)

+pkgcflags_nostubs = $(appcflags_nostubs) $(PKGNAMEFLAGS) -DBUILD_$(PROJECT)

+

+# stubscflags contains $(cflags) plus flags used for building a stubs

+# library for the package.  Note: -DSTATIC_BUILD is defined in

+# $(OPTDEFINES) only if the OPTS configuration indicates a static

+# library. However the stubs library is ALWAYS static hence included

+# here irrespective of the OPTS setting.

+#

+# TBD - tclvfs has a comment that stubs libs should not be compiled with -GL

+# without stating why. Tcl itself compiled stubs libs with this flag.

+# so we do not remove it from cflags. -GL may prevent extensions

+# compiled with one VC version to fail to link against stubs library

+# compiled with another VC version. Check for this and fix accordingly.

+stubscflags = $(cflags) $(PKGNAMEFLAGS) $(PRJ_DEFINES) $(OPTDEFINES) -Zl -DSTATIC_BUILD $(INCLUDES)

+

+# Link flags 

+

+!if $(DEBUG)

+ldebug	= -debug -debugtype:cv

+!else

+ldebug	= -release -opt:ref -opt:icf,3

+!if $(SYMBOLS)

+ldebug	= $(ldebug) -debug -debugtype:cv

 !endif

-!if [echo PKG_PLATFORM_VER = \>> versions.vc] \

-   && [nmakehlp -V ..\library\platform\pkgIndex.tcl "platform " >> versions.vc]

 !endif

-!if [echo PKG_SHELL_VER = \>> versions.vc] \

-   && [nmakehlp -V ..\library\platform\pkgIndex.tcl "platform::shell" >> versions.vc]

+

+# Note: Profiling is currently only possible with the Visual Studio Enterprise

+!if $(PROFILE)

+ldebug= $(ldebug) -profile

 !endif

-!if [echo PKG_DDE_VER = \>> versions.vc] \

-   && [nmakehlp -V ..\library\dde\pkgIndex.tcl "dde " >> versions.vc]

+

+### Declarations common to all linker versions 

+lflags	= -nologo -machine:$(MACHINE) $(LINKERFLAGS) $(ldebug)

+

+!if $(MSVCRT) && !($(DEBUG) && !$(UNCHECKED)) && $(VCVERSION) >= 1900

+lflags	= $(lflags) -nodefaultlib:libucrt.lib

 !endif

-!if [echo PKG_REG_VER =\>> versions.vc] \

-   && [nmakehlp -V ..\library\reg\pkgIndex.tcl registry >> versions.vc]

+

+# Old linkers (Visual C++ 6 in particular) will link for fast loading

+# on Win98. Since we do not support Win98 any more, we specify nowin98

+# as recommended for NT and later. However, this is only required by

+# IX86 on older compilers and only needed if we are not doing a static build.

+

+!if "$(MACHINE)" == "IX86" && !$(STATIC_BUILD)

+!if [nmakehlp -l -opt:nowin98 $(LINKER_TESTFLAGS)]

+# Align sections for PE size savings.

+lflags	= $(lflags) -opt:nowin98

 !endif

 !endif

 

-!include versions.vc

-

-#--------------------------------------------------------------

-# Setup tcl version dependent stuff headers

-#--------------------------------------------------------------

+dlllflags = $(lflags) -dll

+conlflags = $(lflags) -subsystem:console

+guilflags = $(lflags) -subsystem:windows

 

-!if "$(PROJECT)" != "tcl"

+# Libraries that are required for every image.

+# Extensions should define any additional libraries with $(PRJ_LIBS)

+winlibs   = kernel32.lib advapi32.lib

 

-TCL_VERSION	= $(TCL_MAJOR_VERSION)$(TCL_MINOR_VERSION)

+!if $(NEED_TK)

+winlibs = $(winlibs) gdi32.lib user32.lib uxtheme.lib

+!endif

 

-!if $(TCLINSTALL)

-TCLSH		= "$(_TCLDIR)\bin\tclsh$(TCL_VERSION)$(SUFX).exe"

-!if !exist($(TCLSH)) && $(TCL_THREADS)

-TCLSH           = "$(_TCLDIR)\bin\tclsh$(TCL_VERSION)t$(SUFX).exe"

+# Avoid 'unresolved external symbol __security_cookie' errors.

+# c.f. http://support.microsoft.com/?id=894573

+!if "$(MACHINE)" == "AMD64"

+!if $(VCVERSION) > 1399 && $(VCVERSION) < 1500

+winlibs   = $(winlibs) bufferoverflowU.lib

 !endif

-TCLSTUBLIB	= "$(_TCLDIR)\lib\tclstub$(TCL_VERSION).lib"

-TCLIMPLIB	= "$(_TCLDIR)\lib\tcl$(TCL_VERSION)$(SUFX).lib"

-TCL_LIBRARY	= $(_TCLDIR)\lib

-TCLREGLIB	= "$(_TCLDIR)\lib\tclreg13$(SUFX:t=).lib"

-TCLDDELIB	= "$(_TCLDIR)\lib\tcldde14$(SUFX:t=).lib"

-COFFBASE	= \must\have\tcl\sources\to\build\this\target

-TCLTOOLSDIR	= \must\have\tcl\sources\to\build\this\target

-TCL_INCLUDES    = -I"$(_TCLDIR)\include"

-!else

-TCLSH		= "$(_TCLDIR)\win\$(BUILDDIRTOP)\tclsh$(TCL_VERSION)$(SUFX).exe"

-!if !exist($(TCLSH)) && $(TCL_THREADS)

-TCLSH		= "$(_TCLDIR)\win\$(BUILDDIRTOP)\tclsh$(TCL_VERSION)t$(SUFX).exe"

-!endif

-TCLSTUBLIB	= "$(_TCLDIR)\win\$(BUILDDIRTOP)\tclstub$(TCL_VERSION).lib"

-TCLIMPLIB	= "$(_TCLDIR)\win\$(BUILDDIRTOP)\tcl$(TCL_VERSION)$(SUFX).lib"

-TCL_LIBRARY	= $(_TCLDIR)\library

-TCLREGLIB	= "$(_TCLDIR)\win\$(BUILDDIRTOP)\tclreg13$(SUFX:t=).lib"

-TCLDDELIB	= "$(_TCLDIR)\win\$(BUILDDIRTOP)\tcldde14$(SUFX:t=).lib"

-COFFBASE	= "$(_TCLDIR)\win\coffbase.txt"

-TCLTOOLSDIR	= $(_TCLDIR)\tools

-TCL_INCLUDES	= -I"$(_TCLDIR)\generic" -I"$(_TCLDIR)\win"

 !endif

 

+baselibs = $(winlibs) $(PRJ_LIBS)

+

+!if $(MSVCRT) && !($(DEBUG) && !$(UNCHECKED)) && $(VCVERSION) >= 1900

+baselibs   = $(baselibs) ucrt.lib

 !endif

 

-#-------------------------------------------------------------------------

-# Locate the Tk headers to build against

-#-------------------------------------------------------------------------

+################################################################

+# 13. Define standard commands, common make targets and implicit rules

 

-!if "$(PROJECT)" == "tk"

-_TK_H          = ..\generic\tk.h

-_INSTALLDIR    = $(_INSTALLDIR)\..

-!endif

+CCPKGCMD = $(cc32) $(pkgcflags) -Fo$(TMP_DIR)^\

+CCAPPCMD = $(cc32) $(appcflags) -Fo$(TMP_DIR)^\

+CCSTUBSCMD = $(cc32) $(stubscflags) -Fo$(TMP_DIR)^\

 

-!ifdef PROJECT_REQUIRES_TK

-!if !defined(TKDIR)

-!if exist("$(_INSTALLDIR)\..\include\tk.h")

-TKINSTALL      = 1

-_TKDIR         = $(_INSTALLDIR)\..

-_TK_H          = $(_TKDIR)\include\tk.h

-TKDIR          = $(_TKDIR)

-!elseif exist("$(_TCLDIR)\include\tk.h")

-TKINSTALL      = 1

-_TKDIR         = $(_TCLDIR)

-_TK_H          = $(_TKDIR)\include\tk.h

-TKDIR          = $(_TKDIR)

+LIBCMD = $(lib32) -nologo $(LINKERFLAGS) -out:$@

+DLLCMD = $(link32) $(dlllflags) -out:$@ $(baselibs) $(tcllibs) $(tklibs)

+

+CONEXECMD = $(link32) $(conlflags) -out:$@ $(baselibs) $(tcllibs) $(tklibs)

+GUIEXECMD = $(link32) $(guilflags) -out:$@ $(baselibs) $(tcllibs) $(tklibs)

+RESCMD  = $(rc32) -fo $@ -r -i "$(GENERICDIR)" -i "$(TMP_DIR)" \

+	    $(TCL_INCLUDES) \

+	    -DDEBUG=$(DEBUG) -d UNCHECKED=$(UNCHECKED) \

+	    -DCOMMAVERSION=$(DOTVERSION:.=,),0 \

+	    -DDOTVERSION=\"$(DOTVERSION)\" \

+	    -DVERSION=\"$(VERSION)\" \

+	    -DSUFX=\"$(SUFX)\" \

+            -DPROJECT=\"$(PROJECT)\" \

+            -DPRJLIBNAME=\"$(PRJLIBNAME)\" 

+

+!ifndef DEFAULT_BUILD_TARGET

+DEFAULT_BUILD_TARGET = $(PROJECT)

 !endif

+

+default-target: $(DEFAULT_BUILD_TARGET)

+

+default-pkgindex:

+	@echo package ifneeded $(PRJ_PACKAGE_TCLNAME) $(DOTVERSION) \

+	    [list load [file join $$dir $(PRJLIBNAME)]] > $(OUT_DIR)\pkgIndex.tcl

+

+default-pkgindex-tea:

+	@if exist $(ROOT)\pkgIndex.tcl.in nmakehlp -s << $(ROOT)\pkgIndex.tcl.in > $(OUT_DIR)\pkgIndex.tcl

+@PACKAGE_VERSION@    $(DOTVERSION)

+@PACKAGE_NAME@       $(PRJ_PACKAGE_TCLNAME)

+@PACKAGE_TCLNAME@    $(PRJ_PACKAGE_TCLNAME)

+@PKG_LIB_FILE@       $(PRJLIBNAME)

+<<

+

+

+default-install: default-install-binaries default-install-libraries

+

+default-install-binaries: $(PRJLIB)

+	@echo Installing binaries to '$(SCRIPT_INSTALL_DIR)'

+	@if not exist "$(SCRIPT_INSTALL_DIR)" mkdir "$(SCRIPT_INSTALL_DIR)"

+	@$(CPY) $(PRJLIB) "$(SCRIPT_INSTALL_DIR)" >NUL

+

+default-install-libraries: $(OUT_DIR)\pkgIndex.tcl

+	@echo Installing libraries to '$(SCRIPT_INSTALL_DIR)'

+	@if exist $(LIBDIR) $(CPY) $(LIBDIR)\*.tcl "$(SCRIPT_INSTALL_DIR)"

+	@echo Installing package index in '$(SCRIPT_INSTALL_DIR)'

+	@$(CPY) $(OUT_DIR)\pkgIndex.tcl $(SCRIPT_INSTALL_DIR)

+

+default-install-stubs:

+	@echo Installing stubs library to '$(SCRIPT_INSTALL_DIR)'

+	@if not exist "$(SCRIPT_INSTALL_DIR)" mkdir "$(SCRIPT_INSTALL_DIR)"

+	@$(CPY) $(PRJSTUBLIB) "$(SCRIPT_INSTALL_DIR)" >NUL

+

+default-install-docs-html:

+	@echo Installing documentation files to '$(DOC_INSTALL_DIR)'

+	@if not exist "$(DOC_INSTALL_DIR)" mkdir "$(DOC_INSTALL_DIR)"

+	@if exist $(DOCDIR) for %f in ("$(DOCDIR)\*.html" "$(DOCDIR)\*.css" "$(DOCDIR)\*.png") do @$(COPY) %f "$(DOC_INSTALL_DIR)"

+

+default-install-docs-n:

+	@echo Installing documentation files to '$(DOC_INSTALL_DIR)'

+	@if not exist "$(DOC_INSTALL_DIR)" mkdir "$(DOC_INSTALL_DIR)"

+	@if exist $(DOCDIR) for %f in ("$(DOCDIR)\*.n") do @$(COPY) %f "$(DOC_INSTALL_DIR)"

+

+default-install-demos:

+	@echo Installing demos to '$(DEMO_INSTALL_DIR)'

+	@if not exist "$(DEMO_INSTALL_DIR)" mkdir "$(DEMO_INSTALL_DIR)"

+	@if exist $(DEMODIR) $(CPYDIR) "$(DEMODIR)" "$(DEMO_INSTALL_DIR)"

+

+default-clean:

+	@echo Cleaning $(TMP_DIR)\* ...

+	@if exist $(TMP_DIR)\nul $(RMDIR) $(TMP_DIR)

+	@echo Cleaning $(WINDIR)\nmakehlp.obj, nmakehlp.exe ...

+	@if exist $(WINDIR)\nmakehlp.obj del $(WINDIR)\nmakehlp.obj

+	@if exist $(WINDIR)\nmakehlp.exe del $(WINDIR)\nmakehlp.exe

+	@if exist $(WINDIR)\nmakehlp.out del $(WINDIR)\nmakehlp.out

+	@echo Cleaning $(WINDIR)\nmhlp-out.txt ...

+	@if exist $(WINDIR)\nmhlp-out.txt del $(WINDIR)\nmhlp-out.txt

+	@echo Cleaning $(WINDIR)\_junk.pch ...

+	@if exist $(WINDIR)\_junk.pch del $(WINDIR)\_junk.pch

+	@echo Cleaning $(WINDIR)\vercl.x, vercl.i ...

+	@if exist $(WINDIR)\vercl.x del $(WINDIR)\vercl.x

+	@if exist $(WINDIR)\vercl.i del $(WINDIR)\vercl.i

+	@echo Cleaning $(WINDIR)\versions.vc, version.vc ...

+	@if exist $(WINDIR)\versions.vc del $(WINDIR)\versions.vc

+	@if exist $(WINDIR)\version.vc del $(WINDIR)\version.vc

+

+default-hose: default-clean

+	@echo Hosing $(OUT_DIR)\* ...

+	@if exist $(OUT_DIR)\nul $(RMDIR) $(OUT_DIR)

+

+# Only for backward compatibility

+default-distclean: default-hose

+

+default-setup:

+	@if not exist $(OUT_DIR)\nul mkdir $(OUT_DIR)

+	@if not exist $(TMP_DIR)\nul mkdir $(TMP_DIR)

+

+!if "$(TESTPAT)" != ""

+TESTFLAGS = $(TESTFLAGS) -file $(TESTPAT)

+!endif

+

+default-test: default-setup $(PROJECT)

+	@set TCLLIBPATH=$(OUT_DIR:\=/)

+	@if exist $(LIBDIR) for %f in ("$(LIBDIR)\*.tcl") do @$(COPY) %f "$(OUT_DIR)"

+	cd "$(TESTDIR)" && $(DEBUGGER) $(TCLSH) all.tcl $(TESTFLAGS)

+

+default-shell: default-setup $(PROJECT)

+	@set TCLLIBPATH=$(OUT_DIR:\=/)

+	@if exist $(LIBDIR) for %f in ("$(LIBDIR)\*.tcl") do @$(COPY) %f "$(OUT_DIR)"

+	$(DEBUGGER) $(TCLSH)

+

+# Generation of Windows version resource 

+!ifdef RCFILE

+

+# Note: don't use $** in below rule because there may be other dependencies

+# and only the "master" rc must be passed to the resource compiler

+$(TMP_DIR)\$(PROJECT).res: $(RCDIR)\$(PROJECT).rc

+	$(RESCMD) $(RCDIR)\$(PROJECT).rc

+

 !else

-_TKDIR = $(TKDIR:/=\)

-!if exist("$(_TKDIR)\include\tk.h")

-TKINSTALL      = 1

-_TK_H          = $(_TKDIR)\include\tk.h

-!elseif exist("$(_TKDIR)\generic\tk.h")

-TKINSTALL      = 0

-_TK_H          = $(_TKDIR)\generic\tk.h

-!else

-MSG =^

-Failed to find tk.h. The TKDIR macro does not appear correct.

-!error $(MSG)

-!endif

-!endif

+

+# If parent makefile has not defined a resource definition file,

+# we will generate one from standard template.

+$(TMP_DIR)\$(PROJECT).res: $(TMP_DIR)\$(PROJECT).rc

+

+$(TMP_DIR)\$(PROJECT).rc:

+	@$(COPY) << $(TMP_DIR)\$(PROJECT).rc

+#include <winver.h>

+

+VS_VERSION_INFO VERSIONINFO

+ FILEVERSION	COMMAVERSION

+ PRODUCTVERSION	COMMAVERSION

+ FILEFLAGSMASK	0x3fL

+#ifdef DEBUG

+ FILEFLAGS	VS_FF_DEBUG

+#else

+ FILEFLAGS	0x0L

+#endif

+ FILEOS		VOS_NT_WINDOWS32

+ FILETYPE	VFT_DLL

+ FILESUBTYPE	0x0L

+BEGIN

+    BLOCK "StringFileInfo"

+    BEGIN

+        BLOCK "040904b0"

+        BEGIN

+            VALUE "FileDescription",  "Tcl extension " PROJECT

+            VALUE "OriginalFilename", PRJLIBNAME

+            VALUE "FileVersion",      DOTVERSION

+            VALUE "ProductName",      "Package " PROJECT " for Tcl"

+            VALUE "ProductVersion",   DOTVERSION 

+        END

+    END

+    BLOCK "VarFileInfo"

+    BEGIN

+        VALUE "Translation", 0x409, 1200

+    END

+END

+

+<<

+

+!endif # ifdef RCFILE

+

+!ifndef DISABLE_IMPLICIT_RULES

+DISABLE_IMPLICIT_RULES = 0

 !endif

 

-#-------------------------------------------------------------------------

-# Extract Tk version numbers

-#-------------------------------------------------------------------------

+!if !$(DISABLE_IMPLICIT_RULES)

+# Implicit rule definitions - only for building library objects. For stubs and

+# main application, the master makefile should define explicit rules.

 

-!if defined(PROJECT_REQUIRES_TK) || "$(PROJECT)" == "tk"

+{$(ROOT)}.c{$(TMP_DIR)}.obj::

+	$(CCPKGCMD) @<<

+$<

+<<

+

+{$(WINDIR)}.c{$(TMP_DIR)}.obj::

+	$(CCPKGCMD) @<<

+$<

+<<

+

+{$(GENERICDIR)}.c{$(TMP_DIR)}.obj::

+	$(CCPKGCMD) @<<

+$<

+<<

+

+{$(COMPATDIR)}.c{$(TMP_DIR)}.obj::

+	$(CCPKGCMD) @<<

+$<

+<<

+

+{$(RCDIR)}.rc{$(TMP_DIR)}.res:

+	$(RESCMD) $<

+

+{$(WINDIR)}.rc{$(TMP_DIR)}.res:

+	$(RESCMD) $<

+

+{$(TMP_DIR)}.rc{$(TMP_DIR)}.res:

+	$(RESCMD) $<

+

+.SUFFIXES:

+.SUFFIXES:.c .rc

 

-!if [echo TK_MAJOR_VERSION = \>> versions.vc] \

-   && [nmakehlp -V $(_TK_H) TK_MAJOR_VERSION >> versions.vc]

 !endif

-!if [echo TK_MINOR_VERSION = \>> versions.vc] \

-   && [nmakehlp -V $(_TK_H) TK_MINOR_VERSION >> versions.vc]

+

+################################################################

+# 14. Sanity check selected options against Tcl build options

+# When building an extension, certain configuration options should

+# match the ones used when Tcl was built. Here we check and

+# warn on a mismatch.

+!if ! $(DOING_TCL)

+

+!if $(TCLINSTALL) # Building against an installed Tcl

+!if exist("$(_TCLDIR)\lib\nmake\tcl.nmake")

+TCLNMAKECONFIG = "$(_TCLDIR)\lib\nmake\tcl.nmake"

 !endif

-!if [echo TK_PATCH_LEVEL = \>> versions.vc] \

-   && [nmakehlp -V $(_TK_H) TK_PATCH_LEVEL >> versions.vc]

+!else # ! $(TCLINSTALL) - building against Tcl source

+!if exist("$(OUT_DIR)\tcl.nmake")

+TCLNMAKECONFIG = "$(OUT_DIR)\tcl.nmake"

 !endif

+!endif # TCLINSTALL

 

-!include versions.vc

+!if $(CONFIG_CHECK)

+!ifdef TCLNMAKECONFIG

+!include $(TCLNMAKECONFIG)

 

-TK_DOTVERSION	= $(TK_MAJOR_VERSION).$(TK_MINOR_VERSION)

-TK_VERSION	= $(TK_MAJOR_VERSION)$(TK_MINOR_VERSION)

-

-!if "$(PROJECT)" != "tk"

-!if $(TKINSTALL)

-WISH		= "$(_TKDIR)\bin\wish$(TK_VERSION)$(SUFX).exe"

-TKSTUBLIB	= "$(_TKDIR)\lib\tkstub$(TK_VERSION).lib"

-TKIMPLIB	= "$(_TKDIR)\lib\tk$(TK_VERSION)$(SUFX).lib"

-TK_INCLUDES     = -I"$(_TKDIR)\include"

-!else

-WISH		= "$(_TKDIR)\win\$(BUILDDIRTOP)\wish$(TCL_VERSION)$(SUFX).exe"

-TKSTUBLIB	= "$(_TKDIR)\win\$(BUILDDIRTOP)\tkstub$(TCL_VERSION).lib"

-TKIMPLIB	= "$(_TKDIR)\win\$(BUILDDIRTOP)\tk$(TCL_VERSION)$(SUFX).lib"

-TK_INCLUDES     = -I"$(_TKDIR)\generic" -I"$(_TKDIR)\win" -I"$(_TKDIR)\xlib"

+!if defined(CORE_MACHINE) && "$(CORE_MACHINE)" != "$(MACHINE)"

+!error ERROR: Build target ($(MACHINE)) does not match the Tcl library architecture ($(CORE_MACHINE)).

 !endif

+!if defined(CORE_USE_THREAD_ALLOC) && $(CORE_USE_THREAD_ALLOC) != $(USE_THREAD_ALLOC)

+!message WARNING: Value of USE_THREAD_ALLOC ($(USE_THREAD_ALLOC)) does not match its Tcl core value ($(CORE_USE_THREAD_ALLOC)).

+!endif

+!if defined(CORE_DEBUG) && $(CORE_DEBUG) != $(DEBUG)

+!message WARNING: Value of DEBUG ($(DEBUG)) does not match its Tcl library configuration ($(DEBUG)).

 !endif

-

 !endif

 

+!endif # TCLNMAKECONFIG

+

+!endif # ! $(DOING_TCL)

+

+

 #----------------------------------------------------------

 # Display stats being used.

 #----------------------------------------------------------

 

+!if !$(DOING_TCL)

+!message *** Building against Tcl at '$(_TCLDIR)'

+!endif

+!if !$(DOING_TK) && $(NEED_TK)

+!message *** Building against Tk at '$(_TKDIR)'

+!endif

 !message *** Intermediate directory will be '$(TMP_DIR)'

 !message *** Output directory will be '$(OUT_DIR)'

+!message *** Installation, if selected, will be in '$(_INSTALLDIR)'

 !message *** Suffix for binaries will be '$(SUFX)'

-!message *** Optional defines are '$(OPTDEFINES)'

 !message *** Compiler version $(VCVER). Target machine is $(MACHINE)

 !message *** Host architecture is $(NATIVE_ARCH)

-!message *** Compiler options '$(COMPILERFLAGS) $(OPTIMIZATIONS) $(DEBUGFLAGS) $(WARNINGS)'

-!message *** Link options '$(LINKERFLAGS)'

 

-!endif

+!endif # ifdef _RULES_VC

diff --git a/win/targets.vc b/win/targets.vc
new file mode 100644
index 0000000..7f1d388
--- /dev/null
+++ b/win/targets.vc
@@ -0,0 +1,98 @@
+#------------------------------------------------------------- -*- makefile -*-

+# targets.vc --

+#

+# Part of the nmake based build system for Tcl and its extensions.

+# This file defines some standard targets for the convenience of extensions

+# and can be optionally included by the extension makefile.

+# See TIP 477 (https://core.tcl.tk/tips/doc/trunk/tip/477.md) for docs.

+

+$(PROJECT): setup pkgindex $(PRJLIB)

+

+!ifdef PRJ_STUBOBJS

+$(PROJECT): $(PRJSTUBLIB)

+$(PRJSTUBLIB): $(PRJ_STUBOBJS)

+	$(LIBCMD) $**

+

+$(PRJ_STUBOBJS):

+	$(CCSTUBSCMD) %s

+!endif # PRJ_STUBOBJS

+

+!ifdef PRJ_MANIFEST

+$(PROJECT): $(PRJLIB).manifest

+$(PRJLIB).manifest: $(PRJ_MANIFEST)

+	@nmakehlp -s << $** >$@

+@MACHINE@	  $(MACHINE:IX86=X86)

+<<

+!endif

+

+!if "$(PROJECT)" != "tcl" && "$(PROJECT)" != "tk"

+$(PRJLIB): $(PRJ_OBJS) $(RESFILE)

+!if $(STATIC_BUILD)

+       $(LIBCMD) $**

+!else

+       $(DLLCMD) $**

+       $(_VC_MANIFEST_EMBED_DLL)

+!endif

+       -@del $*.exp

+!endif

+

+!if "$(PRJ_HEADERS)" != "" && "$(PRJ_OBJS)" != ""

+$(PRJ_OBJS): $(PRJ_HEADERS)

+!endif

+

+# If parent makefile has defined stub objects, add their installation

+# to the default install

+!if "$(PRJ_STUBOBJS)" != ""

+default-install: default-install-stubs

+!endif

+

+# Unlike the other default targets, these cannot be in rules.vc because

+# the executed command depends on existence of macro PRJ_HEADERS_PUBLIC

+# that the parent makefile will not define until after including rules-ext.vc

+!if "$(PRJ_HEADERS_PUBLIC)" != ""

+default-install: default-install-headers

+default-install-headers:

+	@echo Installing headers to '$(INCLUDE_INSTALL_DIR)'

+	@for %f in ($(PRJ_HEADERS_PUBLIC)) do @$(COPY) %f "$(INCLUDE_INSTALL_DIR)"

+!endif

+

+!if "$(DISABLE_STANDARD_TARGETS)" == ""

+DISABLE_STANDARD_TARGETS = 0

+!endif

+

+!if "$(DISABLE_TARGET_setup)" == ""

+DISABLE_TARGET_setup = 0

+!endif

+!if "$(DISABLE_TARGET_install)" == ""

+DISABLE_TARGET_install = 0

+!endif

+!if "$(DISABLE_TARGET_clean)" == ""

+DISABLE_TARGET_clean = 0

+!endif

+!if "$(DISABLE_TARGET_test)" == ""

+DISABLE_TARGET_test = 0

+!endif

+!if "$(DISABLE_TARGET_shell)" == ""

+DISABLE_TARGET_shell = 0

+!endif

+

+!if !$(DISABLE_STANDARD_TARGETS)

+!if !$(DISABLE_TARGET_setup)

+setup: default-setup

+!endif

+!if !$(DISABLE_TARGET_install)

+install: default-install

+!endif

+!if !$(DISABLE_TARGET_clean)

+clean: default-clean

+realclean: hose

+hose: default-hose

+distclean: realclean default-distclean

+!endif

+!if !$(DISABLE_TARGET_test)

+test: default-test

+!endif

+!if !$(DISABLE_TARGET_shell)

+shell: default-shell

+!endif

+!endif # DISABLE_STANDARD_TARGETS

diff --git a/win/tcl.m4 b/win/tcl.m4
index b4fbcce..0e4a3a5 100644
--- a/win/tcl.m4
+++ b/win/tcl.m4
@@ -544,17 +544,6 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
     AC_ARG_ENABLE(64bit,[  --enable-64bit          enable 64bit support (where applicable)], [do64bit=$enableval], [do64bit=no])
     AC_MSG_RESULT($do64bit)
 
-    # Cross-compiling options for Windows/CE builds
-
-    AC_MSG_CHECKING([if Windows/CE build is requested])
-    AC_ARG_ENABLE(wince,[  --enable-wince          enable Win/CE support (where applicable)], [doWince=$enableval], [doWince=no])
-    AC_MSG_RESULT($doWince)
-
-    AC_MSG_CHECKING([for Windows/CE celib directory])
-    AC_ARG_WITH(celib,[  --with-celib=DIR        use Windows/CE support library from DIR],
-	    CELIB_DIR=$withval, CELIB_DIR=NO_CELIB)
-    AC_MSG_RESULT([$CELIB_DIR])
-
     # Set some defaults (may get changed below)
     EXTRA_CFLAGS=""
 	AC_DEFINE(MODULE_SCOPE, [extern], [No need to mark inidividual symbols as hidden])
@@ -871,98 +860,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
 	    LINKBIN="link"
 	fi
 
-	if test "$doWince" != "no" ; then
-	    # Set defaults for common evc4/PPC2003 setup
-	    # Currently Tcl requires 300+, possibly 420+ for sockets
-	    CEVERSION=420; 		# could be 211 300 301 400 420 ...
-	    TARGETCPU=ARMV4;	# could be ARMV4 ARM MIPS SH3 X86 ...
-	    ARCH=ARM;		# could be ARM MIPS X86EM ...
-	    PLATFORM="Pocket PC 2003"; # or "Pocket PC 2002"
-	    if test "$doWince" != "yes"; then
-		# If !yes then the user specified something
-		# Reset ARCH to allow user to skip specifying it
-		ARCH=
-		eval `echo $doWince | awk -F "," '{ \
-	if (length([$]1)) { printf "CEVERSION=\"%s\"\n", [$]1; \
-	if ([$]1 < 400)	  { printf "PLATFORM=\"Pocket PC 2002\"\n" } }; \
-	if (length([$]2)) { printf "TARGETCPU=\"%s\"\n", toupper([$]2) }; \
-	if (length([$]3)) { printf "ARCH=\"%s\"\n", toupper([$]3) }; \
-	if (length([$]4)) { printf "PLATFORM=\"%s\"\n", [$]4 }; \
-		}'`
-		if test "x${ARCH}" = "x" ; then
-		    ARCH=$TARGETCPU;
-		fi
-	    fi
-	    OSVERSION=WCE$CEVERSION;
-	    if test "x${WCEROOT}" = "x" ; then
-		WCEROOT="C:/Program Files/Microsoft eMbedded C++ 4.0"
-		if test ! -d "${WCEROOT}" ; then
-		    WCEROOT="C:/Program Files/Microsoft eMbedded Tools"
-		fi
-	    fi
-	    if test "x${SDKROOT}" = "x" ; then
-		SDKROOT="C:/Program Files/Windows CE Tools"
-		if test ! -d "${SDKROOT}" ; then
-		    SDKROOT="C:/Windows CE Tools"
-		fi
-	    fi
-	    # The space-based-path will work for the Makefile, but will
-	    # not work if AC_TRY_COMPILE is called.
-	    WCEROOT=`echo "$WCEROOT" | sed -e 's!\\\!/!g'`
-	    SDKROOT=`echo "$SDKROOT" | sed -e 's!\\\!/!g'`
-	    CELIB_DIR=`echo "$CELIB_DIR" | sed -e 's!\\\!/!g'`
-	    if test ! -d "${CELIB_DIR}/inc"; then
-		AC_MSG_ERROR([Invalid celib directory "${CELIB_DIR}"])
-	    fi
-	    if test ! -d "${SDKROOT}/${OSVERSION}/${PLATFORM}/Lib/${TARGETCPU}"\
-		-o ! -d "${WCEROOT}/EVC/${OSVERSION}/bin"; then
-		AC_MSG_ERROR([could not find PocketPC SDK or target compiler to enable WinCE mode [$CEVERSION,$TARGETCPU,$ARCH,$PLATFORM]])
-	    else
-		CEINCLUDE="${SDKROOT}/${OSVERSION}/${PLATFORM}/include"
-		if test -d "${CEINCLUDE}/${TARGETCPU}" ; then
-		    CEINCLUDE="${CEINCLUDE}/${TARGETCPU}"
-		fi
-		CELIBPATH="${SDKROOT}/${OSVERSION}/${PLATFORM}/Lib/${TARGETCPU}"
-	    fi
-	fi
-
-	if test "$doWince" != "no" ; then
-	    CEBINROOT="${WCEROOT}/EVC/${OSVERSION}/bin"
-	    if test "${TARGETCPU}" = "X86"; then
-		CC="${CEBINROOT}/cl.exe"
-	    else
-		CC="${CEBINROOT}/cl${ARCH}.exe"
-	    fi
-	    CC="\"${CC}\" -I\"${CELIB_DIR}/inc\" -I\"${CEINCLUDE}\""
-	    RC="\"${WCEROOT}/Common/EVC/bin/rc.exe\""
-	    arch=`echo ${ARCH} | awk '{print tolower([$]0)}'`
-	    defs="${ARCH} _${ARCH}_ ${arch} PALM_SIZE _MT _DLL _WINDOWS"
-	    for i in $defs ; do
-		AC_DEFINE_UNQUOTED($i)
-	    done
-#	    if test "${ARCH}" = "X86EM"; then
-#		AC_DEFINE_UNQUOTED(_WIN32_WCE_EMULATION)
-#	    fi
-	    AC_DEFINE_UNQUOTED(_WIN32_WCE, $CEVERSION)
-	    AC_DEFINE_UNQUOTED(UNDER_CE, $CEVERSION)
-	    CFLAGS_DEBUG="-nologo -Zi -Od"
-	    CFLAGS_OPTIMIZE="-nologo -O2"
-	    lversion=`echo ${CEVERSION} | sed -e 's/\(.\)\(..\)/\1\.\2/'`
-	    lflags="-nodefaultlib -MACHINE:${ARCH} -LIBPATH:\"${CELIBPATH}\" -subsystem:windowsce,${lversion} -nologo"
-	    LINKBIN="\"${CEBINROOT}/link.exe\""
-	    AC_SUBST(CELIB_DIR)
-	    if test "${CEVERSION}" -lt 400 ; then
-		LIBS="coredll.lib corelibc.lib winsock.lib"
-	    else
-		LIBS="coredll.lib corelibc.lib ws2.lib"
-	    fi
-	    # celib currently stuck at wce300 status
-	    #LIBS="$LIBS \${CELIB_DIR}/wince-${ARCH}-pocket-${OSVERSION}-release/celib.lib"
-	    LIBS="$LIBS \"\${CELIB_DIR}/wince-${ARCH}-pocket-wce300-release/celib.lib\""
-	    LIBS_GUI="commctrl.lib commdlg.lib"
-	else
-	    LIBS_GUI="gdi32.lib comdlg32.lib imm32.lib comctl32.lib shell32.lib uuid.lib"
-	fi
+	LIBS_GUI="gdi32.lib comdlg32.lib imm32.lib comctl32.lib shell32.lib uuid.lib"
 
 	SHLIB_LD="${LINKBIN} -dll -incremental:no ${lflags}"
 	SHLIB_LD_LIBS='${LIBS}'
@@ -993,7 +891,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
 
 	# Specify linker flags depending on the type of app being
 	# built -- Console vs. Window.
-	if test "$doWince" != "no" -a "${TARGETCPU}" != "X86"; then
+	if test "${TARGETCPU}" != "X86"; then
 	    LDFLAGS_CONSOLE="-link ${lflags}"
 	    LDFLAGS_WINDOW=${LDFLAGS_CONSOLE}
 	else
diff --git a/win/tclWin32Dll.c b/win/tclWin32Dll.c
index 1d6cb2b..95b8193 100644
--- a/win/tclWin32Dll.c
+++ b/win/tclWin32Dll.c
@@ -23,7 +23,6 @@
  */
 
 static HINSTANCE hInstance;	/* HINSTANCE of this DLL. */
-static int platformId;		/* Running under NT, or 95/98? */
 
 /*
  * VC++ 5.x has no 'cpuid' assembler instruction, so we must emulate it
@@ -186,51 +185,20 @@ TclWinInit(
     hInstance = hInst;
     os.dwOSVersionInfoSize = sizeof(OSVERSIONINFOW);
     GetVersionExW(&os);
-    platformId = os.dwPlatformId;
 
     /*
-     * We no longer support Win32s or Win9x, so just in case someone manages
-     * to get a runtime there, make sure they know that.
+     * We no longer support Win32s or Win9x or Windows CE, so just in case
+     * someone manages to get a runtime there, make sure they know that.
      */
 
-    if (platformId == VER_PLATFORM_WIN32s) {
-	Tcl_Panic("Win32s is not a supported platform");
-    }
-    if (platformId == VER_PLATFORM_WIN32_WINDOWS) {
-	Tcl_Panic("Windows 9x is not a supported platform");
+    if (os.dwPlatformId != VER_PLATFORM_WIN32_NT) {
+	Tcl_Panic("Windows NT is the only supported platform");
     }
 
     TclWinResetInterfaces();
 }
 
 /*
- *----------------------------------------------------------------------
- *
- * TclWinGetPlatformId --
- *
- *	Determines whether running under NT, 95, or Win32s, to allow runtime
- *	conditional code.
- *
- * Results:
- *	The return value is one of:
- *	VER_PLATFORM_WIN32s	   Win32s on Windows 3.1 (not supported)
- *	VER_PLATFORM_WIN32_WINDOWS Win32 on Windows 95, 98, ME (not supported)
- *	VER_PLATFORM_WIN32_NT	Win32 on Windows NT, 2000, XP
- *	VER_PLATFORM_WIN32_CE	Win32 on Windows CE
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclWinGetPlatformId(void)
-{
-    return platformId;
-}
-
-/*
  *-------------------------------------------------------------------------
  *
  * TclWinNoBackslash --
diff --git a/win/tclWinInit.c b/win/tclWinInit.c
index c590865..dc8bba7 100644
--- a/win/tclWinInit.c
+++ b/win/tclWinInit.c
@@ -84,15 +84,10 @@ TclWinProcs tclWinProcs;
 
 /*
  * The following arrays contain the human readable strings for the Windows
- * platform and processor values.
+ * processor values.
  */
 
 
-#define NUMPLATFORMS 4
-static const char *const platforms[NUMPLATFORMS] = {
-    "Win32s", "Windows 95", "Windows NT", "Windows CE"
-};
-
 #define NUMPROCESSORS 11
 static const char *const processors[NUMPROCESSORS] = {
     "intel", "mips", "alpha", "ppc", "shx", "arm", "ia64", "alpha64", "msil",
@@ -187,7 +182,7 @@ TclpInitPlatform(void)
 void
 TclpInitLibraryPath(
     char **valuePtr,
-    size_t *lengthPtr,
+    unsigned int *lengthPtr,
     Tcl_Encoding *encodingPtr)
 {
 #define LIBRARY_SIZE	    64
@@ -350,7 +345,7 @@ AppendEnvironment(
 static void
 InitializeDefaultLibraryDir(
     char **valuePtr,
-    size_t *lengthPtr,
+    unsigned int *lengthPtr,
     Tcl_Encoding *encodingPtr)
 {
     HMODULE hModule = TclWinGetTclInstance();
@@ -401,7 +396,7 @@ InitializeDefaultLibraryDir(
 static void
 InitializeSourceLibraryDir(
     char **valuePtr,
-    size_t *lengthPtr,
+    unsigned int *lengthPtr,
     Tcl_Encoding *encodingPtr)
 {
     HMODULE hModule = TclWinGetTclInstance();
@@ -569,10 +564,7 @@ TclpSetVariables(
 
     Tcl_SetVar2(interp, "tcl_platform", "platform", "windows",
 	    TCL_GLOBAL_ONLY);
-    if (osInfo.dwPlatformId < NUMPLATFORMS) {
-	Tcl_SetVar2(interp, "tcl_platform", "os",
-		platforms[osInfo.dwPlatformId], TCL_GLOBAL_ONLY);
-    }
+    Tcl_SetVar2(interp, "tcl_platform", "os", "Windows NT", TCL_GLOBAL_ONLY);
     wsprintfA(buffer, "%d.%d", osInfo.dwMajorVersion, osInfo.dwMinorVersion);
     Tcl_SetVar2(interp, "tcl_platform", "osVersion", buffer, TCL_GLOBAL_ONLY);
     if (sys.oemId.wProcessorArchitecture < NUMPROCESSORS) {
diff --git a/win/tclWinInt.h b/win/tclWinInt.h
index f74b6e1..08d80fb 100644
--- a/win/tclWinInt.h
+++ b/win/tclWinInt.h
@@ -41,19 +41,6 @@ typedef struct TclWinProcs {
 MODULE_SCOPE TclWinProcs tclWinProcs;
 
 /*
- * Some versions of Borland C have a define for the OSVERSIONINFO for
- * Win32s and for NT, but not for Windows 95.
- * Define VER_PLATFORM_WIN32_CE for those without newer headers.
- */
-
-#ifndef VER_PLATFORM_WIN32_WINDOWS
-#define VER_PLATFORM_WIN32_WINDOWS 1
-#endif
-#ifndef VER_PLATFORM_WIN32_CE
-#define VER_PLATFORM_WIN32_CE 3
-#endif
-
-/*
  * Declarations of functions that are not accessible by way of the
  * stubs table.
  */
diff --git a/win/tclWinPipe.c b/win/tclWinPipe.c
index 633ee63..d1b0596 100644
--- a/win/tclWinPipe.c
+++ b/win/tclWinPipe.c
@@ -1095,40 +1095,23 @@ TclpCreateProcess(
      * detached processes. The GUI window will still pop up to the foreground.
      */
 
-    if (TclWinGetPlatformId() == VER_PLATFORM_WIN32_NT) {
-	if (HasConsole()) {
+    if (HasConsole()) {
 	    createFlags = 0;
-	} else if (applType == APPL_DOS) {
-	    /*
-	     * Under NT, 16-bit DOS applications will not run unless they can
-	     * be attached to a console. If we are running without a console,
-	     * run the 16-bit program as an normal process inside of a hidden
-	     * console application, and then run that hidden console as a
-	     * detached process.
-	     */
+    } else if (applType == APPL_DOS) {
+	/*
+	 * Under NT, 16-bit DOS applications will not run unless they can
+	 * be attached to a console. If we are running without a console,
+	 * run the 16-bit program as an normal process inside of a hidden
+	 * console application, and then run that hidden console as a
+	 * detached process.
+	 */
 
-	    startInfo.wShowWindow = SW_HIDE;
-	    startInfo.dwFlags |= STARTF_USESHOWWINDOW;
-	    createFlags = CREATE_NEW_CONSOLE;
-	    TclDStringAppendLiteral(&cmdLine, "cmd.exe /c");
-	} else {
-	    createFlags = DETACHED_PROCESS;
-	}
+	startInfo.wShowWindow = SW_HIDE;
+	startInfo.dwFlags |= STARTF_USESHOWWINDOW;
+	createFlags = CREATE_NEW_CONSOLE;
+	TclDStringAppendLiteral(&cmdLine, "cmd.exe /c");
     } else {
-	if (HasConsole()) {
-	    createFlags = 0;
-	} else {
-	    createFlags = DETACHED_PROCESS;
-	}
-
-	if (applType == APPL_DOS) {
-	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		    "DOS application process not supported on this platform",
-		    -1));
-	    Tcl_SetErrorCode(interp, "TCL", "OPERATION", "EXEC", "DOS_APP",
-		    NULL);
-	    goto end;
-	}
+	createFlags = DETACHED_PROCESS;
     }
 
     /*
diff --git a/win/tclWinSock.c b/win/tclWinSock.c
index ee6be96..1c004838 100644
--- a/win/tclWinSock.c
+++ b/win/tclWinSock.c
@@ -360,7 +360,7 @@ printaddrinfolist(
 void
 InitializeHostName(
     char **valuePtr,
-    size_t *lengthPtr,
+    unsigned int *lengthPtr,
     Tcl_Encoding *encodingPtr)
 {
     TCHAR tbuf[MAX_COMPUTERNAME_LENGTH + 1];