Simplify CARLA_EXTRA_TARGETS setup

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

.github/workflows/build.yml

@@ -122,7 +122,7 @@ jobs:
           sudo dpkg --add-architecture i386
           sudo apt-get update -qq
           sudo apt-get install -yqq g++-i686-linux-gnu libasound2-dev:i386 libdbus-1-dev:i386 libgl1-mesa-dev:i386 libglib2.0-dev:i386 libx11-dev:i386 libxcursor-dev:i386 libxext-dev:i386 libxrandr-dev:i386
-          sudo apt-get install -yqq binutils-mingw-w64-i686 g++-mingw-w64-i686 mingw-w64 wine-stable wine64-tools
+          sudo apt-get install -yqq binutils-mingw-w64-i686 g++-mingw-w64-i686 mingw-w64 lib32stdc++-9-dev libx32stdc++-9-dev libwine-dev:i386 wine-stable wine64-tools
       - name: Build extra dependencies
         run: |
           git clone --depth=1 https://github.com/DISTRHO/PawPaw.git
@@ -131,16 +131,11 @@ jobs:
         run: |
           pushd PawPaw; source local.env linux-i686; popd
           make features
-          make NOOPT=true WITH_LTO=true -j $(nproc)
+          make NOOPT=true WITH_LTO=true all extra-win32 extra-wine32 -j $(nproc)
       - name: Build linux i686 extra
-        env:
-          CFLAGS: -m32
-          CXXFLAGS: -m32
-          LDFLAGS: -m32 -static-libgcc -static-libstdc++
-          PKG_CONFIG_PATH: /usr/lib/i386-linux-gnu/pkgconfig
         run: |
-          sudo apt-get install -yqq g++-multilib
-          make WITH_LTO=true extra -j $(nproc)
+          pushd PawPaw; source local.env linux; popd
+          make CARLA_EXTRA_TARGETS=true NOOPT=true WITH_LTO=true -j $(nproc)
       - name: Set sha8
         id: slug
         run: echo "::set-output name=sha8::$(echo ${{ github.sha }} | cut -c1-8)"
@@ -228,10 +223,13 @@ jobs:
         run: |
           pushd PawPaw; source local.env linux; popd
           make features
-          make NOOPT=true WITH_LTO=true -j $(nproc)
+          make NOOPT=true WITH_LTO=true all extra-posix32 extra-win32 extra-win64 extra-wine64 -j $(nproc)
       - name: Build linux x86_64 extra
         run: |
-          make WITH_LTO=true extra -j $(nproc)
+          sudo apt-get install libwine-dev:i386
+          pushd PawPaw; source local.env linux; popd
+          make CARLA_EXTRA_TARGETS=true NOOPT=true WITH_LTO=true extra-wine32 -j $(nproc)
+          make CARLA_EXTRA_TARGETS=true NOOPT=true WITH_LTO=true -j $(nproc)
       - name: Set sha8
         id: slug
         run: echo "::set-output name=sha8::$(echo ${{ github.sha }} | cut -c1-8)"
@@ -309,11 +307,7 @@ jobs:
         run: |
           pushd PawPaw; source local.env win32; popd
           make features
-          make NOOPT=true WITH_LTO=true -j $(nproc)
-      - name: Build win32 cross-compiled extra
-        run: |
-          pushd PawPaw; source local.env win32; popd
-          make NOOPT=true WITH_LTO=true extra -j $(nproc)
+          make CARLA_EXTRA_TARGETS=true NOOPT=true WITH_LTO=true -j $(nproc)
       - name: Set sha8
         id: slug
         run: echo "::set-output name=sha8::$(echo ${{ github.sha }} | cut -c1-8)"
@@ -356,11 +350,7 @@ jobs:
         run: |
           pushd PawPaw; source local.env win64; popd
           make features
-          make NOOPT=true WITH_LTO=true -j $(nproc)
-      - name: Build win64 cross-compiled extra
-        run: |
-          pushd PawPaw; source local.env win64; popd
-          make NOOPT=true WITH_LTO=true extra -j $(nproc)
+          make CARLA_EXTRA_TARGETS=true NOOPT=true WITH_LTO=true -j $(nproc)
       - name: Set sha8
         id: slug
         run: echo "::set-output name=sha8::$(echo ${{ github.sha }} | cut -c1-8)"

Makefile

@@ -42,29 +42,33 @@ CARLA_EXTRA_ARGS += EXTERNAL_PLUGINS=true
 endif
 
 CARLA_TARGETS = static-plugin
-CARLA_EXTRA_TARGETS =
 
 ifneq ($(USE_SYSTEM_CARLA_BINS),true)
 CARLA_TARGETS += bridges-plugin bridges-ui
-endif
 
+ifeq ($(CARLA_EXTRA_TARGETS),true)
+
+# 32bit bridge
 ifeq ($(CPU_X86_64),true)
 ifeq ($(WINDOWS),true)
-CARLA_EXTRA_TARGETS += win32
+CARLA_TARGETS += win32
 else ifneq ($(MACOS),true)
-CARLA_EXTRA_TARGETS += posix32
+CARLA_TARGETS += posix32
 endif
 endif
 
-ifeq ($(CPU_I386_OR_X86_64),true)
-ifeq ($(LINUX),true)
-CARLA_EXTRA_TARGETS += wine32
+# native wine bridge
+ifeq ($(CPU_I386_OR_X86_64)$(LINUX),truetrue)
 ifeq ($(CPU_X86_64),true)
-CARLA_EXTRA_TARGETS += wine64
-endif
+CARLA_TARGETS += wine64
+else
+CARLA_TARGETS += wine32
 endif
 endif
 
+endif # CARLA_EXTRA_TARGETS
+endif # USE_SYSTEM_CARLA_BINS
+
 # ---------------------------------------------------------------------------------------------------------------------
 # DPF bundled plugins
 
@@ -102,17 +106,27 @@ endif
 carla: dgl
 	$(MAKE) $(CARLA_EXTRA_ARGS) -C carla $(CARLA_TARGETS)
 
-extra: carla
-	$(MAKE) $(CARLA_EXTRA_ARGS) -C carla $(CARLA_EXTRA_TARGETS)
-ifeq ($(CPU_I386_OR_X86_64),true)
-ifeq ($(LINUX),true)
+extra-bins:
+	$(MAKE) $(CARLA_EXTRA_ARGS) $(ILDAEIL_FX_ARGS) carlabins -C plugins/FX
+ifneq ($(WASM),true)
+	$(MAKE) $(CARLA_EXTRA_ARGS) $(ILDAEIL_MIDI_ARGS) carlabins -C plugins/MIDI
+	$(MAKE) $(CARLA_EXTRA_ARGS) $(ILDAEIL_SYNTH_ARGS) carlabins -C plugins/Synth
+endif
+
+extra-posix32:
+	$(MAKE) $(CARLA_EXTRA_ARGS) -C carla posix32
+
+extra-win32:
 	$(MAKE) $(CARLA_EXTRA_ARGS) -C carla win32 AR=i686-w64-mingw32-ar CC=i686-w64-mingw32-gcc CXX=i686-w64-mingw32-g++
-ifeq ($(CPU_X86_64),true)
+
+extra-win64:
 	$(MAKE) $(CARLA_EXTRA_ARGS) -C carla win64 AR=x86_64-w64-mingw32-ar CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++
-endif
-endif
-endif
-	$(MAKE) plugins CARLA_EXTRA_BINARIES=true
+
+extra-wine32:
+	$(MAKE) $(CARLA_EXTRA_ARGS) -C carla wine32
+
+extra-wine64:
+	$(MAKE) $(CARLA_EXTRA_ARGS) -C carla wine64
 
 dgl:
 	$(MAKE) -C dpf/dgl opengl

carla

@@ -1 +1 @@
-Subproject commit c2bd7cf63c0776cc04d834fb95a49c7ce8968b7c
+Subproject commit a31246bc492e4020a0102dff32233e87ccb4f5e3

dpf

@@ -1 +1 @@
-Subproject commit 55a1e21ebbb42a4778f26188a9f75aecb0c1210c
+Subproject commit 48eb45016b67547b02d2ac644cd2a147da7cf7b9

plugins/Common/Makefile.mk

@@ -125,7 +125,7 @@ CARLA_BINARIES  = $(CURDIR)/../../carla/bin/carla-bridge-native$(APP_EXT)
 CARLA_BINARIES += $(CURDIR)/../../carla/bin/carla-bridge-lv2-gtk2$(APP_EXT)
 CARLA_BINARIES += $(CURDIR)/../../carla/bin/carla-bridge-lv2-gtk3$(APP_EXT)
 
-ifeq ($(CARLA_EXTRA_BINARIES),true)
+ifeq ($(CARLA_EXTRA_TARGETS),true)
 
 # 32bit bridge
 ifeq ($(CPU_X86_64),true)
@@ -137,8 +137,7 @@ endif
 endif
 
 # Windows bridges
-ifeq ($(CPU_I386_OR_X86_64),true)
-ifeq ($(LINUX),true)
+ifeq ($(CPU_I386_OR_X86_64)$(LINUX),truetrue)
 CARLA_BINARIES += $(CURDIR)/../../carla/bin/carla-bridge-win32.exe
 CARLA_BINARIES += $(CURDIR)/../../carla/bin/jackbridge-wine32.dll
 ifeq ($(CPU_X86_64),true)
@@ -146,9 +145,8 @@ CARLA_BINARIES += $(CURDIR)/../../carla/bin/carla-bridge-win64.exe
 CARLA_BINARIES += $(CURDIR)/../../carla/bin/jackbridge-wine64.dll
 endif
 endif
-endif
 
-endif # CARLA_EXTRA_BINARIES
+endif # CARLA_EXTRA_TARGETS
 
 carlabins: $(TARGETS_BASE)
 	install -m 755 $(CARLA_BINARIES) $(shell dirname $(lv2))