diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-02-15 13:51:02 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-02-15 13:51:02 (GMT) |
| commit | dff07b745999cb6df94a2fbe5ef2a22a9f7e24f3 (patch) | |
| tree | 92a44d45fbadc440d9882769c78a5f957d10bc2b /win | |
| parent | b5898cc4d07090ca5d742abc116dd57baa086abc (diff) | |
| download | tcl-dff07b745999cb6df94a2fbe5ef2a22a9f7e24f3.zip tcl-dff07b745999cb6df94a2fbe5ef2a22a9f7e24f3.tar.gz tcl-dff07b745999cb6df94a2fbe5ef2a22a9f7e24f3.tar.bz2 | |
Add nmakehlp.exe (for AMD64) to distribution, and make it usable in rules-ext.vc too
Diffstat (limited to 'win')
| -rw-r--r-- | win/makefile.vc | 1 | ||||
| -rw-r--r-- | win/rules-ext.vc | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/win/makefile.vc b/win/makefile.vc index a4de4c2..395a9ca 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -945,6 +945,7 @@ install-libraries: tclConfig tcl-nmake install-msgs install-tzdata @$(CPY) "$(WIN_DIR)\rules.vc" "$(LIB_INSTALL_DIR)\nmake\"
@$(CPY) "$(WIN_DIR)\targets.vc" "$(LIB_INSTALL_DIR)\nmake\"
@$(CPY) "$(WIN_DIR)\nmakehlp.c" "$(LIB_INSTALL_DIR)\nmake\"
+ @$(CPY) "$(WIN_DIR)\x86_64-w64-mingw32-nmakehlp.exe" "$(LIB_INSTALL_DIR)\nmake\"
@$(CPY) "$(OUT_DIR)\tcl.nmake" "$(LIB_INSTALL_DIR)\nmake\"
@echo Installing package http 1.0 (obsolete)
@$(CPY) "$(ROOT)\library\http1.0\*.tcl" \
diff --git a/win/rules-ext.vc b/win/rules-ext.vc index 6da5689..6d31a03 100644 --- a/win/rules-ext.vc +++ b/win/rules-ext.vc @@ -31,8 +31,13 @@ macro to the name of the project makefile. # We extract version numbers using the nmakehlp program. For now use
# the local copy of nmakehlp. Once we locate Tcl, we will use that
# one if it is newer.
+!if "$(MACHINE)" == "IX86" || "$(MACHINE)" == "$(NATIVE_ARCH)"
!if [$(CC) -nologo -DNDEBUG "nmakehlp.c" -link -subsystem:console > nul]
!endif
+!else
+!if [copy x86_64-w64-mingw32-nmakehlp.exe nmakehlp.exe >NUL]
+!endif
+!endif
# First locate the Tcl directory that we are working with.
!if "$(TCLDIR)" != ""
|