diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-10-12 17:54:42 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-10-12 17:54:42 (GMT) |
| commit | cc945fabb73c3733169f7441140a7b2f2c57572c (patch) | |
| tree | 3641ec6151d50a51e2507d6e106a5c2f5a0025e1 /unix/Makefile.in | |
| parent | 621251ae2e2fd50bbee979906ce537aae53f1e33 (diff) | |
| download | tcl-cc945fabb73c3733169f7441140a7b2f2c57572c.zip tcl-cc945fabb73c3733169f7441140a7b2f2c57572c.tar.gz tcl-cc945fabb73c3733169f7441140a7b2f2c57572c.tar.bz2 | |
Fix test for UNICODE in win/tclAppInit.c. No longer check for "tclsh install", because tclsh is not compiled with that. Fix minizip.c compilation on systems without open64()
Diffstat (limited to 'unix/Makefile.in')
| -rw-r--r-- | unix/Makefile.in | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index d5324dc..487ae61 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -691,6 +691,7 @@ ${LIB_FILE}: ${STUB_LIB_FILE} ${OBJS} ${TCL_ZIP_FILE} @MAKE_LIB@ ifeq (${ZIPFS_BUILD},1) cat ${TCL_ZIP_FILE} >> ${LIB_FILE} + ${NATIVE_ZIP} -A ${LIB_FILE} endif ${STUB_LIB_FILE}: ${STUB_LIB_OBJS} @@ -1834,7 +1835,7 @@ deflate.$(HOST_OBJEXT): $(HOST_CC) -o $@ -I$(ZLIB_DIR) -c $(ZLIB_DIR)/deflate.c ioapi.$(HOST_OBJEXT): - $(HOST_CC) -o $@ -I$(ZLIB_DIR) -I$(ZLIB_DIR)/contrib/minizip -c \ + $(HOST_CC) -o $@ -DIOAPI_NO_64 -I$(ZLIB_DIR) -I$(ZLIB_DIR)/contrib/minizip -c \ $(ZLIB_DIR)/contrib/minizip/ioapi.c infback.$(HOST_OBJEXT): @@ -1863,7 +1864,7 @@ zutil.$(HOST_OBJEXT): $(HOST_CC) -o $@ -I$(ZLIB_DIR) -c $(ZLIB_DIR)/zutil.c minizip.$(HOST_OBJEXT): - $(HOST_CC) -o $@ -I$(ZLIB_DIR) -I$(ZLIB_DIR)/contrib/minizip -c \ + $(HOST_CC) -o $@ -DIOAPI_NO_64 -I$(ZLIB_DIR) -I$(ZLIB_DIR)/contrib/minizip -c \ $(ZLIB_DIR)/contrib/minizip/minizip.c minizip${HOST_EXEEXT}: $(MINIZIP_OBJS) |