[vlc-commits] macosx: fix more hard-coded constants

[Felix Paul Kühne]

npapi-vlc | branch: master | Felix Paul Kühne <felix at feepk.net> | Thu Jul 12 14:00:15 2018 +0200| [39358651bae32dac148c260e72b67fa322b00546] | committer: Felix Paul Kühne

macosx: fix more hard-coded constants

> https://code.videolan.org/videolan/npapi-vlc/commit/39358651bae32dac148c260e72b67fa322b00546
---

 extras/macosx/build-package.sh |   4 ++--
 extras/macosx/build-plugin.sh  |   6 ++++--
 extras/macosx/dmg_setup.scpt   | Bin 4826 -> 4774 bytes
 npapi/Makefile.am              |   2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/extras/macosx/build-package.sh b/extras/macosx/build-package.sh
old mode 100644
new mode 100755
index f108ec7..9c5527a
--- a/extras/macosx/build-package.sh
+++ b/extras/macosx/build-package.sh
@@ -246,9 +246,9 @@ done
 ##########################
 # Build the lib folder
 vlc_install "${libvlc_dir}/lib" "libvlc.5.dylib" "${target_lib}" "library"
-vlc_install "${libvlc_dir}/lib" "libvlccore.5.dylib" "${target_lib}" "library"
+vlc_install "${libvlc_dir}/lib" "libvlccore.9.dylib" "${target_lib}" "library"
 pushd `pwd` > /dev/null
 cd ${target_lib}
 ln -sf libvlc.5.dylib libvlc.dylib
-ln -sf libvlccore.5.dylib libvlccore.dylib
+ln -sf libvlccore.9.dylib libvlccore.dylib
 popd > /dev/null
diff --git a/extras/macosx/build-plugin.sh b/extras/macosx/build-plugin.sh
index 797b785..135c628 100755
--- a/extras/macosx/build-plugin.sh
+++ b/extras/macosx/build-plugin.sh
@@ -1,4 +1,6 @@
 #!/bin/sh
+# Copyright (C) Felix Paul Kühne, 2012-2018
+
 set -e
 
 info()
@@ -8,9 +10,9 @@ info()
     echo "[${green}build${normal}] $1"
 }
 
+OSX_VERSION=`xcrun --sdk macosx --show-sdk-version`
 ARCH="x86_64"
 MINIMAL_OSX_VERSION="10.7"
-OSX_VERSION="10.11"
 SDKROOT=`xcode-select -print-path`/Platforms/MacOSX.platform/Developer/SDKs/MacOSX$OSX_VERSION.sdk
 VERBOSE=no
 
@@ -104,7 +106,7 @@ git submodule update --init
 
 info "Creating builddir and configuration"
 mkdir -p ${ARCH}-build && cd ${ARCH}-build
-../configure --build=${ARCH}-apple-darwin10
+../configure --build=${ARCH}-apple-darwin14
 
 core_count=`sysctl -n machdep.cpu.core_count`
 let jobs=$core_count+1
diff --git a/extras/macosx/dmg_setup.scpt b/extras/macosx/dmg_setup.scpt
index edfefc9..08912f5 100644
Binary files a/extras/macosx/dmg_setup.scpt and b/extras/macosx/dmg_setup.scpt differ
diff --git a/npapi/Makefile.am b/npapi/Makefile.am
index ae51eb0..db3158f 100644
--- a/npapi/Makefile.am
+++ b/npapi/Makefile.am
@@ -157,7 +157,7 @@ VLC-Plugin.plugin: $(lib_LTLIBRARIES)
 	mv $(top_builddir)/VLC-Plugin.plugin/Contents/MacOS/npvlc.dylib "$(top_builddir)/VLC-Plugin.plugin/Contents/MacOS/VLC-Plugin"
 	chmod +x "$(top_builddir)/VLC-Plugin.plugin/Contents/MacOS/VLC-Plugin"
 	install_name_tool -change $(LIBVLC_PREFIX)/lib/libvlc.5.dylib @loader_path/lib/libvlc.5.dylib $(top_builddir)/VLC-Plugin.plugin/Contents/MacOS/VLC-Plugin
-	install_name_tool -change $(LIBVLC_PREFIX)/lib/libvlccore.8.dylib @loader_path/lib/libvlccore.8.dylib $(top_builddir)/VLC-Plugin.plugin/Contents/MacOS/VLC-Plugin
+	install_name_tool -change $(LIBVLC_PREFIX)/lib/libvlccore.9.dylib @loader_path/lib/libvlccore.9.dylib $(top_builddir)/VLC-Plugin.plugin/Contents/MacOS/VLC-Plugin
 	find "$(top_builddir)/VLC-Plugin.plugin" -type d -exec chmod ugo+rx '{}' \;
 	find "$(top_builddir)/VLC-Plugin.plugin" -type f -exec chmod ugo+r '{}' \;