summaryrefslogtreecommitdiffstats
path: root/win/Makefile.in
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2018-10-24 21:22:18 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2018-10-24 21:22:18 (GMT)
commitc69ccc749e9de9c32a0e0c7b6f733b8e64e1209f (patch)
tree779dbba13e49b08c336fac41b69c470e523fd878 /win/Makefile.in
parent983b95bdbd0cb4e1e9a58f482ab46ad7d5617abe (diff)
downloadtcl-c69ccc749e9de9c32a0e0c7b6f733b8e64e1209f.zip
tcl-c69ccc749e9de9c32a0e0c7b6f733b8e64e1209f.tar.gz
tcl-c69ccc749e9de9c32a0e0c7b6f733b8e64e1209f.tar.bz2
Backport "registry" version 1.3.3, so all active branches now have the same registry version.
(this commit must -eventually- be merge-marked to core-8-6-branch, since everything is there already)
Diffstat (limited to 'win/Makefile.in')
-rw-r--r--win/Makefile.in6
1 files changed, 3 insertions, 3 deletions
diff --git a/win/Makefile.in b/win/Makefile.in
index d9b52fa..6d1ce95 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -495,7 +495,7 @@ tclAppInit.${OBJEXT} : tclAppInit.c
# The following objects should be built using the stub interfaces
tclWinReg.${OBJEXT} : tclWinReg.c
- $(CC) -c $(CC_SWITCHES) -DUSE_TCL_STUBS @DEPARG@ $(CC_OBJNAME)
+ $(CC) -c $(CC_SWITCHES) -DUNICODE -D_UNICODE -DUSE_TCL_STUBS @DEPARG@ $(CC_OBJNAME)
tclWinDde.${OBJEXT} : tclWinDde.c
$(CC) -c $(CC_SWITCHES) -DUSE_TCL_STUBS @DEPARG@ $(CC_OBJNAME)
@@ -710,13 +710,13 @@ test: binaries $(TCLTEST)
TCL_LIBRARY="$(LIBRARY_DIR)"; export TCL_LIBRARY; \
./$(TCLTEST) "$(ROOT_DIR_NATIVE)/tests/all.tcl" $(TESTFLAGS) \
-load "package ifneeded dde 1.3.3 [list load [file normalize ${DDE_DLL_FILE}] dde]; \
- package ifneeded registry 1.2.2 [list load [file normalize ${REG_DLL_FILE}] registry]" | ./$(CAT32)
+ package ifneeded registry 1.3.3 [list load [file normalize ${REG_DLL_FILE}] registry]" | ./$(CAT32)
# Useful target to launch a built tcltest with the proper path,...
runtest: binaries $(TCLTEST)
@TCL_LIBRARY="$(LIBRARY_DIR)"; export TCL_LIBRARY; \
./$(TCLTEST) $(TESTFLAGS) -load "package ifneeded dde 1.3.3 [list load [file normalize ${DDE_DLL_FILE}] dde]; \
- package ifneeded registry 1.2.2 [list load [file normalize ${REG_DLL_FILE}] registry]" $(SCRIPT)
+ package ifneeded registry 1.3.3 [list load [file normalize ${REG_DLL_FILE}] registry]" $(SCRIPT)
# This target can be used to run tclsh from the build directory via
# `make shell SCRIPT=foo.tcl`