diff options
| author | apnadkarni <apnmbx-wits@yahoo.com> | 2021-05-02 15:24:41 (GMT) |
|---|---|---|
| committer | apnadkarni <apnmbx-wits@yahoo.com> | 2021-05-02 15:24:41 (GMT) |
| commit | 871e22dba5210188b644be693303d7e4259c12d4 (patch) | |
| tree | a2be6de5ff4eafaa072f9085d3b139d918453dac /win | |
| parent | ea7932318beff09d02dfff2e9c0cf9aef442931d (diff) | |
| download | tk-871e22dba5210188b644be693303d7e4259c12d4.zip tk-871e22dba5210188b644be693303d7e4259c12d4.tar.gz tk-871e22dba5210188b644be693303d7e4259c12d4.tar.bz2 | |
Fix 160dca67c0d8c8e7 - Tk 8.7 does not build against 8.6 using nmake
Diffstat (limited to 'win')
| -rw-r--r-- | win/makefile.vc | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/win/makefile.vc b/win/makefile.vc index 49297e1..67eac44 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -93,6 +93,12 @@ USE_WIDECHAR_API = 0 # the build configuration, macros, output directories etc.
!include "rules-ext.vc"
+!if ($(TCL_MAJOR_VERSION) > 8) || ($(TCL_MAJOR_VERSION) == 8 && $(TCL_MINOR_VERSION) > 6)
+USING_PRE87_TCL = 0
+!else
+USING_PRE87_TCL = 1
+!endif
+
# TCLINSTALL is set to 1 by rules.vc to indicate we are building against
# an installed Tcl and 0 if building against Tcl source. Tk needs the latter.
!if $(TCLINSTALL)
@@ -128,6 +134,10 @@ TK_EMBED_SCRIPTS = $(STATIC_BUILD) !endif
!endif
+!if $(USING_PRE87_TCL)
+TK_EMBED_SCRIPTS = 0
+!endif
+
TK_NO_DEPRECATED = 0
!if "$(CHECKS)" != "" && ![nmakehlp -f "$(CHECKS)" "none"]
!if [nmakehlp -f $(CHECKS) "nodep"]
@@ -351,7 +361,6 @@ PRJ_DEFINES = /DBUILD_ttk $(CONFIG_DEFS) /Dinline=__inline /D_CRT_SECURE_NO_DEPR # Additional Link libraries needed beyond those in rules.vc
PRJ_LIBS = netapi32.lib gdi32.lib user32.lib userenv.lib
-
#---------------------------------------------------------------------
# TkTest flags
#---------------------------------------------------------------------
@@ -364,7 +373,10 @@ TESTFLAGS = $(TESTFLAGS) -file $(TESTPAT) # Project specific targets
#---------------------------------------------------------------------
-release: setup $(TKSTUBLIB) $(WISH) libtkzip embed
+release: setup $(TKSTUBLIB) $(WISH)
+!if !$(USING_PRE87_TCL)
+release: libtkzip embed
+!endif
all: release $(CAT32)
core: setup $(TKSTUBLIB) $(TKLIB)
cwish: $(WISHC)
@@ -761,7 +773,9 @@ install-libraries: @$(CPY) "$(GENERICDIR)\tkPlatDecls.h" "$(INCLUDE_INSTALL_DIR)\"
@$(CPY) "$(GENERICDIR)\tkIntXlibDecls.h" "$(INCLUDE_INSTALL_DIR)\"
@$(CPY) "$(XLIBDIR)\X11\*.h" "$(INCLUDE_INSTALL_DIR)\X11\"
+!if !$(USING_PRE87_TCL)
@$(CPY) "$(TKSCRIPTZIP)" "$(LIB_INSTALL_DIR)"
+!endif
!if !$(TK_EMBED_SCRIPTS)
@echo installing script library
@$(CPY) "$(LIBDIR)\*" "$(SCRIPT_INSTALL_DIR)\"
|