From 58aabaf196303702cba1d7bbbcfb227cc956a2b8 Mon Sep 17 00:00:00 2001 From: sletz Date: Tue, 10 Feb 2009 11:40:36 +0000 Subject: [PATCH] Correct XCode project and OSX install script. git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@3299 0c269be4-1314-0410-8aa9-9f06e86f4224 --- macosx/Jackdmp.xcodeproj/project.pbxproj | 3 ++- macosx/install_jackdmp | 11 ++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/macosx/Jackdmp.xcodeproj/project.pbxproj b/macosx/Jackdmp.xcodeproj/project.pbxproj index 130f2c5e..fcf54b67 100644 --- a/macosx/Jackdmp.xcodeproj/project.pbxproj +++ b/macosx/Jackdmp.xcodeproj/project.pbxproj @@ -8942,8 +8942,9 @@ COPY_PHASE_STRIP = YES; GCC_ENABLE_FIX_AND_CONTINUE = NO; HEADER_SEARCH_PATHS = ( - ../posix, ., + ../common/jack, + ../posix, ../common, ); MACOSX_DEPLOYMENT_TARGET = 10.4; diff --git a/macosx/install_jackdmp b/macosx/install_jackdmp index 7937c245..1e2c0a78 100755 --- a/macosx/install_jackdmp +++ b/macosx/install_jackdmp @@ -1,8 +1,8 @@ # Install jackdmp and owerwrite jack installation # Plug-ins -[ -f Panda.framework ] && sudo cp -r Panda.framework /Library/Frameworks -[ -f JackRouter.plugin ] && sudo cp -r JackRouter.plugin /Library/Audio/Plug-Ins/HAL/ +[ -d Panda.framework ] && sudo cp -r Panda.framework /Library/Frameworks +[ -d JackRouter.plugin ] && sudo cp -r JackRouter.plugin /Library/Audio/Plug-Ins/HAL/ # Copy libraries and exe sudo cp -r Jackmp.framework /Library/Frameworks/ @@ -14,11 +14,12 @@ sudo cp jackdmp /usr/local/bin sudo install -d /usr/local/lib/jackmp sudo cp jack_coreaudio.so /usr/local/lib/jackmp sudo cp jack_dummy.so /usr/local/lib/jackmp -sudo cp jack_net.so /usr/local/lib/jackmp +[ -f jack_net.so ] && sudo cp jack_net.so /usr/local/lib/jackmp # Copy tools -sudo cp netmanager.so /usr/local/lib/jackmp -sudo cp audioadapter.so /usr/local/lib/jackmp +[ -f netmanager.so ] && sudo cp netmanager.so /usr/local/lib/jackmp +[ -f netadapter.so ] && sudo cp netadapter.so /usr/local/lib/jackmp +[ -f audioadapter.so ] && sudo cp audioadapter.so /usr/local/lib/jackmp # Create links to jackmp ressources cd /usr/local/lib && [ -f libjack.0.dylib ] && sudo mv -f libjack.0.dylib tmp_libjack.0.dylib