Skip to content

Commit 3b03363

Browse files
committed
Update carla and dpf, fixup CI
Signed-off-by: falkTX <falktx@falktx.com>
1 parent 0b01d08 commit 3b03363

File tree

5 files changed

+8
-7
lines changed

5 files changed

+8
-7
lines changed

.github/workflows/build.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: build
33
on: [push, pull_request]
44

55
env:
6-
CACHE_VERSION: 10
6+
CACHE_VERSION: 11
77
CARDINAL_UNDER_WINE: 1
88
CIBUILD: true
99
DEBIAN_FRONTEND: noninteractive
@@ -143,7 +143,7 @@ jobs:
143143
# multiple jobs for building carla, deps and plugins
144144
make DEBUG=true carla deps dgl plugins resources -j $(nproc)
145145
# single job for final build stage, otherwise we might get killed due to OOM
146-
make DEBUG=true HAVE_PULSEAUDIO=false clap lv2 vst2 vst3 -j 1
146+
make DEBUG=true HAVE_PULSEAUDIO=false jack -j 1
147147
- name: Set sha8
148148
id: slug
149149
run: echo "SHA8=$(echo ${{ github.sha }} | cut -c1-8)" >> $GITHUB_ENV
@@ -171,6 +171,7 @@ jobs:
171171
run: |
172172
if [ "${{ matrix.debug }}" -eq 1 ]; then
173173
echo "TARGET_SUFFIX=-debug" >> $GITHUB_ENV
174+
echo "MAKE_ARGS='DEBUG=true jack au'" >> $GITHUB_ENV
174175
echo "PAWPAW_DEBUG=1" >> $GITHUB_ENV
175176
fi
176177
- name: Set up cache
@@ -207,7 +208,7 @@ jobs:
207208
export PATH="/usr/local/opt/ccache/libexec:${PATH}"
208209
source deps/PawPaw/local.env macos-${{ matrix.target }}
209210
make features
210-
make NOOPT=true -j $(sysctl -n hw.logicalcpu)
211+
make NOOPT=true ${MAKE_ARGS} -j $(sysctl -n hw.logicalcpu)
211212
- name: Build macOS (packaging)
212213
if: steps.cache.outputs.cache-hit == 'true'
213214
shell: bash

src/Makefile.cardinal.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ endif
186186
endif
187187

188188
ifeq ($(MACOS),true)
189-
EXTRA_DSP_LIBS += -framework Accelerate -framework AppKit
189+
EXTRA_DSP_LIBS += -framework Accelerate -framework AppKit -framework AudioToolbox
190190
else ifeq ($(WINDOWS),true)
191191
EXTRA_DSP_LIBS += -lole32 -lshlwapi -luuid -lversion
192192
endif

0 commit comments

Comments
 (0)