Cross-compile and create arm64 and universal versions for 3.0

Author: kjoonlee

.travis/script.sh

@@ -100,7 +100,9 @@ elif [ "$TARGET" = "macOS" ]; then
     mv vlc-$VLC_VERSION.0-win64/*/sdk/lib/pkgconfig lib
     rm -rf ./vlc-$VLC_VERSION.0-win64*
   else
-    wget https://download.videolan.org/pub/videolan/vlc/$VLC_VERSION.0/macosx/vlc-$VLC_VERSION.0.dmg
+    #wget https://download.videolan.org/pub/videolan/vlc/$VLC_VERSION.0/macosx/vlc-$VLC_VERSION.0.dmg
+    #get a recent universal .dmg instead of early x86_64 .dmg
+    wget https://download.videolan.org/pub/videolan/vlc/3.0.18/macosx/vlc-3.0.18-universal.dmg
     # extracting contents of a .dmg file using 7-zip is more of a hack, and while it works 7z exits with an error code we want to suppress
     7z x "*.dmg" "*/VLC.app/Contents/MacOS" || true
     mv */VLC.app/Contents/MacOS/lib ..
@@ -126,13 +128,32 @@ elif [ "$TARGET" = "macOS" ]; then
   # fix library symlink
   ln -sf libvlccore.*.dylib libvlccore.dylib
   cd ../..
+
+  #compile x86_64 version, stash it, then clean up
+  make OS=macOS
+  mkdir x86_64
+  mv libpause_click_plugin.dylib x86_64
+  make OS=macOS clean
+
+  #cross-compile arm64 version, stash it
+  sed -i "" "s|CC = cc|CC = cc -target arm64-apple-macos10.12|" Makefile
   make OS=macOS
+  mkdir arm64
+  mv libpause_click_plugin.dylib arm64
+
+  #merge x86_64 and arm64 versions
+  mkdir universal
+  lipo arm64/libpause_click_plugin.dylib x86_64/libpause_click_plugin.dylib -create -output universal/libpause_click_plugin.dylib
+
+  #get ready to compile x86_64 version again
+  sed -i "" "s|CC = cc -target arm64-apple-macos10.12|CC = cc|" Makefile
+
   if [ "$VLC_VERSION" = "4.0" ]; then
     echo "$LATEST_MACOS_DIR_URL" > VLC_DOWNLOAD_URL.txt
     echo_nightly_readme "$(cat VLC_DOWNLOAD_URL.txt)" > "README.txt"
     zip -j vlc-$VLC_VERSION-macosx.zip libpause_click_plugin.dylib VLC_DOWNLOAD_URL.txt README.txt
   else
-    zip -j vlc-$VLC_VERSION-macosx.zip libpause_click_plugin.dylib
+    zip vlc-$VLC_VERSION-macosx.zip x86_64/libpause_click_plugin.dylib arm64/libpause_click_plugin.dylib universal/libpause_click_plugin.dylib
   fi
   mkdir artifacts
   cp -a vlc-$VLC_VERSION-macosx.zip artifacts