Diff

Differences From Artifact [47f9c339e5]:

To Artifact [e1e2ad264c]:


    69     69   	cp -r "${OTHERPKGSDIR}"/*/out/* 'starpack.vfs/'
    70     70   
    71     71   	## Rename the "vfs" package directory to what "boot.tcl" expects
    72     72   	mv 'starpack.vfs/lib'/vfs* 'starpack.vfs/lib/vfs'
    73     73   
    74     74   	## Install "boot.tcl"
    75     75   	cp 'boot.tcl' 'starpack.vfs/'
           76  +
           77  +	# Include extra objects as required
           78  +	## Initialize list of extra objects
           79  +	EXTRA_OBJS=""
           80  +
           81  +	## Figure out if zlib compiled (if not, the system zlib will be used and we
           82  +	## will need to have that present)
           83  +	ZLIBDIR="$(cd "${OTHERPKGSDIR}/zlib/inst" 2>/dev/null && pwd)"
           84  +	export ZLIBDIR
           85  +	if [ -n "${ZLIBDIR}" -a -f "${ZLIBDIR}/lib/libz.a" ]; then
           86  +		EXTRA_OBJS="${EXTRA_OBJS} ${ZLIBDIR}/lib/libz.a"
           87  +	fi
           88  +
           89  +	## Tk Resources (needed for Win32 support)
           90  +	TKDIR="$(cd "${OTHERPKGSDIR}/tk/inst" && pwd)"
           91  +	TKRSRC="${TKDIR}/lib/tkbase.res.o"
           92  +	if [ -n "${TKDIR}" -a -f "${TKRSRC}" ]; then
           93  +		EXTRA_OBJS="${EXTRA_OBJS} ${TKRSRC}"
           94  +	fi
           95  +
           96  +	## Export to the environment, to be picked up by the "configure" script
           97  +	export EXTRA_OBJS
    76     98   
    77     99   	# Build KitDLL
    78    100   	echo "Running: ./configure --with-tcl=\"${TCLCONFIGDIR}\" ${CONFIGUREEXTRA}"
    79    101   	./configure --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA}
    80    102   
    81    103   	echo "Running: ${MAKE:-make}"
    82    104   	${MAKE:-make} TCLSH_NATIVE="${TCLSH_NATIVE}" || exit 1