diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-07-09 12:41:46 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-07-09 12:41:46 (GMT) |
| commit | 3f0dc94455d09a6beaad1a806ba3f6531e49909f (patch) | |
| tree | 5a37211c2c31202175901bbdbe3b6efc4b9d9dd8 /win | |
| parent | 6cc442596661758ad0e028898e046a259a7ae37f (diff) | |
| parent | 8b67593cb6cdc934c862eb50a2bbb70713cc5a13 (diff) | |
| download | tcl-3f0dc94455d09a6beaad1a806ba3f6531e49909f.zip tcl-3f0dc94455d09a6beaad1a806ba3f6531e49909f.tar.gz tcl-3f0dc94455d09a6beaad1a806ba3f6531e49909f.tar.bz2 | |
Rebase to 8.7
Diffstat (limited to 'win')
| -rw-r--r-- | win/makefile.vc | 3 | ||||
| -rw-r--r-- | win/rules.vc | 9 |
2 files changed, 1 insertions, 11 deletions
diff --git a/win/makefile.vc b/win/makefile.vc index b1a8b6a..d086abf 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,noembed,nothreads,pdbs,profile,static,symbols,thrdalloc,time64bit,unchecked,utf16,none
+# OPTS=msvcrt,noembed,nothreads,pdbs,profile,static,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.
@@ -80,7 +80,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 d8b3b12..3a95aab 100644 --- a/win/rules.vc +++ b/win/rules.vc @@ -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
@@ -887,11 +886,6 @@ TCL_BUILD_FOR = 8 !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
@@ -1451,9 +1445,6 @@ 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
-!endif
!if "$(TCL_BUILD_FOR)" == "8"
OPTDEFINES = $(OPTDEFINES) /DTCL_MAJOR_VERSION=8
!endif
|