summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--win/Makefile.in7
2 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 2b3d782..e6bafec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-12-11 Jan Nijtmans <nijtmans@users.sf.net>
+
+ * win/Makefile.in: fix Windows build (mingw) for TIP #234 implementation
+ (additionally, first make sure that zlib is available, and rename the
+ standard zdll.lib to libz.a, but at least this works so far.)
+
2008-12-11 Donal K. Fellows <dkf@users.sf.net>
* tests/zlib.test: Start of test suite for zlib command.
diff --git a/win/Makefile.in b/win/Makefile.in
index b940c21..16d7474 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -4,7 +4,7 @@
# "./configure", which is a configuration script generated by the "autoconf"
# program (constructs like "@foo@" will get replaced in the actual Makefile.
#
-# RCS: @(#) $Id: Makefile.in,v 1.137 2008/11/10 17:57:30 andreas_kupries Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.138 2008/12/11 14:32:34 nijtmans Exp $
VERSION = @TCL_VERSION@
@@ -177,7 +177,7 @@ SHLIB_LD = @SHLIB_LD@
SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ $(LIBS)
SHLIB_CFLAGS = @SHLIB_CFLAGS@
SHLIB_SUFFIX = @SHLIB_SUFFIX@
-LIBS = @LIBS@
+LIBS = @LIBS@ -lz
RMDIR = rm -rf
MKDIR = mkdir -p
@@ -284,7 +284,8 @@ GENERIC_OBJS = \
tclTrace.$(OBJEXT) \
tclUtf.$(OBJEXT) \
tclUtil.$(OBJEXT) \
- tclVar.$(OBJEXT)
+ tclVar.$(OBJEXT) \
+ tclZlib.$(OBJEXT)
TOMMATH_OBJS = \
bncore.${OBJEXT} \