brian/Cardinal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Tweak full Carla build to match our custom one

Browse source 
Signed-off-by: falkTX <falktx@falktx.com>
This commit is contained in:
falkTX 2022-03-13 17:36:49 +00:00
parent 44684cbb95
commit 07e71d7c7b
No known key found for this signature in database
GPG key ID: CDBAA37ABC74FBA0
4 changed files with 15 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

16
.github/workflows/build.yml vendored
View file

@ -4,7 +4,7 @@ on:
push: push:
env: env:
CACHE_VERSION: 9 CACHE_VERSION: 10
DEBIAN_FRONTEND: noninteractive DEBIAN_FRONTEND: noninteractive
HOMEBREW_NO_AUTO_UPDATE: 1 HOMEBREW_NO_AUTO_UPDATE: 1
LIBGL_ALWAYS_SOFTWARE: 'true' LIBGL_ALWAYS_SOFTWARE: 'true'
@ -532,10 +532,9 @@ jobs:
run: | run: |
pushd deps/PawPaw; source local.env win32; popd pushd deps/PawPaw; source local.env win32; popd
make distclean -C carla make distclean -C carla
make -C carla EXTERNAL_PLUGINS=true HAVE_DGL=false HAVE_FLUIDSYNTH=false HAVE_HYLIA=false HAVE_JACK=false HAVE_LIBLO=false HAVE_ZYN_DEPS=false HAVE_ZYN_UI_DEPS=false USING_JUCE=false USING_JUCE_AUDIO_DEVICES=false USING_JUCE_GUI_EXTRA=false USING_RTAUDIO=false -j $(nproc) make -C carla CARLA_BACKEND_NAMESPACE=Cardinal EXTERNAL_PLUGINS=true HAVE_FLUIDSYNTH=false HAVE_ZYN_DEPS=false HAVE_ZYN_UI_DEPS=false HAVE_PYQT=true HAVE_QT5=true HAVE_QT5PKG=true STATIC_PLUGIN_TARGET=true USING_JUCE=false USING_JUCE_GUI_EXTRA=false -j $(nproc)
make -C carla TESTING=true _CARLA_LV2_PLUGIN_FILES= _CARLA_VST2_PLUGIN_FILES= dist make -C carla EMBED_TARGET=true TESTING=true dist
make -C carla TESTING=true _CARLA_LV2_PLUGIN_FILES= _CARLA_VST2_PLUGIN_FILES= dist make -C carla EMBED_TARGET=true TESTING=true dist
make -C carla TESTING=true _CARLA_LV2_PLUGIN_FILES= _CARLA_VST2_PLUGIN_FILES= dist
- name: Build win64 cross-compiled (packaging) - name: Build win64 cross-compiled (packaging)
run: | run: |
pushd deps/PawPaw; source local.env win32; popd pushd deps/PawPaw; source local.env win32; popd
@ -605,10 +604,9 @@ jobs:
run: | run: |
pushd deps/PawPaw; source local.env win64; popd pushd deps/PawPaw; source local.env win64; popd
make distclean -C carla make distclean -C carla
make -C carla EXTERNAL_PLUGINS=true HAVE_DGL=false HAVE_FLUIDSYNTH=false HAVE_HYLIA=false HAVE_JACK=false HAVE_LIBLO=false HAVE_ZYN_DEPS=false HAVE_ZYN_UI_DEPS=false USING_JUCE=false USING_JUCE_AUDIO_DEVICES=false USING_JUCE_GUI_EXTRA=false USING_RTAUDIO=false all win32r -j $(nproc) make -C carla CARLA_BACKEND_NAMESPACE=Cardinal EXTERNAL_PLUGINS=true HAVE_FLUIDSYNTH=false HAVE_ZYN_DEPS=false HAVE_ZYN_UI_DEPS=false HAVE_PYQT=true HAVE_QT5=true HAVE_QT5PKG=true STATIC_PLUGIN_TARGET=true USING_JUCE=false USING_JUCE_GUI_EXTRA=false all win32r -j $(nproc)
make -C carla TESTING=true _CARLA_LV2_PLUGIN_FILES= _CARLA_VST2_PLUGIN_FILES= dist make -C carla EMBED_TARGET=true TESTING=true dist
make -C carla TESTING=true _CARLA_LV2_PLUGIN_FILES= _CARLA_VST2_PLUGIN_FILES= dist make -C carla EMBED_TARGET=true TESTING=true dist
make -C carla TESTING=true _CARLA_LV2_PLUGIN_FILES= _CARLA_VST2_PLUGIN_FILES= dist
- name: Build win64 cross-compiled (packaging) - name: Build win64 cross-compiled (packaging)
run: | run: |
pushd deps/PawPaw; source local.env win64; popd pushd deps/PawPaw; source local.env win64; popd

2
carla

@ -1 +1 @@
Subproject commit c06a4e626ad897900895560999f05acb39740a85 Subproject commit 0bd8447005778e6957c7f7a25155cc5a8e163d15

2
deps/PawPaw vendored

@ -1 +1 @@
Subproject commit 55bbe0622b4a25dd30a849b9231bddcef8bcb53e Subproject commit 4923f40778f8fbf2d8a8cbb3bc8e527210d2cabd

6
plugins/Cardinal/src/Ildaeil.cpp
View file

@ -97,12 +97,14 @@ static void projectLoadedFromDSP(void* ui);
static Mutex sPluginInfoLoadMutex; static Mutex sPluginInfoLoadMutex;
/*
#ifndef HEADLESS #ifndef HEADLESS
struct JuceInitializer { struct JuceInitializer {
JuceInitializer() { carla_juce_init(); } JuceInitializer() { carla_juce_init(); }
~JuceInitializer() { carla_juce_cleanup(); } ~JuceInitializer() { carla_juce_cleanup(); }
}; };
#endif #endif
*/
struct IldaeilModule : Module { struct IldaeilModule : Module {
enum ParamIds { enum ParamIds {
@ -122,9 +124,11 @@ struct IldaeilModule : Module {
NUM_LIGHTS NUM_LIGHTS
}; };
/*
#ifndef HEADLESS #ifndef HEADLESS
SharedResourcePointer<JuceInitializer> juceInitializer; SharedResourcePointer<JuceInitializer> juceInitializer;
#endif #endif
*/
const CardinalPluginContext* const pcontext; const CardinalPluginContext* const pcontext;
@ -977,7 +981,9 @@ struct IldaeilWidget : ImGuiWidget, IdleCallback, Thread {
const CarlaHostHandle handle = module->fCarlaHostHandle; const CarlaHostHandle handle = module->fCarlaHostHandle;
DISTRHO_SAFE_ASSERT_RETURN(handle != nullptr,); DISTRHO_SAFE_ASSERT_RETURN(handle != nullptr,);
/*
carla_juce_idle(); carla_juce_idle();
*/
if (fileBrowserHandle != nullptr && fileBrowserIdle(fileBrowserHandle)) if (fileBrowserHandle != nullptr && fileBrowserIdle(fileBrowserHandle))
{ {