From: Piotr Esden-Tempski <redacted>
Date: Sun, 19 Feb 2017 17:18:08 +0000 (-0800)
Subject: sigrok-native-macosx: Autodetect cask-only library locations and cpu count.
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=6a8ce4e0ef972f4c2e36e4abfa6dcf4d5f1322af;p=sigrok-util.git

sigrok-native-macosx: Autodetect cask-only library locations and cpu count.
---

diff --git a/cross-compile/macosx/sigrok-native-macosx b/cross-compile/macosx/sigrok-native-macosx
index 779d1d1..52adac2 100755
--- a/cross-compile/macosx/sigrok-native-macosx
+++ b/cross-compile/macosx/sigrok-native-macosx
@@ -33,7 +33,7 @@ PYPATH=$PREFIX/lib/python2.7/site-packages
 # V="V=1 VERBOSE=1"
 
 # Edit this to enable/disable/modify parallel compiles.
-PARALLEL="-j 2"
+PARALLEL="-j "`sysctl -n hw.ncpu`
 
 # Uncomment the following lines to build with clang and run scan-build.
 # export CC=llvm-gcc
@@ -41,18 +41,18 @@ PARALLEL="-j 2"
 # SB="scan-build -k -v"
 
 # Uncomment the following lines to build with gcc/g++.
-export CC=gcc-4.9
-export CXX=g++-4.9
+export CC=gcc
+export CXX=g++
 
 # Path to Qt binaries (needed for cmake to find the Qt libs).
 # export PATH="/usr/local/opt/qt/bin:$PATH" # Qt4
-export PATH="/usr/local/opt/qt52/bin:$PATH" # Qt5
+export PATH=`brew list qt5 | grep bin | head -n 1 | xargs dirname`":$PATH" # Qt5
 
 # Path to Python 2/3 pkg-config files.
 # In Homebrew, pkg-config files of "keg-only" formulas (Python is one of them)
 # aren't installed into /usr/local/lib/pkgconfig (we manually reference them).
-PY2="/usr/local/opt/python/Frameworks/Python.framework/Versions/2.7/lib/pkgconfig"
-PY3="/usr/local/opt/python3/Frameworks/Python.framework/Versions/3.4/lib/pkgconfig"
+PY2=`brew list python | grep pkgconfig | head -n 1 | xargs dirname`
+PY3=`brew list python3 | grep pkgconfig | head -n 1 | xargs dirname`
 
 # You usually don't need to change anything below this line.