diff options
| author | apnadkarni <apnmbx-wits@yahoo.com> | 2017-09-25 13:45:34 (GMT) |
|---|---|---|
| committer | apnadkarni <apnmbx-wits@yahoo.com> | 2017-09-25 13:45:34 (GMT) |
| commit | b5e3779cf2ab3f4316b4229e164dc1e58c0c1611 (patch) | |
| tree | d5aeadaa5c35b88e285cd91fe8907b4fcd4ed2c9 /win/makefile.vc | |
| parent | 56e2bd0be497799c08838affb375239aebfbf16d (diff) | |
| download | tcl-b5e3779cf2ab3f4316b4229e164dc1e58c0c1611.zip tcl-b5e3779cf2ab3f4316b4229e164dc1e58c0c1611.tar.gz tcl-b5e3779cf2ab3f4316b4229e164dc1e58c0c1611.tar.bz2 | |
Move TCLSH and TCLSH_NATIVE macros to rules.vc
Diffstat (limited to 'win/makefile.vc')
| -rw-r--r-- | win/makefile.vc | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/win/makefile.vc b/win/makefile.vc index e36f0e9..2ef453b 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -226,9 +226,6 @@ TCLLIB = $(OUT_DIR)\$(TCLLIBNAME) TCLSTUBLIBNAME = $(STUBPREFIX)$(VERSION).lib
TCLSTUBLIB = $(OUT_DIR)\$(TCLSTUBLIBNAME)
-TCLSHNAME = $(PROJECT)sh$(VERSION)$(SUFX).exe
-TCLSH = $(OUT_DIR)\$(TCLSHNAME)
-
TCLREGLIBNAME = $(PROJECT)reg$(REGVERSION)$(SUFX:t=).$(EXT)
TCLREGLIB = $(OUT_DIR)\$(TCLREGLIBNAME)
@@ -238,15 +235,6 @@ TCLDDELIB = $(OUT_DIR)\$(TCLDDELIBNAME) TCLTEST = $(OUT_DIR)\$(PROJECT)test.exe
CAT32 = $(OUT_DIR)\cat32.exe
-# Can we run what we build? IX86 runs on all architectures.
-!ifndef TCLSH_NATIVE
-!if "$(MACHINE)" == "IX86" || "$(MACHINE)" == "$(NATIVE_ARCH)"
-TCLSH_NATIVE = $(TCLSH)
-!else
-!error You must explicitly set TCLSH_NATIVE for cross-compilation
-!endif
-!endif
-
TCLSHOBJS = \
$(TMP_DIR)\tclAppInit.obj \
!if !$(STATIC_BUILD)
@@ -772,6 +760,8 @@ install-docs: @$(CPY) "$(HELPCNT)" "$(DOC_INSTALL_DIR)\"
!endif
+# "emacs font-lock highlighting fix
+
#---------------------------------------------------------------------
# Build tclConfig.sh for the TEA build system.
#---------------------------------------------------------------------
@@ -968,7 +958,8 @@ $(TCLOBJS) #---------------------------------------------------------------------
-# Implicit rules. A limitation exists with nmake that requires that
+# Implicit rules that are not covered by the common ones defined in
+# rules.vc. A limitation exists with nmake that requires that
# source directory can not contain spaces in the path. This an
# absolute.
#---------------------------------------------------------------------
@@ -1011,8 +1002,6 @@ install-binaries: @echo Installing $(TCLSTUBLIBNAME)
@$(CPY) "$(TCLSTUBLIB)" "$(LIB_INSTALL_DIR)\"
-#" emacs fix
-
install-libraries: tclConfig install-msgs install-tzdata
@if not exist "$(SCRIPT_INSTALL_DIR)$(NULL)" \
$(MKDIR) "$(SCRIPT_INSTALL_DIR)"
@@ -1094,8 +1083,6 @@ install-libraries: tclConfig install-msgs install-tzdata @$(CPY) "$(ROOT)\library\encoding\*.enc" \
"$(SCRIPT_INSTALL_DIR)\encoding\"
-#" emacs fix
-
install-tzdata:
@echo Installing time zone data
@set TCL_LIBRARY=$(ROOT:\=/)/library
|