Overview
Comment: | Added zlib support to KitDLL (fixing test 13-zip for KitDLL) |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: | 966a87d8d1c037ed49c8cb6e29751a68bc8e51a1 |
User & Date: | rkeene on 2010-10-05 17:49:44 |
Other Links: | manifest | tags |
Context
2010-10-06
| ||
02:52 | Updated to include Zlib headers if we found Zlib library for KitDLL check-in: 5518df71a4 user: rkeene tags: trunk | |
2010-10-05
| ||
17:49 | Added zlib support to KitDLL (fixing test 13-zip for KitDLL) check-in: 966a87d8d1 user: rkeene tags: trunk | |
16:58 | Began adding zlib to KitDLL check-in: db7ab5ff29 user: rkeene tags: trunk | |
Changes
Modified kitdll/buildsrc/kitdll-0.0/Makefile.in from [a127167bc9] to [024981b5ad].
2 2 CFLAGS = @CFLAGS@ @SHOBJFLAGS@ -Wall 3 3 CPPFLAGS = @CPPFLAGS@ @DEFS@ -DKITDLL_MAKE_LOADABLE=1 4 4 WISH_CFLAGS = @WISH_CFLAGS@ 5 5 LDFLAGS = @LDFLAGS@ 6 6 SHOBJLDFLAGS = @SHOBJLDFLAGS@ 7 7 LIBS = @LIBS@ 8 8 STATICLIBS = @ARCHS@ 9 -OBJS = vfs_kitdll_data_tcl.o kitInit.o rechan.o pwb.o 9 +OBJS = vfs_kitdll_data_tcl.o kitInit.o rechan.o pwb.o zlib.o 10 10 EXTRA_OBJS = @EXTRA_OBJS@ 11 11 TCLSH_NATIVE = tclsh 12 12 13 13 # Default target 14 14 all: libtclkit@KITDLL_LIB_VERSION@.@SHOBJEXT@ 15 15 16 16 # Build targets ................................................................................ 23 23 kitInit.o: kitInit.c vfs_kitdll.tcl.h 24 24 vfs_kitdll.tcl.h: vfs_kitdll.tcl 25 25 "$(TCLSH_NATIVE)" ./stringify.tcl vfs_kitdll.tcl > vfs_kitdll.tcl.h 26 26 27 27 ## Extensions 28 28 rechan.o: rechan.c 29 29 pwb.o: pwb.c 30 +zlib.o: zlib.c 30 31 31 32 ## DLL Build 32 33 libtclkit@KITDLL_LIB_VERSION@.@SHOBJEXT@: $(OBJS) $(EXTRA_OBJS) 33 34 $(CC) $(CPPFLAGS) $(CFLAGS) -o libtclkit@KITDLL_LIB_VERSION@.@SHOBJEXT@ $(OBJS) $(EXTRA_OBJS) $(LDFLAGS) $(SHOBJLDFLAGS) @WHOLEARCHIVE@ $(STATICLIBS) @NOWHOLEARCHIVE@ $(LIBS) 34 35 35 36 # Test driver 36 37 tclsh.o: tclsh.c
Modified kitdll/buildsrc/kitdll-0.0/kitInit.c from [5dad1f22e3] to [d13061de12].
27 27 #endif 28 28 #if 10 * TCL_MAJOR_VERSION + TCL_MINOR_VERSION < 85 29 29 # define TCLKIT_REQUIRE_TCLEXECUTABLENAME 1 30 30 #endif 31 31 #if 10 * TCL_MAJOR_VERSION + TCL_MINOR_VERSION < 85 32 32 # define KIT_INCLUDES_PWB 1 33 33 #endif 34 +#if 10 * TCL_MAJOR_VERSION + TCL_MINOR_VERSION < 86 35 +# define KIT_INCLUDES_ZLIB 1 36 +#endif 34 37 35 38 Tcl_AppInitProc Vfs_Init, Rechan_Init; 36 39 Tcl_AppInitProc Vfs_kitdll_data_tcl_Init; 37 40 #ifdef KIT_INCLUDES_MK4TCL 38 41 Tcl_AppInitProc Mk4tcl_Init; 39 42 #endif 40 43 #ifdef KIT_INCLUDES_PWB 41 44 Tcl_AppInitProc Pwb_Init; 42 45 #endif 46 +#ifdef KIT_INCLUDES_ZLIB 47 +Tcl_AppInitProc Zlib_Init; 48 +#endif 43 49 #ifdef TCL_THREADS 44 50 Tcl_AppInitProc Thread_Init; 45 51 #endif 46 52 #ifdef _WIN32 47 53 Tcl_AppInitProc Dde_Init, Registry_Init; 48 54 #endif 49 55 ................................................................................ 51 57 * This Tcl code is invoked whenever Tcl_Init() is called on an 52 58 * interpreter. It should mount up the VFS and make everything ready for 53 59 * that interpreter to do its job. 54 60 */ 55 61 static char *preInitCmd = 56 62 "proc tclKitInit {} {\n" 57 63 "rename tclKitInit {}\n" 58 -#ifdef KIT_INCLUDES_MK4TCL 59 - "catch { load {} Mk4tcl }\n" 64 +#ifdef KIT_INCLUDES_ZLIB 65 + "catch { load {} zlib }\n" 60 66 #endif 61 67 "load {} tclkit::init\n" 62 68 "load {} rechan\n" 63 69 "load {} vfs\n" 64 70 "load {} vfs_kitdll_data_tcl\n" 71 +#ifdef KIT_INCLUDES_MK4TCL 72 + "catch { load {} Mk4tcl }\n" 73 +#endif 65 74 #include "vfs_kitdll.tcl.h" 66 75 "if {![file exists \"/.KITDLL_TCL/boot.tcl\"]} {\n" 67 76 "vfs::kitdll::Mount tcl /.KITDLL_TCL\n" 68 77 "set ::initVFS 1\n" 69 78 "}\n" 70 79 "set f [open \"/.KITDLL_TCL/boot.tcl\"]\n" 71 80 "set s [read $f]\n" ................................................................................ 266 275 * are ready to be used when invoked. 267 276 */ 268 277 void __attribute__((constructor)) _Tclkit_Init(void) { 269 278 Tcl_StaticPackage(0, "tclkit::init", Tclkit_init_Init, NULL); 270 279 Tcl_StaticPackage(0, "rechan", Rechan_Init, NULL); 271 280 Tcl_StaticPackage(0, "vfs", Vfs_Init, NULL); 272 281 Tcl_StaticPackage(0, "vfs_kitdll_data_tcl", Vfs_kitdll_data_tcl_Init, NULL); 282 +#ifdef KIT_INCLUDES_ZLIB 283 + Tcl_StaticPackage(0, "zlib", Zlib_Init, NULL); 284 +#endif 273 285 #ifdef KIT_INCLUDES_MK4TCL 274 286 Tcl_StaticPackage(0, "Mk4tcl", Mk4tcl_Init, NULL); 275 287 #endif 276 288 #ifdef KIT_INCLUDES_PWB 277 289 Tcl_StaticPackage(0, "pwb", Pwb_Init, NULL); 278 290 #endif 279 291 #ifdef TCL_THREADS