Move TCLSH and TCLSH_NATIVE macros to rules.vc

FossilOrigin-Name: 5be00eaab3a850451c54e1985b7bc3cdf56fdc04edb12e76b849070b41efcc98

2 files changed, 20 insertions, 18 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

diff --git a/win/rules.vc b/win/rules.vc
index 47f1608..5afcf5e 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -829,7 +829,12 @@ OUT_DIR	    = $(TMP_DIR)
 STUBPREFIX      = $(PROJECT)stub

 

 # Set up paths to various Tcl executables and libraries needed by extensions

-!if "$(PROJECT)" != "tcl"

+!if "$(PROJECT)" == "tcl"

+

+TCLSHNAME = $(PROJECT)sh$(TCL_VERSION)$(SUFX).exe

+TCLSH		= $(OUT_DIR)\$(TCLSHNAME)

+

+!else # $(PROJECT) is not "tcl"

 

 !if $(TCLINSTALL) # Building against an installed Tcl

 

@@ -865,6 +870,16 @@ TCL_INCLUDES	= -I"$(_TCLDIR)\generic" -I"$(_TCLDIR)\win"
 

 !endif $(PROJECT) != "tcl"

 

+# We need a tclsh that will run on the host machine as part of the 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

+

 # Do the same for Tk extensions that require the Tk libraries

 !if defined(PROJECT_REQUIRES_TK)