Overview
| Comment: | Updated to include Zlib headers if we found Zlib library for KitDLL |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
5518df71a4efe51f9949ebfa42bf1165 |
| User & Date: | rkeene on 2010-10-06 02:52:08 |
| Other Links: | manifest | tags |
Context
|
2010-10-06
| ||
| 05:05 | KitCreator 0.5.1.x check-in: b0d82098c4 user: rkeene tags: trunk, 0.5.1 | |
| 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 | |
Changes
Modified kitdll/build.sh from [af3cd7d998] to [9d057a0710].
| ︙ | ︙ | |||
81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 |
## Figure out if zlib compiled (if not, the system zlib will be used and we
## will need to have that present)
ZLIBDIR="$(cd "${OTHERPKGSDIR}/zlib/inst" 2>/dev/null && pwd)"
export ZLIBDIR
if [ -n "${ZLIBDIR}" -a -f "${ZLIBDIR}/lib/libz.a" ]; then
EXTRA_OBJS="${EXTRA_OBJS} ${ZLIBDIR}/lib/libz.a"
LDFLAGS="${LDFLAGS} -L${ZLIBDIR}/lib"
export LDFLAGS
fi
## Tk Resources (needed for Win32 support)
TKDIR="$(cd "${OTHERPKGSDIR}/tk/inst" && pwd)"
TKRSRC="${TKDIR}/lib/tkbase.res.o"
if [ -n "${TKDIR}" -a -f "${TKRSRC}" ]; then
EXTRA_OBJS="${EXTRA_OBJS} ${TKRSRC}"
| > > > > > > | 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 |
## Figure out if zlib compiled (if not, the system zlib will be used and we
## will need to have that present)
ZLIBDIR="$(cd "${OTHERPKGSDIR}/zlib/inst" 2>/dev/null && pwd)"
export ZLIBDIR
if [ -n "${ZLIBDIR}" -a -f "${ZLIBDIR}/lib/libz.a" ]; then
EXTRA_OBJS="${EXTRA_OBJS} ${ZLIBDIR}/lib/libz.a"
### Add lib directory for zlib
LDFLAGS="${LDFLAGS} -L${ZLIBDIR}/lib"
export LDFLAGS
### Add include directory for zlib
CFLAGS="${CFLAGS} -I${ZLIBDIR}/include"
CPPFLAGS="${CPPFLAGS} -I${ZLIBDIR}/include"
export CFLAGS CPPFLAGS
fi
## Tk Resources (needed for Win32 support)
TKDIR="$(cd "${OTHERPKGSDIR}/tk/inst" && pwd)"
TKRSRC="${TKDIR}/lib/tkbase.res.o"
if [ -n "${TKDIR}" -a -f "${TKRSRC}" ]; then
EXTRA_OBJS="${EXTRA_OBJS} ${TKRSRC}"
|
| ︙ | ︙ |