Check-in [5518df71a4]
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:5518df71a4efe51f9949ebfa42bf1165c1c55f4b
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     81   	## Figure out if zlib compiled (if not, the system zlib will be used and we
    82     82   	## will need to have that present)
    83     83   	ZLIBDIR="$(cd "${OTHERPKGSDIR}/zlib/inst" 2>/dev/null && pwd)"
    84     84   	export ZLIBDIR
    85     85   	if [ -n "${ZLIBDIR}" -a -f "${ZLIBDIR}/lib/libz.a" ]; then
    86     86   		EXTRA_OBJS="${EXTRA_OBJS} ${ZLIBDIR}/lib/libz.a"
    87     87   
           88  +		### Add lib directory for zlib
    88     89   		LDFLAGS="${LDFLAGS} -L${ZLIBDIR}/lib"
    89     90   		export LDFLAGS
           91  +
           92  +		### Add include directory for zlib
           93  +		CFLAGS="${CFLAGS} -I${ZLIBDIR}/include"
           94  +		CPPFLAGS="${CPPFLAGS} -I${ZLIBDIR}/include"
           95  +		export CFLAGS CPPFLAGS
    90     96   	fi
    91     97   
    92     98   	## Tk Resources (needed for Win32 support)
    93     99   	TKDIR="$(cd "${OTHERPKGSDIR}/tk/inst" && pwd)"
    94    100   	TKRSRC="${TKDIR}/lib/tkbase.res.o"
    95    101   	if [ -n "${TKDIR}" -a -f "${TKRSRC}" ]; then
    96    102   		EXTRA_OBJS="${EXTRA_OBJS} ${TKRSRC}"