diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3c588da..fe72839 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -660,7 +660,8 @@ jobs:
       - name: Build for modduo
         if: steps.mpb-cache.outputs.cache-hit == 'true'
         run: |
-          make modduo CIBUILD=true HEADLESS=true MODDUO=true WITH_LTO=${{ env.WITH_LTO }} -j $(nproc)
+          make CIBUILD=true HEADLESS=true modduo-features
+          make CIBUILD=true HEADLESS=true MODDUO=true WITH_LTO=${{ env.WITH_LTO }} modduo -j $(nproc)
       - name: Set sha8
         id: slug
         run: echo "SHA8=$(echo ${{ github.sha }} | cut -c1-8)" >> $GITHUB_ENV
@@ -702,7 +703,8 @@ jobs:
       - name: Build for modduox
         if: steps.mpb-cache.outputs.cache-hit == 'true'
         run: |
-          make modduox CIBUILD=true HEADLESS=true WITH_LTO=${{ env.WITH_LTO }} -j $(nproc)
+          make CIBUILD=true HEADLESS=true modduox-features
+          make CIBUILD=true HEADLESS=true WITH_LTO=${{ env.WITH_LTO }} modduox -j $(nproc)
       - name: Set sha8
         id: slug
         run: echo "SHA8=$(echo ${{ github.sha }} | cut -c1-8)" >> $GITHUB_ENV
@@ -744,7 +746,8 @@ jobs:
       - name: Build for moddwarf
         if: steps.mpb-cache.outputs.cache-hit == 'true'
         run: |
-          make moddwarf CIBUILD=true HEADLESS=true WITH_LTO=${{ env.WITH_LTO }} -j $(nproc)
+          make CIBUILD=true HEADLESS=true moddwarf-features
+          make CIBUILD=true HEADLESS=true WITH_LTO=${{ env.WITH_LTO }} moddwarf -j $(nproc)
       - name: Set sha8
         id: slug
         run: echo "SHA8=$(echo ${{ github.sha }} | cut -c1-8)" >> $GITHUB_ENV
diff --git a/Makefile b/Makefile
index 55d96a0..d12c8d0 100644
--- a/Makefile
+++ b/Makefile
@@ -72,16 +72,16 @@ DGL_EXTRA_ARGS = \
 
 ifeq ($(SYSDEPS),true)
 
-ifneq ($(shell pkg-config --exists jansson && echo true),true)
+ifneq ($(shell $(PKG_CONFIG) --exists jansson && echo true),true)
 $(error jansson dependency not installed/available)
 endif
-ifneq ($(shell pkg-config --exists libarchive && echo true),true)
+ifneq ($(shell $(PKG_CONFIG) --exists libarchive && echo true),true)
 $(error libarchive dependency not installed/available)
 endif
-ifneq ($(shell pkg-config --exists samplerate && echo true),true)
+ifneq ($(shell $(PKG_CONFIG) --exists samplerate && echo true),true)
 $(error samplerate dependency not installed/available)
 endif
-ifneq ($(shell pkg-config --exists speexdsp && echo true),true)
+ifneq ($(shell $(PKG_CONFIG) --exists speexdsp && echo true),true)
 $(error speexdsp dependency not installed/available)
 endif
 
@@ -89,7 +89,7 @@ endif
 
 ifeq ($(HEADLESS),true)
 
-ifneq ($(shell pkg-config --exists liblo && echo true),true)
+ifneq ($(shell $(PKG_CONFIG) --exists liblo && echo true),true)
 $(error liblo dependency not installed/available)
 endif
 
diff --git a/dpf b/dpf
index 8d6748c..03a7dbf 160000
--- a/dpf
+++ b/dpf
@@ -1 +1 @@
-Subproject commit 8d6748c502d8facf9dba71f1af2247f85dc938a3
+Subproject commit 03a7dbf4ef748ad76bc5b8845d9adb348645689f