diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-02-14 15:53:41 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-02-14 15:53:41 (GMT) |
| commit | 6f57e686508ad153aa9bbef9322563eaa069152b (patch) | |
| tree | c8ae8f3d248f6fc7e08eea3bf5d62d89fb5e313e | |
| parent | 54abea2df79a91bb28a851c3b67c8aa1b6f4338a (diff) | |
| parent | 07a9e372b0b9c913c7df8caca32747cbfd0afd57 (diff) | |
| download | tcl-6f57e686508ad153aa9bbef9322563eaa069152b.zip tcl-6f57e686508ad153aa9bbef9322563eaa069152b.tar.gz tcl-6f57e686508ad153aa9bbef9322563eaa069152b.tar.bz2 | |
Merge 8.7
| -rwxr-xr-x | compat/zlib/win64-arm/zlib1.dll | bin | 92672 -> 92672 bytes | |||
| -rw-r--r-- | compat/zlib/win64/libz.dll.a | bin | 51638 -> 13002 bytes | |||
| -rwxr-xr-x | compat/zlib/win64/zlib1.dll | bin | 116736 -> 99840 bytes | |||
| -rwxr-xr-x | libtommath/win64-arm/libtommath.dll | bin | 69120 -> 69120 bytes | |||
| -rw-r--r-- | libtommath/win64-arm/libtommath.dll.a | bin | 20816 -> 22478 bytes | |||
| -rwxr-xr-x | libtommath/win64/libtommath.dll | bin | 81408 -> 80896 bytes | |||
| -rw-r--r-- | libtommath/win64/libtommath.dll.a | bin | 128166 -> 22478 bytes | |||
| -rw-r--r-- | win/makefile.vc | 2 | ||||
| -rw-r--r-- | win/rules.vc | 6 |
9 files changed, 4 insertions, 4 deletions
diff --git a/compat/zlib/win64-arm/zlib1.dll b/compat/zlib/win64-arm/zlib1.dll Binary files differindex 7d08dd3..1f43308 100755 --- a/compat/zlib/win64-arm/zlib1.dll +++ b/compat/zlib/win64-arm/zlib1.dll diff --git a/compat/zlib/win64/libz.dll.a b/compat/zlib/win64/libz.dll.a Binary files differindex 93be06e..b0c8722 100644 --- a/compat/zlib/win64/libz.dll.a +++ b/compat/zlib/win64/libz.dll.a diff --git a/compat/zlib/win64/zlib1.dll b/compat/zlib/win64/zlib1.dll Binary files differindex 81195c3..e893cff 100755 --- a/compat/zlib/win64/zlib1.dll +++ b/compat/zlib/win64/zlib1.dll diff --git a/libtommath/win64-arm/libtommath.dll b/libtommath/win64-arm/libtommath.dll Binary files differindex 99c57a2..37bccf7 100755 --- a/libtommath/win64-arm/libtommath.dll +++ b/libtommath/win64-arm/libtommath.dll diff --git a/libtommath/win64-arm/libtommath.dll.a b/libtommath/win64-arm/libtommath.dll.a Binary files differindex 611522e..0108f90 100644 --- a/libtommath/win64-arm/libtommath.dll.a +++ b/libtommath/win64-arm/libtommath.dll.a diff --git a/libtommath/win64/libtommath.dll b/libtommath/win64/libtommath.dll Binary files differindex 2225faf..ace8fce 100755 --- a/libtommath/win64/libtommath.dll +++ b/libtommath/win64/libtommath.dll diff --git a/libtommath/win64/libtommath.dll.a b/libtommath/win64/libtommath.dll.a Binary files differindex 40adaf7..81be3c8 100644 --- a/libtommath/win64/libtommath.dll.a +++ b/libtommath/win64/libtommath.dll.a diff --git a/win/makefile.vc b/win/makefile.vc index d791fcb..3575d13 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -602,7 +602,7 @@ $(TCLSCRIPTZIP): $(TCLDDELIB) $(TCLREGLIB) !endif
@echo file delete -force {$@} > "$(OUT_DIR)\zipper.tcl"
@echo zipfs mkzip {$@} {$(LIBTCLVFS)} {$(LIBTCLVFS)} >> "$(OUT_DIR)\zipper.tcl"
- @cd "$(OUT_DIR)" && $(TCLSH) zipper.tcl
+ @cd "$(OUT_DIR)" && $(TCLSH_NATIVE) zipper.tcl
pkgs:
diff --git a/win/rules.vc b/win/rules.vc index b68b6b4..f8236f4 100644 --- a/win/rules.vc +++ b/win/rules.vc @@ -548,9 +548,6 @@ NMAKEHLPC = $(_TCLDIR)\win\nmakehlp.c !endif # NMAKEHLPC
-nmakehlp:
- $(cc32) -nologo "$(NMAKEHLPC)" -link -subsystem:console
-
# We always build nmakehlp even if it exists since we do not know
# what source it was built from.
!if "$(MACHINE)" == "$(NATIVE_ARCH)"
@@ -1613,6 +1610,9 @@ DEFAULT_BUILD_TARGET = $(PROJECT) default-target: $(DEFAULT_BUILD_TARGET)
+nmakehlp:
+ $(cc32) -nologo "$(NMAKEHLPC)" -link -subsystem:console
+
!if $(MULTIPLATFORM_INSTALL)
default-pkgindex:
@echo if {[package vsatisfies [package provide Tcl] 9.0-]} { > $(OUT_DIR)\pkgIndex.tcl
|