Check-in [d7a9831961]
Overview
Comment:Updated to create "tkbase.res.o" if building for Win32
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:d7a983196108f44ed9e4ef550f45f5ac10369a48
User & Date: rkeene on 2010-09-26 04:43:16
Other Links: manifest | tags
Context
2010-09-26
04:43
Updated to support accepting extra objects supplied by the EXTRA_OBJS environment variable check-in: fc9a2d4694 user: rkeene tags: trunk
04:43
Updated to create "tkbase.res.o" if building for Win32 check-in: d7a9831961 user: rkeene tags: trunk
04:43
Updated to work around bug in Itcl where cross-compiling from UNIX to non-UNIX (or vice versa) fails check-in: c5a5106f2c user: rkeene tags: trunk
Changes

Modified tk/build.sh from [6f28ed378d] to [10214ad9a8].

    77     77   			echo "Running: ./configure --enable-shared --disable-symbols --prefix=\"${INSTDIR}\" --with-tcl=\"${TCLCONFIGDIR}\" ${CONFIGUREEXTRA}"
    78     78   			./configure --enable-shared --disable-symbols --prefix="${INSTDIR}" --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA}
    79     79   		fi
    80     80   
    81     81   		${MAKE:-make} || continue
    82     82   
    83     83   		${MAKE:-make} install || continue
           84  +
           85  +		# Update to include resources, if found
           86  +		if [ "${dir}" = "win" ]; then
           87  +			echo ' *** Creating tkbase.res.o to support Windows build'
           88  +			echo "\"${RC:-windres}\" -o tkbase.res.o  --define STATIC_BUILD --include \"./../generic\" --include \"${TCLCONFIGDIR}/../generic\" --include \"${TCLCONFIGDIR}\" --include \"./rc\" \"./rc/tk_base.rc\""
           89  +			"${RC:-windres}" -o tkbase.res.o  --define STATIC_BUILD --include "./../generic" --include "${TCLCONFIGDIR}/../generic" --include "${TCLCONFIGDIR}" --include "./rc" "./rc/tk_base.rc"
           90  +
           91  +			if [ -f "tkbase.res.o" ]; then
           92  +				cp "tkbase.res.o" "${INSTDIR}/lib/"
           93  +			fi
           94  +		fi
    84     95   
    85     96   		# Update pkgIndex to load libtk from the local directory rather
    86     97   		# than the parent directory
    87     98   		for pkgIndex in "${INSTDIR}"/lib/tk*/pkgIndex.tcl; do
    88     99   			sed 's@ \.\. @ @g' "${pkgIndex}" > "${pkgIndex}.new"
    89    100   			mv "${pkgIndex}.new" "${pkgIndex}"
    90    101   		done