X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-util.git;a=blobdiff_plain;f=cross-compile%2Fmacosx%2Fcreate_dmg;h=f4b36b71c2f5fb871d37aef5c62030feee32882a;hp=0b2326bd7e380a39c3cdfd4bb942265870015c76;hb=20e302a299c6b625aed33cc0865d8d8f31969697;hpb=ffbad1654cdd9263a964873d95535ed66a5011b4 diff --git a/cross-compile/macosx/create_dmg b/cross-compile/macosx/create_dmg index 0b2326b..f4b36b7 100755 --- a/cross-compile/macosx/create_dmg +++ b/cross-compile/macosx/create_dmg @@ -26,8 +26,11 @@ PREFIX=$HOME/sr_macosx # The path where to download files to and where to build packages. BUILDDIR=./build_app +# We use Qt 5.5 in order to remain compatible with more versions of Mac OS X. +QTVER=qt@5.5 + # Path to Qt5 binaries. -QTBINDIR=`brew list qt5 | grep bin | head -n 1 | xargs dirname` +QTBINDIR=`brew list $QTVER | grep bin | head -n 1 | xargs dirname` # Path to boost libraries. BOOSTLIBDIR=`brew list boost | grep libboost_system | head -n 1 | xargs dirname` @@ -35,7 +38,7 @@ BOOSTLIBDIR=`brew list boost | grep libboost_system | head -n 1 | xargs dirname` # Path to Python 3 framework. PYTHONFRAMEWORKDIR=`brew list python3 | grep Python.framework | head -n 1 | xargs dirname`/../../../.. -PYVER="3.6" +PYVER="3.7" # You usually don't need to change anything below this line. @@ -92,7 +95,7 @@ rm -rf $PYDIR/lib/python$PYVER/**/__pycache__ rm -rf $PYDIR/lib/python$PYVER/**/**/__pycache__ rm -rf $PYDIR/Resources install_name_tool -change \ - /usr/local/opt/python3/Frameworks/Python.framework/Versions/$PYVER/Python \ + /usr/local/opt/python/Frameworks/Python.framework/Versions/$PYVER/Python \ @executable_path/../Frameworks/Python.framework/Versions/$PYVER/Python \ $FRAMEWORKSDIR/libsigrokdecode.*.dylib