From 93cbcaf9cbbd5e608d72795cb46ef2abbf5657e3 Mon Sep 17 00:00:00 2001
From: falkTX <falktx@falktx.com>
Date: Wed, 13 Oct 2021 17:19:00 +0100
Subject: [PATCH] More USING_RTAUDIO setup, build jackbridge.min.a

Signed-off-by: falkTX <falktx@falktx.com>
---
 Makefile                              |  2 +-
 source/Makefile.mk                    |  4 ++++
 source/backend/engine/CarlaEngine.cpp | 18 ++++++++++++------
 source/jackbridge/Makefile            |  9 ++++++++-
 4 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index af8f7b257..68297618e 100644
--- a/Makefile
+++ b/Makefile
@@ -78,7 +78,7 @@ ifeq ($(USING_JUCE_GUI_EXTRA),true)
 endif
 endif
 
-ifneq ($(USING_JUCE_AUDIO_DEVICES),true)
+ifeq ($(USING_RTAUDIO),true)
 3RD_LIBS += $(MODULEDIR)/rtaudio.a
 3RD_LIBS += $(MODULEDIR)/rtmidi.a
 endif
diff --git a/source/Makefile.mk b/source/Makefile.mk
index d46890c62..3f8bce4fb 100644
--- a/source/Makefile.mk
+++ b/source/Makefile.mk
@@ -218,6 +218,10 @@ ifeq ($(USING_JUCE_GUI_EXTRA),true)
 BASE_FLAGS += -DUSING_JUCE_GUI_EXTRA
 endif
 
+ifeq ($(USING_RTAUDIO),true)
+BASE_FLAGS += -DUSING_RTAUDIO
+endif
+
 # ---------------------------------------------------------------------------------------------------------------------
 # Set app extension
 
diff --git a/source/backend/engine/CarlaEngine.cpp b/source/backend/engine/CarlaEngine.cpp
index d9f021fe0..505dd70c9 100644
--- a/source/backend/engine/CarlaEngine.cpp
+++ b/source/backend/engine/CarlaEngine.cpp
@@ -101,7 +101,8 @@ uint CarlaEngine::getDriverCount()
 #ifndef BUILD_BRIDGE
 # ifdef USING_JUCE_AUDIO_DEVICES
     count += getJuceApiCount();
-# else
+# endif
+# ifdef USING_RTAUDIO
     count += getRtAudioApiCount();
 # endif
 #endif
@@ -127,7 +128,8 @@ const char* CarlaEngine::getDriverName(const uint index2)
             return getJuceApiName(index);
         index -= count;
     }
-# else
+# endif
+# ifdef USING_RTAUDIO
     if (const uint count = getRtAudioApiCount())
     {
         if (index < count)
@@ -161,7 +163,8 @@ const char* const* CarlaEngine::getDriverDeviceNames(const uint index2)
             return getJuceApiDeviceNames(index);
         index -= count;
     }
-# else
+# endif
+# ifdef USING_RTAUDIO
     if (const uint count = getRtAudioApiCount())
     {
         if (index < count)
@@ -198,7 +201,8 @@ const EngineDriverDeviceInfo* CarlaEngine::getDriverDeviceInfo(const uint index2
             return getJuceDeviceInfo(index, deviceName);
         index -= count;
     }
-# else
+# endif
+# ifdef USING_RTAUDIO
     if (const uint count = getRtAudioApiCount())
     {
         if (index < count)
@@ -231,7 +235,8 @@ bool CarlaEngine::showDriverDeviceControlPanel(const uint index2, const char* co
             return showJuceDeviceControlPanel(index, deviceName);
         index -= count;
     }
-# else
+# endif
+# ifdef USING_RTAUDIO
     if (const uint count = getRtAudioApiCount())
     {
         if (index < count)
@@ -281,7 +286,8 @@ CarlaEngine* CarlaEngine::newDriverByName(const char* const driverName)
         return newJuce(AUDIO_API_DIRECTSOUND);
     if (std::strcmp(driverName, "WASAPI") == 0 || std::strcmp(driverName, "Windows Audio") == 0)
         return newJuce(AUDIO_API_WASAPI);
-# else
+# endif
+# ifdef USING_RTAUDIO
     // -------------------------------------------------------------------
     // common
 
diff --git a/source/jackbridge/Makefile b/source/jackbridge/Makefile
index 9a54d4f9e..d070b96e3 100644
--- a/source/jackbridge/Makefile
+++ b/source/jackbridge/Makefile
@@ -54,6 +54,7 @@ endif
 # ---------------------------------------------------------------------------------------------------------------------
 
 OBJS          = $(OBJDIR)/JackBridge1.cpp.o          $(OBJDIR)/JackBridge2.cpp.o
+OBJS_min      = $(OBJDIR)/JackBridge2.cpp.o
 OBJS_arm32    = $(OBJDIR)/JackBridge1.cpp.arm32.o    $(OBJDIR)/JackBridge2.cpp.arm32.o
 OBJS_posix32  = $(OBJDIR)/JackBridge1.cpp.posix32.o  $(OBJDIR)/JackBridge2.cpp.posix32.o
 OBJS_posix64  = $(OBJDIR)/JackBridge1.cpp.posix64.o  $(OBJDIR)/JackBridge2.cpp.posix64.o
@@ -69,7 +70,7 @@ OBJS_win32e   = $(OBJDIR)/JackBridgeExport.cpp.win32e.o
 
 # ---------------------------------------------------------------------------------------------------------------------
 
-all: $(MODULEDIR)/$(MODULENAME).a
+all: $(MODULEDIR)/$(MODULENAME).a $(MODULEDIR)/$(MODULENAME).min.a
 
 ifeq ($(WIN32),true)
 posix32:
@@ -112,6 +113,12 @@ $(MODULEDIR)/$(MODULENAME).a: $(OBJS)
 	@rm -f $@
 	@$(AR) crs $@ $^
 
+$(MODULEDIR)/$(MODULENAME).min.a: $(OBJS_min)
+	-@mkdir -p $(MODULEDIR)
+	@echo "Creating $(MODULENAME).min.a"
+	@rm -f $@
+	@$(AR) crs $@ $^
+
 $(MODULEDIR)/$(MODULENAME).arm32.a: $(OBJS_arm32)
 	-@mkdir -p $(MODULEDIR)
 	@echo "Creating $(MODULENAME).arm32.a"