diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-05-02 16:02:51 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-05-02 16:02:51 (GMT) |
| commit | 25b1cb4e5ed9c653e043732ae1c1dd3f337cbede (patch) | |
| tree | a631eeb5dedaba79233fffc70d6a48dff3acbc8e /win/makefile.vc | |
| parent | 2e20e3d127da5e8a49e124ff975a94b375367526 (diff) | |
| parent | 4d920f810552574d0e101cb9493acd1c249e1099 (diff) | |
| download | tk-25b1cb4e5ed9c653e043732ae1c1dd3f337cbede.zip tk-25b1cb4e5ed9c653e043732ae1c1dd3f337cbede.tar.gz tk-25b1cb4e5ed9c653e043732ae1c1dd3f337cbede.tar.bz2 | |
Merge enhanced-index
Diffstat (limited to 'win/makefile.vc')
| -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 cc60df0..c7a4121 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"]
@@ -352,7 +362,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
#---------------------------------------------------------------------
@@ -365,7 +374,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)
@@ -762,7 +774,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)\"
|