diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-06-20 11:55:29 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-06-20 11:55:29 (GMT) |
| commit | 96609fe537a84e955b7be5cf97c64e0737ea7103 (patch) | |
| tree | 5d98c70461ec2d293a3fa8f56c79483fe93748f0 /win | |
| parent | 4503f8049c9e435aee81d08b5ed7a0d9dc01bd49 (diff) | |
| download | tcl-96609fe537a84e955b7be5cf97c64e0737ea7103.zip tcl-96609fe537a84e955b7be5cf97c64e0737ea7103.tar.gz tcl-96609fe537a84e955b7be5cf97c64e0737ea7103.tar.bz2 | |
Fix [a55872c242]: tcl8.7 on windows: linking against stubs library is now required in 8.7.
If the Tcl library is static (.lib/.a) then the stub library is (with this fix) no
longer necessary. If the Tcl library is a dll, document that the stub library is now necessary.
Diffstat (limited to 'win')
| -rw-r--r-- | win/Makefile.in | 4 | ||||
| -rw-r--r-- | win/makefile.vc | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/win/Makefile.in b/win/Makefile.in index 8fef0cc..cf1ea7b 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -573,9 +573,9 @@ ${TCL_DLL_FILE}: ${TCL_OBJS} tcl.$(RES) @ZLIB_DLL_FILE@ @TOMMATH_DLL_FILE@ ${TCL || echo 'ignore zip-error by adjust sfx process (not executable?)'; \ fi -${TCL_LIB_FILE}: ${TCL_OBJS} +${TCL_LIB_FILE}: ${TCL_OBJS} tclWinPanic.$(OBJEXT) ${DDE_OBJS} ${REG_OBJS} @$(RM) ${TCL_LIB_FILE} - @MAKE_LIB@ ${TCL_OBJS} ${DDE_OBJS} ${REG_OBJS} + @MAKE_LIB@ ${TCL_OBJS} tclWinPanic.$(OBJEXT) ${DDE_OBJS} ${REG_OBJS} @POST_MAKE_LIB@ ${DDE_DLL_FILE}: ${TCL_STUB_LIB_FILE} ${DDE_OBJS} diff --git a/win/makefile.vc b/win/makefile.vc index 6ff6118..7c61580 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -428,6 +428,7 @@ PLATFORMOBJS = \ $(TMP_DIR)\tclWinThrd.obj \
$(TMP_DIR)\tclWinTime.obj \
!if $(STATIC_BUILD)
+ $(TMP_DIR)\tclWinPanic.obj \
$(TMP_DIR)\tclWinReg.obj \
$(TMP_DIR)\tclWinDde.obj \
!else
|