Diff
Not logged in

Differences From Artifact [7c0ebdeb3d]:

To Artifact [71a0711ed6]:


825
826
827
828
829
830
831
832






833
834
835
836
837
838
839
825
826
827
828
829
830
831

832
833
834
835
836
837
838
839
840
841
842
843
844







-
+
+
+
+
+
+







!endif
!endif

# The name of the stubs library for the project being built
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

TCLSH		= "$(_TCLDIR)\bin\tclsh$(TCL_VERSION)$(SUFX).exe"
!if !exist($(TCLSH)) && $(TCL_THREADS)
TCLSH           = "$(_TCLDIR)\bin\tclsh$(TCL_VERSION)t$(SUFX).exe"
!endif
860
861
862
863
864
865
866










867
868
869
870
871
872
873
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888







+
+
+
+
+
+
+
+
+
+







COFFBASE	= "$(_TCLDIR)\win\coffbase.txt"
TCLTOOLSDIR	= $(_TCLDIR)\tools
TCL_INCLUDES	= -I"$(_TCLDIR)\generic" -I"$(_TCLDIR)\win"

!endif # TCLINSTALL

!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)

!if $(TKINSTALL) # Building against installed Tk

WISH		= "$(_TKDIR)\bin\wish$(TK_VERSION)$(SUFX).exe"