From e463fa4dfb146be76244b3fe0938cb015eb1ede9 Mon Sep 17 00:00:00 2001
From: falkTX <falktx@falktx.com>
Date: Thu, 6 Apr 2023 15:51:21 +0200
Subject: [PATCH] Cleanup for things moved into DPF

Signed-off-by: falkTX <falktx@falktx.com>
---
 .github/workflows/build.yml | 6 +++---
 carla                       | 2 +-
 src/Makefile.cardinal.mk    | 6 ++----
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8a8ffef..8c64bc5 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -801,7 +801,7 @@ jobs:
           source ~/PawPawBuilds/emsdk/emsdk_env.sh
           pushd deps/PawPaw; source local.env wasm; popd
           make features
-          make CIBUILD=true HAVE_LIBLO=false NOOPT=true USE_GLES2=true -j $(nproc)
+          make CIBUILD=true HAVE_LIBLO=false NOOPT=true -j $(nproc)
       - name: Make wasm versioned and compress
         if: steps.cache.outputs.cache-hit == 'true'
         run: |
@@ -888,8 +888,8 @@ jobs:
           # FIXME send patch upstream, assuming this works..
           sed -i -e 's/defined(__riscv)/defined(__riscv) || defined(__EMSCRIPTEN__)/' plugins/surgext/surge/src/common/globals.h
           make features
-          make CIBUILD=true HAVE_LIBLO=false NOOPT=true USE_GLES2=true -j $(nproc)
-          make CIBUILD=true HAVE_LIBLO=false NOOPT=true USE_GLES2=true -j $(nproc) -C src/CardinalMiniSep modgui
+          make CIBUILD=true HAVE_LIBLO=false NOOPT=true -j $(nproc)
+          make CIBUILD=true HAVE_LIBLO=false NOOPT=true -j $(nproc) -C src/CardinalMiniSep modgui
       - name: Make wasm-noopt versioned and compress
         if: steps.cache.outputs.cache-hit == 'true'
         run: |
diff --git a/carla b/carla
index 6cdd0e7..56468b4 160000
--- a/carla
+++ b/carla
@@ -1 +1 @@
-Subproject commit 6cdd0e71a33bd22aacbe5890f17dcdf14606bd68
+Subproject commit 56468b473205185bf120619c23b3d594513f4b7b
diff --git a/src/Makefile.cardinal.mk b/src/Makefile.cardinal.mk
index ce80d65..843fa1a 100644
--- a/src/Makefile.cardinal.mk
+++ b/src/Makefile.cardinal.mk
@@ -157,7 +157,7 @@ endif
 # --------------------------------------------------------------
 
 # FIXME
-ifeq ($(CARDINAL_VARIANT)$(CIBUILD)$(WASM),nativetruetrue)
+ifeq ($(CARDINAL_VARIANT)$(WASM),nativetrue)
 ifneq ($(OLD_PATH),)
 STATIC_CARLA_PLUGIN_LIBS = -lsndfile -lopus -lFLAC -lvorbisenc -lvorbis -logg -lm
 endif
@@ -170,7 +170,7 @@ ifneq ($(CARDINAL_VARIANT),mini)
 ifeq ($(shell $(PKG_CONFIG) --exists fftw3f && echo true),true)
 EXTRA_DSP_DEPENDENCIES += ../../deps/aubio/libaubio.a
 EXTRA_DSP_LIBS += ../../deps/aubio/libaubio.a
-EXTRA_DSP_LIBS += $(shell $(PKG_CONFIG) --libs fftw3f)
+EXTRA_DSP_LIBS += $(filter-out -lpthread,$(shell $(PKG_CONFIG) --libs fftw3f))
 endif
 endif
 
@@ -521,8 +521,6 @@ endif
 ifeq ($(WINDOWS),true)
 WINDRES ?= $(subst gcc,windres,$(CC))
 
-JACK_LIBS += -Wl,-subsystem,windows
-
 $(BUILD_DIR)/distrho.rc.o: ../../utils/distrho.rc ../../utils/distrho.ico
 	-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
 	@echo "Compiling distrho.rc"