More tweaks as needed for macOS

data/macos/build-deps-new.sh

@@ -368,7 +368,7 @@ export PATH=${PREFIX}/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin
 export PKG_CONFIG_PATH=${PREFIX}/lib/pkgconfig
 export PKG_CONFIG=${TARGETDIR}/carla64/bin/pkg-config
 
-export CFLAGS="-O3 -mtune=generic -msse -msse2 -fPIC -DPIC -DNDEBUG -I${PREFIX}/include -m64 -mmacosx-version-min=10.12"
+export CFLAGS="-O3 -mtune=generic -msse -msse2 -fPIC -DPIC -DNDEBUG -I${PREFIX}/include -mmacosx-version-min=10.12"
 export LDFLAGS="-L${PREFIX}/lib -stdlib=libc++"
 
 if [ "${MACOS_UNIVERSAL}" -eq 1 ]; then
@@ -503,7 +503,7 @@ fi
 if [ ! -f sip-${SIP_VERSION}/build-done ]; then
   cd sip-${SIP_VERSION}
   python3 configure.py --sip-module PyQt5.sip
-  make ${MAKE_ARGS}
+  make ${MAKE_ARGS} CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LIBS="${LDFLAGS}"
   make install
   touch build-done
   cd ..
@@ -621,7 +621,9 @@ fi
 
 if [ ! -f cx_Freeze-${CXFREEZE_VERSION}/build-done ]; then
   cd cx_Freeze-${CXFREEZE_VERSION}
+  sed -i -e 's/, use_builtin_types=False//' cx_Freeze/macdist.py
   sed -i -e 's/"python%s.%s"/"python%s.%sm"/' setup.py
+  sed -i -e 's/extra_postargs=extraArgs,/extra_postargs=extraArgs+os.getenv("LDFLAGS").split(),/' setup.py
   python3 setup.py build
   python3 setup.py install --prefix=${PREFIX}
   touch build-done

data/macos/build.sh

@@ -5,8 +5,7 @@
 
 set -e
 
-VERSION="2.3.0-alpha1"
-PKG_FOLDER="Carla_${VERSION}-macos"
+VERSION="2.3.0-alpha3"
 
 # ------------------------------------------------------------------------------------
 # cd to correct path
@@ -22,11 +21,18 @@ source data/macos/common.env
 
 if [ $(uname -r | cut -d '.' -f 1) -lt 16 ]; then
   export MACOS_VERSION_MIN="10.8"
+  PKG_SUFFIX="intel-10.8"
 else
   export MACOS_VERSION_MIN="10.12"
-  PKG_FOLDER="${PKG_FOLDER}-10.12"
+  if [ "${MACOS_UNIVERSAL}" -eq 1 ]; then
+    PKG_SUFFIX="universal"
+  else
+    PKG_SUFFIX="intel-10.12"
+  fi
 fi
 
+PKG_FOLDER="Carla_${VERSION}-macOS-${PKG_SUFFIX}"
+
 export MACOS="true"
 export USING_JUCE="true"
 

source/frontend/carla_shared.py

@@ -566,6 +566,8 @@ if not CWD:
 # make it work with cxfreeze
 if os.path.isfile(CWD):
     CWD = os.path.dirname(CWD)
+    if CWD.endswith("/lib"):
+        CWD = CWD.rsplit("/lib",1)[0]
     CXFREEZE = True
 else:
     CXFREEZE = False