diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-08-01 16:12:15 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-08-01 16:12:15 (GMT) |
| commit | e97b71f1399c71e394788df547dfb0914b42aa85 (patch) | |
| tree | 5d9bec3644ee51b924bec2aead669af075a46de2 /win | |
| parent | 66027ff8e69fe8688f764119253a58d2d7e918e8 (diff) | |
| parent | 47f462c33cd417a6f36038282806c5ce0757ba5e (diff) | |
| download | tcl-e97b71f1399c71e394788df547dfb0914b42aa85.zip tcl-e97b71f1399c71e394788df547dfb0914b42aa85.tar.gz tcl-e97b71f1399c71e394788df547dfb0914b42aa85.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'win')
| -rw-r--r-- | win/Makefile.in | 3 | ||||
| -rw-r--r-- | win/makefile.vc | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/win/Makefile.in b/win/Makefile.in index 0dff715..b9a6d6f 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -206,7 +206,6 @@ SHLIB_LD = @SHLIB_LD@ SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ SHLIB_CFLAGS = @SHLIB_CFLAGS@ SHLIB_SUFFIX = @SHLIB_SUFFIX@ -TOMMATH_LIBS = @TOMMATH_LIBS@ LIBS = @LIBS@ $(shell $(CYGPATH) '@ZLIB_LIBS@') $(shell $(CYGPATH) '@TOMMATH_LIBS@') RMDIR = rm -rf @@ -853,7 +852,7 @@ install-binaries: binaries $(COPY) $$i "$(BIN_INSTALL_DIR)"; \ fi; \ done - @for i in tclConfig.sh tclooConfig.sh $(TCL_LIB_FILE) $(TCL_STUB_LIB_FILE) $(TOMMATH_LIBS); \ + @for i in tclConfig.sh tclooConfig.sh $(TCL_LIB_FILE) $(TCL_STUB_LIB_FILE) @ZLIB_LIBS@ @TOMMATH_LIBS@; \ do \ if [ -f $$i ]; then \ echo "Installing $$i to $(LIB_INSTALL_DIR)/"; \ diff --git a/win/makefile.vc b/win/makefile.vc index f926ba6..e94a284 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -985,6 +985,7 @@ install-binaries: !endif
@$(CPY) "$(TCLIMPLIB)" "$(LIB_INSTALL_DIR)\"
@$(CPY) "$(OUT_DIR)\zlib1.dll" "$(BIN_INSTALL_DIR)\"
+ @$(CPY) "$(OUT_DIR)\zdll.lib" "$(LIB_INSTALL_DIR)\"
@$(CPY) "$(OUT_DIR)\libtommath.dll" "$(BIN_INSTALL_DIR)\"
@$(CPY) "$(OUT_DIR)\tommath.lib" "$(LIB_INSTALL_DIR)\"
!if exist($(TCLSH))
|