Index: README ================================================================== --- README +++ README @@ -168,10 +168,11 @@ On Windows we also need this: 1. RC Resource compiler : e.g. i686-pc-mingw32-windres + Kitsh Configure Options: 1. --enable-kit-storage={zip|mk4|auto} Specify which type of storage to use with the Tclkit. The default is to auto-detect. Auto-detection uses Mk4 if Index: zlib/build.sh ================================================================== --- zlib/build.sh +++ zlib/build.sh @@ -15,13 +15,11 @@ SRC="src/zlib-${ZLIBVERS}.tar.gz" SRCURL="http://sourceforge.net/projects/libpng/files/zlib/${ZLIBVERS}/zlib-${ZLIBVERS}.tar.gz/download" BUILDDIR="$(pwd)/build/zlib-${ZLIBVERS}" OUTDIR="$(pwd)/out" INSTDIR="$(pwd)/inst" -PATCHSCRIPTDIR="$(pwd)/patchscripts" -PATCHDIR="$(pwd)/patches" -export ZLIBVERS SRC SRCURL BUILDDIR OUTDIR INSTDIR PATCHSCRIPTDIR PATCHDIR +export ZLIBVERS SRC SRCURL BUILDDIR OUTDIR INSTDIR # Set configure options for this sub-project LDFLAGS="${LDFLAGS} ${KC_ZLIB_LDFLAGS}" CFLAGS="${CFLAGS} ${KC_ZLIB_CFLAGS}" CPPFLAGS="${CPPFLAGS} ${KC_ZLIB_CPPFLAGS}" DELETED zlib/patches/1.2.8/zlib-1.2.8-enable-configure.diff Index: zlib/patches/1.2.8/zlib-1.2.8-enable-configure.diff ================================================================== --- zlib/patches/1.2.8/zlib-1.2.8-enable-configure.diff +++ /dev/null @@ -1,14 +0,0 @@ -diff -uNr zlib-1.2.8.orig/configure zlib-1.2.8/configure ---- zlib-1.2.8.orig/configure 2013-03-23 22:30:09 -0700 -+++ zlib-1.2.8/configure 2013-11-05 00:33:39 -0800 -@@ -191,10 +191,6 @@ - CYGWIN* | Cygwin* | cygwin* | OS/2*) - EXE='.exe' ;; - MINGW* | mingw*) --# temporary bypass -- rm -f $test.[co] $test $test$shared_ext -- echo "Please use win32/Makefile.gcc instead." | tee -a configure.log -- leave 1 - LDSHARED=${LDSHARED-"$cc -shared"} - LDSHAREDLIBC="" - EXE='.exe' ;;