mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-09 18:31:04 +00:00
correct copying of Qt frameworks to application bundle; make using two cpus; support for 64bit build
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35247 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
4b6fe42475
commit
35b2872c8e
@ -224,6 +224,9 @@ ${SDKROOT})
|
||||
*10.6*)
|
||||
MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET:-"10.5"}; export MACOSX_DEPLOYMENT_TARGET
|
||||
case "${MACOSX_DEPLOYMENT_TARGET}" in
|
||||
10.6)
|
||||
SDKROOT="/Developer/SDKs/MacOSX10.6.sdk"; export SDKROOT
|
||||
;;
|
||||
10.5|10.4)
|
||||
SDKROOT=${SDKROOT:-"/Developer/SDKs/MacOSX10.5.sdk"}; export SDKROOT
|
||||
;;
|
||||
@ -532,7 +535,7 @@ build_lyx() {
|
||||
${QtInstallDir:+"--with-qt4-dir=${QtInstallDir}"} \
|
||||
${LyXConfigureOptions}\
|
||||
--host="${HOSTSYSTEM}" --build="${BuildSystem}" --enable-build-type=rel && \
|
||||
make && make install${strip}
|
||||
make -j2 && make install${strip}
|
||||
for file in ${FILE_LIST} ; do
|
||||
if [ -f "${LYX_BUNDLE_PATH}/${file}" ]; then
|
||||
mv "${LYX_BUNDLE_PATH}/${file}"\
|
||||
@ -591,6 +594,8 @@ EOF
|
||||
fi
|
||||
for libnm in ${QtLibraries} ; do
|
||||
fwdir=`framework_name "$libnm"`
|
||||
dirname=`dirname "${fwdir}"`
|
||||
mkdir -p "${condir}/${dirname}"
|
||||
dirname=`basename "${fwdir}"`
|
||||
test -d "${condir}/${fwdir}" || (
|
||||
echo Copy framework "${source}/lib/"`basename "${fwdir}"`
|
||||
|
Loading…
Reference in New Issue
Block a user