diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-04-12 15:24:08 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-04-12 15:24:08 (GMT) |
| commit | 37907b7e83bac9c787125b72693d4085c8cdcd24 (patch) | |
| tree | df02e21b59b990021a36111383481c05f3d249c5 /win | |
| parent | b10eea39c1023da6b2f19d3d5bafa13482fe5300 (diff) | |
| parent | 4ff3c3cf90b83dde3d417f6aea0e88e8f15009c5 (diff) | |
| download | tcl-37907b7e83bac9c787125b72693d4085c8cdcd24.zip tcl-37907b7e83bac9c787125b72693d4085c8cdcd24.tar.gz tcl-37907b7e83bac9c787125b72693d4085c8cdcd24.tar.bz2 | |
Merge 8.6. Don't change ActiveCodePage on Windows (yet), that's for 9.0
Diffstat (limited to 'win')
| -rw-r--r-- | win/Makefile.in | 4 | ||||
| -rw-r--r-- | win/makefile.vc | 4 | ||||
| -rw-r--r-- | win/tclsh.exe.manifest.in | 4 |
3 files changed, 4 insertions, 8 deletions
diff --git a/win/Makefile.in b/win/Makefile.in index e71c5f3..f9d4e61 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -1100,12 +1100,12 @@ $(GENERIC_DIR)/tclStubInit.c: $(GENERIC_DIR)/tcl.decls \ @echo "This warning can be safely ignored, do not report as a bug!" genstubs: - $(TCL_EXE) "$(ROOT_DIR_NATIVE)/tools/genStubs.tcl" \ + $(TCL_EXE) -encoding utf-8 "$(ROOT_DIR_NATIVE)/tools/genStubs.tcl" \ "$(GENERIC_DIR_NATIVE)" \ "$(GENERIC_DIR_NATIVE)/tcl.decls" \ "$(GENERIC_DIR_NATIVE)/tclInt.decls" \ "$(GENERIC_DIR_NATIVE)/tclTomMath.decls" - $(TCL_EXE) "$(ROOT_DIR_NATIVE)/tools/genStubs.tcl" \ + $(TCL_EXE) -encoding utf-8 "$(ROOT_DIR_NATIVE)/tools/genStubs.tcl" \ "$(GENERIC_DIR_NATIVE)" \ "$(GENERIC_DIR_NATIVE)/tclOO.decls" diff --git a/win/makefile.vc b/win/makefile.vc index 8720b66..d2b2a69 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -707,10 +707,10 @@ genstubs: !if !exist($(TCLSH))
@echo Build tclsh first!
!else
- $(TCLSH) $(TOOLSDIR:\=/)/genStubs.tcl $(GENERICDIR:\=/) \
+ $(TCLSH) -encoding utf-8 $(TOOLSDIR:\=/)/genStubs.tcl $(GENERICDIR:\=/) \
$(GENERICDIR:\=/)/tcl.decls $(GENERICDIR:\=/)/tclInt.decls \
$(GENERICDIR:\=/)/tclTomMath.decls
- $(TCLSH) $(TOOLSDIR:\=/)/genStubs.tcl $(GENERICDIR:\=/) \
+ $(TCLSH) -encoding utf-8 $(TOOLSDIR:\=/)/genStubs.tcl $(GENERICDIR:\=/) \
$(GENERICDIR:\=/)/tclOO.decls
!endif
diff --git a/win/tclsh.exe.manifest.in b/win/tclsh.exe.manifest.in index dc652e6..dd8a7c5 100644 --- a/win/tclsh.exe.manifest.in +++ b/win/tclsh.exe.manifest.in @@ -35,10 +35,6 @@ xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings"> <dpiAware>true</dpiAware> </asmv3:windowsSettings> - <asmv3:windowsSettings - xmlns="http://schemas.microsoft.com/SMI/2019/WindowsSettings"> - <activeCodePage>UTF-8</activeCodePage> - </asmv3:windowsSettings> </asmv3:application> <dependency> <dependentAssembly> |