summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2021-01-05 17:02:19 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2021-01-05 17:02:19 (GMT)
commit828d1a2a1a1d983ddd9045c6d16e02e2bf8ccd77 (patch)
tree9c4b7c195abd2dbd4e1c832fc13f54395d798c84 /win
parent5e5231208057464865759f23d85b682b822632a3 (diff)
parent63e1b78ae659dedee84eac0a799716d2b167e73f (diff)
downloadtcl-828d1a2a1a1d983ddd9045c6d16e02e2bf8ccd77.zip
tcl-828d1a2a1a1d983ddd9045c6d16e02e2bf8ccd77.tar.gz
tcl-828d1a2a1a1d983ddd9045c6d16e02e2bf8ccd77.tar.bz2
Merge 8.5: Add 4 processor-types to Win32/Cygwin. "platform" -> 1.0.16
Diffstat (limited to 'win')
-rw-r--r--win/Makefile.in4
-rw-r--r--win/tclWinInit.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/win/Makefile.in b/win/Makefile.in
index c6cdf89..e6d84ea 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -730,8 +730,8 @@ install-libraries: libraries install-tzdata install-msgs
@$(COPY) $(ROOT_DIR)/library/msgcat/msgcat.tcl "$(MODULE_INSTALL_DIR)/8.5/msgcat-1.6.1.tm";
@echo "Installing package tcltest 2.5.3 as a Tcl Module";
@$(COPY) $(ROOT_DIR)/library/tcltest/tcltest.tcl "$(MODULE_INSTALL_DIR)/8.5/tcltest-2.5.3.tm";
- @echo "Installing package platform 1.0.15 as a Tcl Module";
- @$(COPY) $(ROOT_DIR)/library/platform/platform.tcl "$(MODULE_INSTALL_DIR)/8.4/platform-1.0.15.tm";
+ @echo "Installing package platform 1.0.16 as a Tcl Module";
+ @$(COPY) $(ROOT_DIR)/library/platform/platform.tcl "$(MODULE_INSTALL_DIR)/8.4/platform-1.0.16.tm";
@echo "Installing package platform::shell 1.1.4 as a Tcl Module";
@$(COPY) $(ROOT_DIR)/library/platform/shell.tcl "$(MODULE_INSTALL_DIR)/8.4/platform/shell-1.1.4.tm";
@echo "Installing encodings";
diff --git a/win/tclWinInit.c b/win/tclWinInit.c
index 409c87f..d1b8156 100644
--- a/win/tclWinInit.c
+++ b/win/tclWinInit.c
@@ -87,10 +87,10 @@ TclWinProcs tclWinProcs;
* processor values.
*/
-#define NUMPROCESSORS 11
+#define NUMPROCESSORS 15
static const char *const processors[NUMPROCESSORS] = {
"intel", "mips", "alpha", "ppc", "shx", "arm", "ia64", "alpha64", "msil",
- "amd64", "ia32_on_win64"
+ "amd64", "ia32_on_win64", "neutral", "arm64", "arm32_on_win64", "ia32_on_arm64"
};
/*