--- misc/trunk/mac_package_builder/make-qsampler-app.sh	2019/03/09 21:49:29	3494
+++ misc/trunk/mac_package_builder/make-qsampler-app.sh	2019/03/10 07:38:26	3495
@@ -1,27 +1,25 @@
 #!/bin/sh -xe
 
-P=/home/persson/mac
-LIPO=i686-apple-darwin9-lipo
-INSTALL_NAME_TOOL=i686-apple-darwin9-install_name_tool
+P=/home/persson/mac64
+INSTALL_NAME_TOOL=x86_64-apple-darwin11-install_name_tool
+QT=/home/persson/Qt5.5.1-mac/5.5/clang_64
 
 rm -rf qsampler.app
-cp -r "$P/i686/bin/qsampler.app" .
-$LIPO -create "$P/i686/bin/qsampler.app/Contents/MacOS/qsampler" "$P/powerpc/bin/qsampler.app/Contents/MacOS/qsampler" -output qsampler.app/Contents/MacOS/qsampler 
-$LIPO -create "$P/i686/lib/liblscp.6.dylib" "$P/powerpc/lib/liblscp.6.dylib" -output qsampler.app/Contents/Resources/liblscp.6.dylib
-
-cp "$P"/i686/share/locale/qsampler_*.qm qsampler.app/Contents/Resources
-cp "$P/qt/Developer/Applications/Qt/translations/qt_cs.qm" qsampler.app/Contents/Resources
-cp "$P/qt/Developer/Applications/Qt/translations/qt_ru.qm" qsampler.app/Contents/Resources
+cp -r "$P/bin/qsampler.app" .
+cp "$P/lib/liblscp.6.dylib" qsampler.app/Contents/Resources/
 
-cp "$P/Fantasia.app/Contents/Resources/LSCPScript.icns" qsampler.app/Contents/Resources/qsampler.icns
-sed '/CFBundleIconFile/,/<key>/s/<string>.*<\/string>/<string>qsampler.icns<\/string>/' "$P/i686/bin/qsampler.app/Contents/Info.plist" > qsampler.app/Contents/Info.plist
+cp "$P"/share/qsampler/translations/qsampler_*.qm qsampler.app/Contents/Resources
+cp "$QT/translations/qt_cs.qm" qsampler.app/Contents/Resources
+cp "$QT/translations/qt_ru.qm" qsampler.app/Contents/Resources
+
+cp "/home/persson/mac/Fantasia.app/Contents/Resources/LSCPScript.icns" qsampler.app/Contents/Resources/qsampler.icns
+sed '/CFBundleIconFile/,/<key>/s/<string>.*<\/string>/<string>qsampler.icns<\/string>/' "$P/bin/qsampler.app/Contents/Info.plist" > qsampler.app/Contents/Info.plist
 
 mkdir -p qsampler.app/Contents/Frameworks
-tar cf - -C "$P/qt/Library/Frameworks" --exclude=Headers QtCore.framework QtGui.framework | tar xf - -C qsampler.app/Contents/Frameworks
+tar cf - -C "$QT/lib" --exclude=Headers --exclude "*_debug*" --exclude "*.prl" QtCore.framework QtGui.framework QtWidgets.framework QtDBus.framework QtPrintSupport.framework | tar xf - -C qsampler.app/Contents/Frameworks
 
-$INSTALL_NAME_TOOL -change QtCore.framework/Versions/4/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/4/QtCore qsampler.app/Contents/Frameworks/QtGui.framework/QtGui
-$INSTALL_NAME_TOOL -change QtCore.framework/Versions/4/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/4/QtCore qsampler.app/Contents/MacOS/qsampler
-$INSTALL_NAME_TOOL -change QtGui.framework/Versions/4/QtGui @executable_path/../Frameworks/QtGui.framework/Versions/4/QtGui qsampler.app/Contents/MacOS/qsampler
+mkdir qsampler.app/Contents/MacOS/platforms
+cp "$QT/plugins/platforms/libqcocoa.dylib" qsampler.app/Contents/MacOS/platforms
 
-$INSTALL_NAME_TOOL -change "$P/i686/lib/liblscp.6.dylib" @executable_path/../Resources/liblscp.6.dylib qsampler.app/Contents/MacOS/qsampler
-$INSTALL_NAME_TOOL -change "$P/powerpc/lib/liblscp.6.dylib" @executable_path/../Resources/liblscp.6.dylib qsampler.app/Contents/MacOS/qsampler
+$INSTALL_NAME_TOOL -change "$P/lib/liblscp.6.dylib" @executable_path/../Resources/liblscp.6.dylib qsampler.app/Contents/MacOS/qsampler
+$INSTALL_NAME_TOOL -add_rpath @executable_path/../Frameworks qsampler.app/Contents/MacOS/qsampler