summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-11-19 21:46:51 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-11-19 21:46:51 (GMT)
commit7f4b300e2a1f846f1aff77518a22caf720b83725 (patch)
treec662810ad5325082a002448212d340779a39626d /win
parent36353f6c04ced7f2f47bd497272b5f291f14e6ad (diff)
downloadtcl-7f4b300e2a1f846f1aff77518a22caf720b83725.zip
tcl-7f4b300e2a1f846f1aff77518a22caf720b83725.tar.gz
tcl-7f4b300e2a1f846f1aff77518a22caf720b83725.tar.bz2
Single stub library can now handle Tcl8 and Tcl9 with different MAGIC values
Diffstat (limited to 'win')
-rw-r--r--win/Makefile.in4
-rw-r--r--win/makefile.vc1
2 files changed, 5 insertions, 0 deletions
diff --git a/win/Makefile.in b/win/Makefile.in
index dacbbb5..6b9685d 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -378,6 +378,7 @@ REG_OBJS = tclWinReg.$(OBJEXT)
STUB_OBJS = \
tclStubLib.$(OBJEXT) \
+ tclStubLibCompat.$(OBJEXT) \
tclTomMathStubLib.$(OBJEXT) \
tclOOStubLib.$(OBJEXT)
@@ -505,6 +506,9 @@ tclPkgConfig.${OBJEXT}: tclPkgConfig.c
# The following objects are part of the stub library and should not be built
# as DLL objects but none of the symbols should be exported
+tclStubLibCompat.${OBJEXT}: tclStubLibCompat.c
+ $(CC) -c $(CC_SWITCHES) -DSTATIC_BUILD @DEPARG@ $(CC_OBJNAME)
+
tclStubLib.${OBJEXT}: tclStubLib.c
$(CC) -c $(CC_SWITCHES) -DSTATIC_BUILD @DEPARG@ $(CC_OBJNAME)
diff --git a/win/makefile.vc b/win/makefile.vc
index 2784140..823142f 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -448,6 +448,7 @@ TCLOBJS = $(COREOBJS) $(ZLIBOBJS) $(TOMMATHOBJS) $(PLATFORMOBJS)
TCLSTUBOBJS = \
$(TMP_DIR)\tclStubLib.obj \
+ $(TMP_DIR)\tclStubLibCompat.obj \
$(TMP_DIR)\tclTomMathStubLib.obj \
$(TMP_DIR)\tclOOStubLib.obj