Overview
| Comment: | Updated Mk4tcl to default to being built as a shared object if target is KitDLL |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: | eea8763689b694329d0f46c86e8d148fbe78af0b |
| User & Date: | rkeene on 2010-10-03 21:02:22 |
| Other Links: | manifest | tags |
Context
|
2010-10-03
| ||
| 21:03 | Updated KitDLL to support loading Mk4tcl check-in: e65eeb202c user: rkeene tags: trunk | |
| 21:02 | Updated Mk4tcl to default to being built as a shared object if target is KitDLL check-in: eea8763689 user: rkeene tags: trunk | |
| 21:01 | Added Metakit test check-in: bbc27a0fd1 user: rkeene tags: trunk | |
Changes
Modified mk4tcl/build.sh from [f48b86fade] to [92a8d1c751].
64 64 # work 65 65 BUILDTYPE="$(basename "${TCLCONFIGDIR}")" 66 66 if [ "${BUILDTYPE}" = "win" ]; then 67 67 CPPFLAGS="${CPPFLAGS} -DBUILD_tcl=1" 68 68 export CPPFLAGS 69 69 fi 70 70 71 - # Build static libraries for linking against Tclkit 72 - echo "Running: ./configure --disable-shared --prefix=\"${INSTDIR}\" --exec-prefix=\"${INSTDIR}\" --with-tcl=\"${TCLCONFIGDIR}/../generic\" ${CONFIGUREEXTRA}" 73 - ./configure --disable-shared --prefix="${INSTDIR}" --exec-prefix="${INSTDIR}" --with-tcl="${TCLCONFIGDIR}/../generic" ${CONFIGUREEXTRA} 71 + 72 + # If we are building for KitDLL, compile as shared 73 + isshared="0" 74 + if [ "${KITTARGET}" = "kitdll" ]; then 75 + isshared="1" 76 + 77 + echo "Running: ./configure --enable-shared --prefix=\"${INSTDIR}\" --exec-prefix=\"${INSTDIR}\" --with-tcl=\"${TCLCONFIGDIR}/../generic\" ${CONFIGUREEXTRA}" 78 + ./configure --enable-shared --prefix="${INSTDIR}" --exec-prefix="${INSTDIR}" --with-tcl="${TCLCONFIGDIR}/../generic" ${CONFIGUREEXTRA} 79 + else 80 + echo "Running: ./configure --disable-shared --prefix=\"${INSTDIR}\" --exec-prefix=\"${INSTDIR}\" --with-tcl=\"${TCLCONFIGDIR}/../generic\" ${CONFIGUREEXTRA}" 81 + ./configure --disable-shared --prefix="${INSTDIR}" --exec-prefix="${INSTDIR}" --with-tcl="${TCLCONFIGDIR}/../generic" ${CONFIGUREEXTRA} 82 + fi 74 83 75 84 echo "Running: ${MAKE:-make} tcllibdir=\"${INSTDIR}/lib\" AR=\"${AR:-ar}\" RANLIB=\"${RANLIB:-ranlib}\"" 76 85 ${MAKE:-make} tcllibdir="${INSTDIR}/lib" AR="${AR:-ar}" RANLIB="${RANLIB:-ranlib}" && \ 77 86 ${MAKE:-make} tcllibdir="${INSTDIR}/lib" AR="${AR:-ar}" RANLIB="${RANLIB:-ranlib}" install || ( 78 87 rm -rf "${INSTDIR}" 79 88 mkdir "${INSTDIR}" 80 89 81 90 exit 1 82 91 ) || exit 1 92 + 93 + if [ "${isshared}" = "1" ]; then 94 + # If we are building a shared version of Mk4tcl, put it in the VFS directory 95 + cp -r "${INSTDIR}/lib" "${OUTDIR}" 96 + fi 83 97 84 98 exit 0 85 99 ) || exit 1 86 100 87 101 exit 0