diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-11-28 13:45:50 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-11-28 13:45:50 (GMT) |
| commit | 8e51252be88273f88ea1877fc1980352cf278988 (patch) | |
| tree | 798c4253ebd6c3eab3d5534a265747311e776a76 /win/makefile.vc | |
| parent | f67e946a671273c2ac6ced8bf06e577edf4c333d (diff) | |
| parent | a5162e47d57e9549fb2ee179f87823dcc11a7be7 (diff) | |
| download | tcl-8e51252be88273f88ea1877fc1980352cf278988.zip tcl-8e51252be88273f88ea1877fc1980352cf278988.tar.gz tcl-8e51252be88273f88ea1877fc1980352cf278988.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'win/makefile.vc')
| -rw-r--r-- | win/makefile.vc | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/win/makefile.vc b/win/makefile.vc index d61e403..a4cb9d7 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -152,6 +152,12 @@ VERSION = $(TCL_MAJOR_VERSION)$(TCL_MINOR_VERSION) !if [echo PKG_HTTP_VER = \>> versions.vc] \
&& [nmakehlp -V ..\library\http\pkgIndex.tcl http >> versions.vc]
!endif
+!if [echo PKG_OPT_VER = \>> versions.vc] \
+ && [nmakehlp -V ..\library\opt\pkgIndex.tcl opt >> versions.vc]
+!endif
+!if [echo PKG_COOKIEJAR_VER = \>> versions.vc] \
+ && [nmakehlp -V ..\library\cookiejar\pkgIndex.tcl cookiejar >> versions.vc]
+!endif
!if [echo PKG_TCLTEST_VER = \>> versions.vc] \
&& [nmakehlp -V ..\library\tcltest\pkgIndex.tcl tcltest >> versions.vc]
!endif
@@ -423,7 +429,7 @@ PKGSDIR = $(ROOT)\pkgs # Additional include and C macro definitions for the implicit rules
# defined in rules.vc
PRJ_INCLUDES = -I"$(TOMMATHDIR)"
-PRJ_DEFINES = /DTCL_TOMMATH /DMP_PREC=4 /Dinline=__inline /DHAVE_ZLIB=1 /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DMP_FIXED_CUTOFFS /DMP_NO_STDINT /DMP_WUR=
+PRJ_DEFINES = /DTCL_TOMMATH /DMP_PREC=4 /Dinline=__inline /DHAVE_ZLIB=1 /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DMP_FIXED_CUTOFFS /DMP_WUR=
# Additional Link libraries needed beyond those in rules.vc
PRJ_LIBS = netapi32.lib user32.lib userenv.lib ws2_32.lib
@@ -881,8 +887,8 @@ install-libraries: tclConfig tcl-nmake install-msgs install-tzdata $(MKDIR) "$(SCRIPT_INSTALL_DIR)"
@if not exist "$(SCRIPT_INSTALL_DIR)\opt0.4$(NULL)" \
$(MKDIR) "$(SCRIPT_INSTALL_DIR)\opt0.4"
- @if not exist "$(SCRIPT_INSTALL_DIR)\cookiejar0.1$(NULL)" \
- $(MKDIR) "$(SCRIPT_INSTALL_DIR)\cookiejar0.1"
+ @if not exist "$(SCRIPT_INSTALL_DIR)\cookiejar0.2$(NULL)" \
+ $(MKDIR) "$(SCRIPT_INSTALL_DIR)\cookiejar0.2"
@if not exist "$(SCRIPT_INSTALL_DIR)\..\tcl9$(NULL)" \
$(MKDIR) "$(SCRIPT_INSTALL_DIR)\..\tcl9"
@if not exist "$(SCRIPT_INSTALL_DIR)\..\tcl9\9.0$(NULL)" \
@@ -914,12 +920,12 @@ install-libraries: tclConfig tcl-nmake install-msgs install-tzdata @$(CPY) "$(WIN_DIR)\targets.vc" "$(LIB_INSTALL_DIR)\nmake\"
@$(CPY) "$(WIN_DIR)\nmakehlp.c" "$(LIB_INSTALL_DIR)\nmake\"
@$(CPY) "$(OUT_DIR)\tcl.nmake" "$(LIB_INSTALL_DIR)\nmake\"
- @echo Installing package cookiejar 0.1 files to $(SCRIPT_INSTALL_DIR)/cookiejar0.1/
+ @echo Installing package cookiejar $(PKG_COOKIEJAR_VER)
@$(CPY) "$(ROOT)\library\cookiejar\*.tcl" \
- "$(SCRIPT_INSTALL_DIR)\cookiejar0.1\"
+ "$(SCRIPT_INSTALL_DIR)\cookiejar0.2\"
@$(CPY) "$(ROOT)\library\cookiejar\*.gz" \
- "$(SCRIPT_INSTALL_DIR)\cookiejar0.1\"
- @echo Installing package opt0.4 files to $(SCRIPT_INSTALL_DIR)/opt0.4/
+ "$(SCRIPT_INSTALL_DIR)\cookiejar0.2\"
+ @echo Installing package opt $(PKG_OPT_VER)
@$(CPY) "$(ROOT)\library\opt\*.tcl" \
"$(SCRIPT_INSTALL_DIR)\opt0.4\"
@echo Installing package http $(PKG_HTTP_VER) as a Tcl Module
|