general fixing, use 10.15 for macOS

Signed-off-by: falkTX <falktx@falktx.com>

.github/workflows/build.yml

@@ -17,20 +17,20 @@ jobs:
         with:
           path: |
             ~/PawPawBuilds
-          key: macos-universal-v${{ env.CACHE_VERSION }}
+          key: macos-v${{ env.CACHE_VERSION }}
+      - name: Set sha8
+        id: slug
+        run: echo "::set-output name=sha8::$(echo ${{ github.sha }} | cut -c1-8)"
       - name: Set up dependencies
         run: |
           brew install meson
       - name: Build
         run: |
-          make PAWPAW_TARGET=macos-universal
+          make PAWPAW_TARGET=macos-universal-10.15
       - name: Pack
         run: |
           mv build mod-app-macOS-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}
-          tar chz mod-app-macOS-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}.tar.gz mod-app-macOS-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}
-      - name: Set sha8
-        id: slug
-        run: echo "::set-output name=sha8::$(echo ${{ github.sha }} | cut -c1-8)"
+          tar chzf mod-app-macOS-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}.tar.gz mod-app-macOS-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}
       - uses: actions/upload-artifact@v3
         with:
           name: ${{ github.event.repository.name }}-macOS-${{ matrix.target }}-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}
@@ -49,6 +49,9 @@ jobs:
           path: |
             ~/PawPawBuilds
           key: ${{ matrix.target }}-v${{ env.CACHE_VERSION }}
+      - name: Set sha8
+        id: slug
+        run: echo "::set-output name=sha8::$(echo ${{ github.sha }} | cut -c1-8)"
       - name: Fix GitHub's mess
         run: |
           sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
@@ -64,9 +67,6 @@ jobs:
         run: |
           mv build mod-app-win64-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}
           zip -r -9 mod-app-win64-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}.zip mod-app-win64-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}
-      - name: Set sha8
-        id: slug
-        run: echo "::set-output name=sha8::$(echo ${{ github.sha }} | cut -c1-8)"
       - uses: actions/upload-artifact@v3
         with:
           name: ${{ github.event.repository.name }}-${{ matrix.target }}-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}

Makefile

@@ -5,22 +5,23 @@ TARGET_MACHINE := $(shell $(CC) -dumpmachine)
 
 ifeq ($(PAWPAW_TARGET),)
 ifneq (,$(findstring linux,$(TARGET_MACHINE)))
+LINUX = true
 PAWPAW_TARGET = linux-$(uname -m)
 else ifneq (,$(findstring apple,$(TARGET_MACHINE)))
-PAWPAW_TARGET = macos-universal
+MACOS = true
+PAWPAW_TARGET = macos-universal-10.15
 else ifneq (,$(findstring mingw,$(TARGET_MACHINE)))
+WINDOWS = true
 PAWPAW_TARGET = win64
 else ifneq (,$(findstring wasm,$(TARGET_MACHINE)))
+WASM = true
 PAWPAW_TARGET = wasm
 else
 $(error unknown target, cannot continue)
 endif
 endif
 
-ifeq ($(PAWPAW_TARGET),macos-universal)
-APP_EXT =
-SO_EXT = .so
-else ifeq ($(PAWPAW_TARGET),win64)
+ifeq ($(WINDOWS),true)
 APP_EXT = .exe
 SO_EXT = .dll
 else
@@ -51,12 +52,12 @@ TARGETS = \
 	build/mod \
 	build/modtools
 
-ifeq ($(PAWPAW_TARGET),macos-universal)
+ifeq ($(MACOS),true)
 TARGETS += build/libjack.0.dylib
 TARGETS += build/libjackserver.0.dylib
 TARGETS += build/jack/jack_coreaudio.so
 TARGETS += build/jack/jack_coremidi.so
-else ifeq ($(PAWPAW_TARGET),win64)
+else ifeq ($(WINDOWS),true)
 TARGETS += build/libjack64.dll
 TARGETS += build/libjackserver64.dll
 TARGETS += build/jack/jack_portaudio.dll
@@ -72,11 +73,11 @@ endif
 BUNDLES  = abGate.lv2
 BUNDLES += artyfx.lv2
 BUNDLES += carla-files.lv2
+ifneq ($(MACOS),true)
 BUNDLES += DragonflyEarlyReflections.lv2
 BUNDLES += DragonflyHallReverb.lv2
 BUNDLES += DragonflyPlateReverb.lv2
 BUNDLES += DragonflyRoomReverb.lv2
-ifneq ($(PAWPAW_TARGET),macos-universal)
 BUNDLES += fil4.lv2
 endif
 BUNDLES += Black_Pearl_4A.lv2
@@ -101,11 +102,11 @@ BUNDLES += FluidSynthLeads.lv2
 BUNDLES += FluidSynthPads.lv2
 BUNDLES += Red_Zeppelin_4.lv2
 BUNDLES += Red_Zeppelin_5.lv2
-ifneq ($(PAWPAW_TARGET),macos-universal)
+ifneq ($(MACOS),true)
 BUNDLES += fomp.lv2
 endif
 BUNDLES += Kars.lv2
-ifneq ($(PAWPAW_TARGET),macos-universal)
+ifneq ($(MACOS),true)
 BUNDLES += midifilter.lv2
 endif
 BUNDLES += midigen.lv2
@@ -133,18 +134,18 @@ BUNDLES += mod-mda-Shepard.lv2
 BUNDLES += mod-mda-SubSynth.lv2
 BUNDLES += mod-mda-ThruZero.lv2
 BUNDLES += mod-mda-Vocoder.lv2
-ifneq ($(PAWPAW_TARGET),macos-universal)
+ifneq ($(MACOS),true)
 BUNDLES += modmeter.lv2 
 BUNDLES += modspectre.lv2
 endif
 BUNDLES += MVerb.lv2
 BUNDLES += Nekobi.lv2
 # BUNDLES += neural-amp-modeler.lv2
-ifneq ($(PAWPAW_TARGET),macos-universal)
+ifneq ($(MACOS),true)
 BUNDLES += notes.lv2
 endif
 BUNDLES += PingPongPan.lv2
-ifneq ($(PAWPAW_TARGET),macos-universal)
+ifneq ($(MACOS),true)
 BUNDLES += rt-neural-generic.lv2
 endif
 BUNDLES += wolf-shaper.lv2

utils/plugin-builder.mk

@@ -52,7 +52,12 @@ $(PKG)_PKGDIR = $(CURDIR)/mod-plugin-builder/plugins/package/$(pkgname)
 BR2_TARGET_OPTIMIZATION =
 
 MAKE1 = make -j1
+
+ifeq ($(MACOS),true)
+PARALLEL_JOBS = $(shell sysctl -n hw.logicalcpu)
+else
 PARALLEL_JOBS = $(shell nproc)
+endif
 
 ifeq ($(WINDOWS),true)
 HOST_DIR = $(PAWPAW_PREFIX)-host

utils/test.sh

@@ -17,6 +17,7 @@ fi
 # ---------------------------------------------------------------------------------------------------------------------
 # set up env
 
+export JACK_DRIVER_DIR=$(pwd)/build/jack
 export LV2_PATH=$(pwd)/build/plugins
 # export MOD_LOG=1
 
@@ -32,12 +33,14 @@ fi
 
 JACKD+=" -C utils/jack-session.conf -R -S"
 
-if [ "${target}" = "win64" ]; then
-JACKD+=" -X coremidi -d coreaudio"
+if [ "${target}" = "macos-universal-10.15" ]; then
+# JACKD+=" -X coremidi"
+JACKD+=" -d coreaudio"
+JACKD+=" -P 'Built-in'"
 elif [ "${target}" = "win64" ]; then
 JACKD+=" -X winmme -d portaudio -d 'ASIO::WineASIO Driver'"
 else
-JACKD+=" -d dummy"
+JACKD+=" -d alsa"
 fi
 
 JACKD+=" -r 48000 -p 128"