[vlc-commits] extras/macosx: adapt and simplify packaging and creation scripts based on the simple libvlc compilation

[Felix Paul Kühne]

npapi-vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Sun Nov 24 20:05:38 2013 +0100| [72d4cac17372bb05426ef98f83646dc4522ee015] | committer: Felix Paul Kühne

extras/macosx: adapt and simplify packaging and creation scripts based on the simple libvlc compilation

> http://git.videolan.org/gitweb.cgi/npapi-vlc.git/?a=commit;h=72d4cac17372bb05426ef98f83646dc4522ee015
---

 extras/macosx/build-plugin.sh            |    6 +-----
 extras/macosx/create-universal-binary.sh |   19 ++++++-------------
 2 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/extras/macosx/build-plugin.sh b/extras/macosx/build-plugin.sh
index 63d3ebc..94c4b09 100755
--- a/extras/macosx/build-plugin.sh
+++ b/extras/macosx/build-plugin.sh
@@ -90,11 +90,7 @@ export OBJC="xcrun clang"
 export OBJCXX="xcrun clang++"
 export CFLAGS="-isysroot ${SDKROOT} -mmacosx-version-min=${MINIMAL_OSX_VERSION}"
 export PATH="${npapiroot}/extras/macosx/vlc/extras/tools/build/bin:${npapiroot}/extras/macosx/vlc/contrib/${ARCH}-apple-darwin10/bin:$PATH"
-if [ "$ARCH" = "x86_64" ]; then
-    export PKG_CONFIG_PATH="${npapiroot}/extras/macosx/vlc/64bit_install_dir/lib/pkgconfig"
-else
-    export PKG_CONFIG_PATH="${npapiroot}/extras/macosx/vlc/32bit_install_dir/lib/pkgconfig"
-fi
+export PKG_CONFIG_PATH="${npapiroot}/extras/macosx/vlc/${$ARCH}-install/lib/pkgconfig"
 
 spushd ${npapiroot}
 
diff --git a/extras/macosx/create-universal-binary.sh b/extras/macosx/create-universal-binary.sh
index be9f303..231fb14 100755
--- a/extras/macosx/create-universal-binary.sh
+++ b/extras/macosx/create-universal-binary.sh
@@ -27,23 +27,16 @@ UBROOT="${npapiroot}/VLC Plugin.plugin"
 
 info "checking for libvlc"
 
-spushd ${npapiroot}/extras/macosx
-if [ ! -e "vlc" ]; then
-    info "vlc wasn't checked out, bailing out"
-    exit -1
+if [ ! -e "${npapiroot}/extras/macosx/vlc/x86_64-install" ]; then
+    info "libvlc wasn't compiled for 64bit, compiling"
+    ./extras/macosx/build-vlc.sh -a x86_64
 fi
 
-if [ ! -e "vlc/64bit_install_dir" ]; then
-    info "libvlc wasn't compiled for 64bit, bailing out"
-    exit -1
+if [ ! -e "${npapiroot}/extras/macosx/vlc/i686-install" ]; then
+    info "libvlc wasn't compiled for 32bit, compiling"
+    ./extras/macosx/build-vlc.sh -a i686
 fi
 
-#if [ ! -e "vlc/32bit_install_dir" ]; then
-#    info "libvlc wasn't compiled for 32bit, bailing out"
-#    exit -1
-#fi
-spopd
-
 spushd ${npapiroot}
 
 if [ ! -e "${INTEL64ROOT}" ]; then