No longer support "OPTS=utf16" in makefile.vc/rules.vc

2 files changed, 31 insertions, 13 deletions

diff --git a/win/makefile.vc b/win/makefile.vc
index 5df599c..8ee2fcb 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -52,7 +52,7 @@
 # turn on the 64-bit compiler, if your SDK has it.

 #

 # Basic macros and options usable on the commandline (see rules.vc for more info):

-#	OPTS=msvcrt,nothreads,pdbs,profile,static,staticpkg,symbols,thrdalloc,time64bit,unchecked,utf16,none

+#	OPTS=msvcrt,nothreads,pdbs,profile,static,staticpkg,symbols,thrdalloc,time64bit,unchecked,none

 #		Sets special options for the core.  The default is for none.

 #		Any combination of the above may be used (comma separated).

 #		'none' will over-ride everything to nothing.

@@ -77,7 +77,6 @@
 #		unchecked = Allows a symbols build to not use the debug

 #			    enabled runtime (msvcrt.dll not msvcrtd.dll

 #			    or libcmt.lib not libcmtd.lib).

-#		utf16     = Forces a build using UTF-16 representation internally.

 #

 #	STATS=compdbg,memdbg,none

 #		Sets optional memory and bytecode compiler debugging code added

diff --git a/win/rules.vc b/win/rules.vc
index 0dfe609..3a95aab 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -24,7 +24,7 @@ _RULES_VC = 1
 # For modifications that are not backward-compatible, you *must* change

 # the major version.

 RULES_VERSION_MAJOR = 1

-RULES_VERSION_MINOR = 10

+RULES_VERSION_MINOR = 11

 

 # The PROJECT macro must be defined by parent makefile.

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

@@ -816,7 +816,6 @@ DOTSEPARATED=$(DOTSEPARATED:b=.)
 #           configuration (ignored for Tcl itself)

 # _USE_64BIT_TIME_T - forces a build using 64-bit time_t for 32-bit build

 #           (CRT library should support this, not needed for Tcl 9.x)

-# TCL_UTF_MAX=3 - forces a build using UTF-16 internally (not recommended).

 # Further, LINKERFLAGS are modified based on above.

 

 # Default values for all the above

@@ -877,16 +876,16 @@ TCL_THREADS = 0
 USE_THREAD_ALLOC= 0

 !endif

 

+!if [nmakehlp -f $(OPTS) "tcl8"]

+!message *** Build for Tcl8

+TCL_BUILD_FOR = 8

+!endif

+

 !if $(TCL_MAJOR_VERSION) == 8

 !if [nmakehlp -f $(OPTS) "time64bit"]

 !message *** Force 64-bit time_t

 _USE_64BIT_TIME_T = 1

 !endif

-

-!if [nmakehlp -f $(OPTS) "utf16"]

-!message *** Force UTF-16 internally

-TCL_UTF_MAX = 3

-!endif

 !endif

 

 # Yes, it's weird that the "symbols" option controls DEBUG and

@@ -1146,7 +1145,11 @@ TCLLIBNAME	= $(PROJECT)$(VERSION)$(SUFX).$(EXT)
 TCLLIB		= $(OUT_DIR)\$(TCLLIBNAME)

 TCLSCRIPTZIP    = $(OUT_DIR)\$(TCLSCRIPTZIPNAME)

 

+!if $(TCL_MAJOR_VERSION) == 8

 TCLSTUBLIBNAME	= $(STUBPREFIX)$(VERSION).lib

+!else

+TCLSTUBLIBNAME	= $(STUBPREFIX).lib

+!endif

 TCLSTUBLIB	= $(OUT_DIR)\$(TCLSTUBLIBNAME)

 TCL_INCLUDES    = -I"$(WIN_DIR)" -I"$(GENERICDIR)"

 

@@ -1162,7 +1165,11 @@ TCLSH		= $(_TCLDIR)\bin\tclsh$(TCL_VERSION)$(SUFX:t=).exe
 TCLSH           = $(_TCLDIR)\bin\tclsh$(TCL_VERSION)t$(SUFX:t=).exe

 !endif

 

+!if $(TCL_MAJOR_VERSION) == 8

 TCLSTUBLIB	= $(_TCLDIR)\lib\tclstub$(TCL_VERSION).lib

+!else

+TCLSTUBLIB	= $(_TCLDIR)\lib\tclstub.lib

+!endif

 TCLIMPLIB	= $(_TCLDIR)\lib\tcl$(TCL_VERSION)$(SUFX:t=).lib

 # When building extensions, may be linking against Tcl that does not add

 # "t" suffix (e.g. 8.5 or 8.7). If lib not found check for that possibility.

@@ -1182,7 +1189,11 @@ TCLSH		= $(_TCLDIR)\win\$(BUILDDIRTOP)\tclsh$(TCL_VERSION)$(SUFX:t=).exe
 !if !exist($(TCLSH))

 TCLSH		= $(_TCLDIR)\win\$(BUILDDIRTOP)\tclsh$(TCL_VERSION)t$(SUFX:t=).exe

 !endif

+!if $(TCL_MAJOR_VERSION) == 8

 TCLSTUBLIB	= $(_TCLDIR)\win\$(BUILDDIRTOP)\tclstub$(TCL_VERSION).lib

+!else

+TCLSTUBLIB	= $(_TCLDIR)\win\$(BUILDDIRTOP)\tclstub.lib

+!endif

 TCLIMPLIB	= $(_TCLDIR)\win\$(BUILDDIRTOP)\tcl$(TCL_VERSION)$(SUFX:t=).lib

 # When building extensions, may be linking against Tcl that does not add

 # "t" suffix (e.g. 8.5 or 8.7). If lib not found check for that possibility.

@@ -1198,7 +1209,11 @@ TCL_INCLUDES	= -I"$(_TCLDIR)\generic" -I"$(_TCLDIR)\win"
 

 !endif # TCLINSTALL

 

+!if !$(STATIC_BUILD) && "$(TCL_BUILD_FOR)" == "8"

+tcllibs = "$(TCLSTUBLIB)"

+!else

 tcllibs = "$(TCLSTUBLIB)" "$(TCLIMPLIB)"

+!endif

 

 !endif # $(DOING_TCL)

 

@@ -1218,7 +1233,7 @@ WISHNAMEPREFIX = wish
 WISHNAME = $(WISHNAMEPREFIX)$(TK_VERSION)$(SUFX).exe

 TKLIBNAME8	= tk$(TK_VERSION)$(SUFX).$(EXT)

 TKLIBNAME9	= tcl9tk$(TK_VERSION)$(SUFX).$(EXT)

-!if $(TCL_MAJOR_VERSION) == 8

+!if $(TCL_MAJOR_VERSION) == 8 || "$(TCL_BUILD_FOR)" == "8"

 TKLIBNAME	= tk$(TK_VERSION)$(SUFX).$(EXT)

 TKIMPLIBNAME	= tk$(TK_VERSION)$(SUFX).lib

 !else

@@ -1275,14 +1290,18 @@ tklibs = "$(TKSTUBLIB)" "$(TKIMPLIB)"
 PRJIMPLIB	= $(OUT_DIR)\$(PROJECT)$(VERSION)$(SUFX).lib

 PRJLIBNAME8	= $(PROJECT)$(VERSION)$(SUFX).$(EXT)

 PRJLIBNAME9	= tcl9$(PROJECT)$(VERSION)$(SUFX).$(EXT)

-!if $(TCL_MAJOR_VERSION) == 8

+!if $(TCL_MAJOR_VERSION) == 8 || "$(TCL_BUILD_FOR)" == "8"

 PRJLIBNAME	= $(PRJLIBNAME8)

 !else

 PRJLIBNAME	= $(PRJLIBNAME9)

 !endif

 PRJLIB		= $(OUT_DIR)\$(PRJLIBNAME)

 

+!if $(TCL_MAJOR_VERSION) == 8

 PRJSTUBLIBNAME	= $(STUBPREFIX)$(VERSION).lib

+!else

+PRJSTUBLIBNAME	= $(STUBPREFIX).lib

+!endif

 PRJSTUBLIB	= $(OUT_DIR)\$(PRJSTUBLIBNAME)

 

 # If extension parent makefile has not defined a resource definition file,

@@ -1426,8 +1445,8 @@ OPTDEFINES	= $(OPTDEFINES) /D_USE_64BIT_TIME_T=1
 # _ATL_XP_TARGETING - Newer SDK's need this to build for XP

 COMPILERFLAGS  = /D_ATL_XP_TARGETING

 !endif

-!if "$(TCL_UTF_MAX)" == "3"

-OPTDEFINES	= $(OPTDEFINES) /DTCL_UTF_MAX=3

+!if "$(TCL_BUILD_FOR)" == "8"

+OPTDEFINES	= $(OPTDEFINES) /DTCL_MAJOR_VERSION=8

 !endif

 

 # Like the TEA system only set this non empty for non-Tk extensions