Merge 8.7

3 files changed, 13 insertions, 39 deletions

diff --git a/win/Makefile.in b/win/Makefile.in
index 1e0f8e1..9d51155 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -82,7 +82,7 @@ CFLAGS_OPTIMIZE	= @CFLAGS_OPTIMIZE@
 #CFLAGS = 		$(CFLAGS_DEBUG)
 #CFLAGS = 		$(CFLAGS_OPTIMIZE)
 #CFLAGS = 		$(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
-CFLAGS = 		@CFLAGS@ @CFLAGS_DEFAULT@ -DUNICODE -D_UNICODE -D_ATL_XP_TARGETING
+CFLAGS = 		@CFLAGS@ @CFLAGS_DEFAULT@ -D_ATL_XP_TARGETING
 
 # To compile without backward compatibility and deprecated code uncomment the
 # following
@@ -317,8 +317,8 @@ GENERIC_OBJS = \
 	tclLiteral.$(OBJEXT) \
 	tclListObj.$(OBJEXT) \
 	tclLoad.$(OBJEXT) \
+	tclMainW.$(OBJEXT) \
 	tclMain.$(OBJEXT) \
-	tclMain2.$(OBJEXT) \
 	tclNamesp.$(OBJEXT) \
 	tclNotify.$(OBJEXT) \
 	tclOO.$(OBJEXT) \
@@ -555,7 +555,7 @@ $(TCLSH): $(TCLSH_OBJS) @LIBRARIES@ $(TCL_STUB_LIB_FILE) tclsh.$(RES)
 	@VC_MANIFEST_EMBED_EXE@
 
 cat32.$(OBJEXT): cat.c
-	$(CC) -c $(CC_SWITCHES) @DEPARG@ $(CC_OBJNAME)
+	$(CC) -c $(CC_SWITCHES) -DUNICODE -D_UNICODE @DEPARG@ $(CC_OBJNAME)
 
 $(CAT32): cat32.$(OBJEXT)
 	$(CC) $(CFLAGS) cat32.$(OBJEXT) $(CC_EXENAME) $(LIBS) $(LDFLAGS_CONSOLE)
@@ -621,7 +621,7 @@ ${ZLIB_DLL_FILE}: ${TCL_STUB_LIB_FILE}
 # Special case object targets
 
 tclTestMain.${OBJEXT}: tclAppInit.c
-	$(CC) -c $(CC_SWITCHES) -DTCL_TEST -DBUILD_tcl $(EXTFLAGS) $(CC_OBJNAME) $(WIN_DIR)/tclAppInit.c
+	$(CC) -c $(CC_SWITCHES) -DTCL_TEST -DUNICODE -D_UNICODE $(EXTFLAGS) @DEPARG@ $(CC_OBJNAME)
 
 tclWinInit.${OBJEXT}: tclWinInit.c
 	$(CC) -c $(CC_SWITCHES) -DBUILD_tcl $(EXTFLAGS) @DEPARG@ $(CC_OBJNAME)
@@ -635,11 +635,11 @@ tclWinReg.${OBJEXT}: tclWinReg.c
 tclWinDde.${OBJEXT}: tclWinDde.c
 	$(CC) -c $(CC_SWITCHES) $(EXTFLAGS) @DEPARG@ $(CC_OBJNAME)
 
-testMain.${OBJEXT}: tclAppInit.c
-	$(CC) -c $(CC_SWITCHES) -DTCL_TEST @DEPARG@ $(CC_OBJNAME)
+tclAppInit.${OBJEXT}: tclAppInit.c
+	$(CC) -c $(CC_SWITCHES) $(EXTFLAGS) -DUNICODE -D_UNICODE @DEPARG@ $(CC_OBJNAME)
 
-tclMain2.${OBJEXT}: tclMain.c
-	$(CC) -c $(CC_SWITCHES) -DBUILD_tcl -DTCL_ASCII_MAIN @DEPARG@ $(CC_OBJNAME)
+tclMainW.${OBJEXT}: tclMain.c
+	$(CC) -c $(CC_SWITCHES) -DBUILD_tcl -DUNICODE -D_UNICODE @DEPARG@ $(CC_OBJNAME)
 
 # TIP #430, ZipFS Support
 tclZipfs.${OBJEXT}: $(GENERIC_DIR)/tclZipfs.c
diff --git a/win/makefile.vc b/win/makefile.vc
index 40f9e2f..8edcf3d 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -258,8 +258,8 @@ COREOBJS = \
 	$(TMP_DIR)\tclListObj.obj \

 	$(TMP_DIR)\tclLiteral.obj \

 	$(TMP_DIR)\tclLoad.obj \

+	$(TMP_DIR)\tclMainW.obj \

 	$(TMP_DIR)\tclMain.obj \

-	$(TMP_DIR)\tclMain2.obj \

 	$(TMP_DIR)\tclNamesp.obj \

 	$(TMP_DIR)\tclNotify.obj \

 	$(TMP_DIR)\tclOO.obj \

@@ -645,7 +645,6 @@ $(OUT_DIR)\tcl.nmake:
 CORE_MACHINE = $(MACHINE)

 CORE_DEBUG = $(DEBUG)

 CORE_USE_THREAD_ALLOC = $(USE_THREAD_ALLOC)

-CORE_USE_WIDECHAR_API = $(USE_WIDECHAR_API)

 <<

 

 #---------------------------------------------------------------------

@@ -731,12 +730,12 @@ gendate:
 #---------------------------------------------------------------------

 

 $(TMP_DIR)\testMain.obj: $(WIN_DIR)\tclAppInit.c

-	$(cc32) $(appcflags) /DTCL_TEST \

+	$(cc32) $(appcflags) /DTCL_TEST /DUNICODE /D_UNICODE \

 	    /DTCL_USE_STATIC_PACKAGES=$(TCL_USE_STATIC_PACKAGES) \

 	    -Fo$@ $?

 

-$(TMP_DIR)\tclMain2.obj: $(GENERICDIR)\tclMain.c

-	$(cc32) $(pkgcflags) /DTCL_ASCII_MAIN \

+$(TMP_DIR)\tclMainW.obj: $(GENERICDIR)\tclMain.c

+	$(cc32) $(pkgcflags) /DUNICODE /D_UNICODE \

 	    -Fo$@ $?

 

 $(TMP_DIR)\tclTest.obj: $(GENERICDIR)\tclTest.c

@@ -771,26 +770,18 @@ $(TMP_DIR)\tclPkgConfig.obj: $(GENERICDIR)\tclPkgConfig.c
 	-Fo$@ $?

 

 $(TMP_DIR)\tclAppInit.obj: $(WIN_DIR)\tclAppInit.c

-	$(cc32) $(appcflags) \

+	$(cc32) $(appcflags) /DUNICODE /D_UNICODE \

 	    /DTCL_USE_STATIC_PACKAGES=$(TCL_USE_STATIC_PACKAGES) \

 	    -Fo$@ $?

 

 ### The following objects should be built using the stub interfaces

 

 $(TMP_DIR)\tclWinReg.obj: $(WIN_DIR)\tclWinReg.c

-!if $(STATIC_BUILD)

-	$(cc32) $(appcflags) /DSTATIC_BUILD -Fo$@ $?

-!else

 	$(cc32) $(appcflags) /DUSE_TCL_STUBS -Fo$@ $?

-!endif

 

 

 $(TMP_DIR)\tclWinDde.obj: $(WIN_DIR)\tclWinDde.c

-!if $(STATIC_BUILD)

-	$(cc32) $(appcflags) /DSTATIC_BUILD -Fo$@ $?

-!else

 	$(cc32) $(appcflags) /DUSE_TCL_STUBS -Fo$@ $?

-!endif

 

 

 ### The following objects are part of the stub library and should not

diff --git a/win/rules.vc b/win/rules.vc
index 23a504c..391d3dd 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -1316,23 +1316,6 @@ OPTDEFINES	= $(OPTDEFINES) /DTCL_UTF_MAX=6
 # _ATL_XP_TARGETING - Newer SDK's need this to build for XP

 COMPILERFLAGS  = /D_ATL_XP_TARGETING

 

-# Following is primarily for the benefit of extensions. Tcl 8.5 builds

-# Tcl without /DUNICODE, while 8.6 builds with it defined. When building

-# an extension, it is advisable (but not mandated) to use the same Windows

-# API as the Tcl build. This is accordingly defaulted below. A particular

-# extension can override this by pre-definining USE_WIDECHAR_API.

-!ifndef USE_WIDECHAR_API

-!if $(TCL_VERSION) > 85

-USE_WIDECHAR_API = 1

-!else

-USE_WIDECHAR_API = 0

-!endif

-!endif

-

-!if $(USE_WIDECHAR_API)

-COMPILERFLAGS = $(COMPILERFLAGS) /DUNICODE /D_UNICODE

-!endif

-

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

 # Note: some extensions use PACKAGE_NAME and others use PACKAGE_TCLNAME

 # so we pass both