From c24b204d8dd73e59a5ce6d294fb4b107802b4648 Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Wed, 24 Apr 2024 12:32:14 +0000 Subject: __declspec should have double underscore (even though it works with one) --- generic/tcl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generic/tcl.h b/generic/tcl.h index e0ed823..6b32a63 100644 --- a/generic/tcl.h +++ b/generic/tcl.h @@ -156,7 +156,7 @@ extern "C" { #else # define TCL_FORMAT_PRINTF(a,b) # if defined(_MSC_VER) && (_MSC_VER >= 1310) -# define TCL_NORETURN _declspec(noreturn) +# define TCL_NORETURN __declspec(noreturn) # else # define TCL_NORETURN /* nothing */ # endif -- cgit v0.12 From 99ddff21434e12e655d52fcbc8dfc961b4879a60 Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Thu, 25 Apr 2024 08:24:05 +0000 Subject: (cherry-pick): Fix building of libtclzip for out-of-source builds --- win/makefile.vc | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/win/makefile.vc b/win/makefile.vc index d2b2a69..b79e8ee 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -463,7 +463,8 @@ TCLSTUBOBJS = \ TOMMATHDIR = $(ROOT)\libtommath PKGSDIR = $(ROOT)\pkgs -LIBTCLVFS = $(OUT_DIR)\libtcl.vfs +LIBTCLVFSSUBDIR = libtcl.vfs +LIBTCLVFS = $(OUT_DIR)\$(LIBTCLVFSSUBDIR) # Additional include and C macro definitions for the implicit rules # defined in rules.vc @@ -663,9 +664,10 @@ $(TCLSCRIPTZIP): $(TCLLIB) $(TCLSH) dlls @$(COPY) $(TCLDDELIB) "$(LIBTCLVFS)\tcl_library\dde @$(COPY) $(TCLREGLIB) "$(LIBTCLVFS)\tcl_library\registry !endif - @echo file delete -force {$@} > "$(OUT_DIR)\zipper.tcl" - @echo zipfs mkzip {$@} {$(LIBTCLVFS)} {$(LIBTCLVFS)} >> "$(OUT_DIR)\zipper.tcl" - @cd "$(OUT_DIR)" && $(TCLSH_NATIVE) zipper.tcl + @echo cd {$(OUT_DIR)} > "$(OUT_DIR)\zipper.tcl" + @echo file delete -force {$(@F)} >> "$(OUT_DIR)\zipper.tcl" + @echo zipfs mkzip {$(@F)} {$(LIBTCLVFSSUBDIR)} {$(LIBTCLVFSSUBDIR)} >> "$(OUT_DIR)\zipper.tcl" + @$(TCLSH_NATIVE) "$(OUT_DIR)/zipper.tcl" pkgs: @for /d %d in ($(PKGSDIR)\*) do \ -- cgit v0.12