Index: kitdll/buildsrc/kitdll-0.0/Makefile.in ================================================================== --- kitdll/buildsrc/kitdll-0.0/Makefile.in +++ kitdll/buildsrc/kitdll-0.0/Makefile.in @@ -4,11 +4,11 @@ WISH_CFLAGS = @WISH_CFLAGS@ LDFLAGS = @LDFLAGS@ SHOBJLDFLAGS = @SHOBJLDFLAGS@ LIBS = @LIBS@ STATICLIBS = @ARCHS@ -OBJS = vfs_kitdll_data_tcl.o kitInit.o rechan.o pwb.o +OBJS = vfs_kitdll_data_tcl.o kitInit.o rechan.o pwb.o zlib.o EXTRA_OBJS = @EXTRA_OBJS@ TCLSH_NATIVE = tclsh # Default target all: libtclkit@KITDLL_LIB_VERSION@.@SHOBJEXT@ @@ -25,10 +25,11 @@ "$(TCLSH_NATIVE)" ./stringify.tcl vfs_kitdll.tcl > vfs_kitdll.tcl.h ## Extensions rechan.o: rechan.c pwb.o: pwb.c +zlib.o: zlib.c ## DLL Build libtclkit@KITDLL_LIB_VERSION@.@SHOBJEXT@: $(OBJS) $(EXTRA_OBJS) $(CC) $(CPPFLAGS) $(CFLAGS) -o libtclkit@KITDLL_LIB_VERSION@.@SHOBJEXT@ $(OBJS) $(EXTRA_OBJS) $(LDFLAGS) $(SHOBJLDFLAGS) @WHOLEARCHIVE@ $(STATICLIBS) @NOWHOLEARCHIVE@ $(LIBS) Index: kitdll/buildsrc/kitdll-0.0/kitInit.c ================================================================== --- kitdll/buildsrc/kitdll-0.0/kitInit.c +++ kitdll/buildsrc/kitdll-0.0/kitInit.c @@ -29,19 +29,25 @@ # define TCLKIT_REQUIRE_TCLEXECUTABLENAME 1 #endif #if 10 * TCL_MAJOR_VERSION + TCL_MINOR_VERSION < 85 # define KIT_INCLUDES_PWB 1 #endif +#if 10 * TCL_MAJOR_VERSION + TCL_MINOR_VERSION < 86 +# define KIT_INCLUDES_ZLIB 1 +#endif Tcl_AppInitProc Vfs_Init, Rechan_Init; Tcl_AppInitProc Vfs_kitdll_data_tcl_Init; #ifdef KIT_INCLUDES_MK4TCL Tcl_AppInitProc Mk4tcl_Init; #endif #ifdef KIT_INCLUDES_PWB Tcl_AppInitProc Pwb_Init; #endif +#ifdef KIT_INCLUDES_ZLIB +Tcl_AppInitProc Zlib_Init; +#endif #ifdef TCL_THREADS Tcl_AppInitProc Thread_Init; #endif #ifdef _WIN32 Tcl_AppInitProc Dde_Init, Registry_Init; @@ -53,17 +59,20 @@ * that interpreter to do its job. */ static char *preInitCmd = "proc tclKitInit {} {\n" "rename tclKitInit {}\n" -#ifdef KIT_INCLUDES_MK4TCL - "catch { load {} Mk4tcl }\n" +#ifdef KIT_INCLUDES_ZLIB + "catch { load {} zlib }\n" #endif "load {} tclkit::init\n" "load {} rechan\n" "load {} vfs\n" "load {} vfs_kitdll_data_tcl\n" +#ifdef KIT_INCLUDES_MK4TCL + "catch { load {} Mk4tcl }\n" +#endif #include "vfs_kitdll.tcl.h" "if {![file exists \"/.KITDLL_TCL/boot.tcl\"]} {\n" "vfs::kitdll::Mount tcl /.KITDLL_TCL\n" "set ::initVFS 1\n" "}\n" @@ -268,10 +277,13 @@ void __attribute__((constructor)) _Tclkit_Init(void) { Tcl_StaticPackage(0, "tclkit::init", Tclkit_init_Init, NULL); Tcl_StaticPackage(0, "rechan", Rechan_Init, NULL); Tcl_StaticPackage(0, "vfs", Vfs_Init, NULL); Tcl_StaticPackage(0, "vfs_kitdll_data_tcl", Vfs_kitdll_data_tcl_Init, NULL); +#ifdef KIT_INCLUDES_ZLIB + Tcl_StaticPackage(0, "zlib", Zlib_Init, NULL); +#endif #ifdef KIT_INCLUDES_MK4TCL Tcl_StaticPackage(0, "Mk4tcl", Mk4tcl_Init, NULL); #endif #ifdef KIT_INCLUDES_PWB Tcl_StaticPackage(0, "pwb", Pwb_Init, NULL);