Commit 72d4cac1 authored by Felix Paul Kühne's avatar Felix Paul Kühne

extras/macosx: adapt and simplify packaging and creation scripts based on the...

extras/macosx: adapt and simplify packaging and creation scripts based on the simple libvlc compilation
parent 95a07dc4
......@@ -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}
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment