Browse Source

Cleanup

pull/1689/head
falkTX 2 years ago
parent
commit
9b89e62b01
3 changed files with 43 additions and 5 deletions
  1. +2
    -2
      .github/workflows/build.yml
  2. +2
    -3
      source/backend/utils/Makefile
  3. +39
    -0
      source/frontend/carla_frontend.cpp

+ 2
- 2
.github/workflows/build.yml View File

@@ -12,8 +12,8 @@ env:
HOMEBREW_NO_AUTO_UPDATE: 1 HOMEBREW_NO_AUTO_UPDATE: 1


jobs: jobs:
macos-10_15:
runs-on: macos-10.15
macos-11:
runs-on: macos-11
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Set up dependencies - name: Set up dependencies


+ 2
- 3
source/backend/utils/Makefile View File

@@ -28,6 +28,7 @@ TARGETS = $(BINDIR)/libcarla_utils$(LIB_EXT)


LIBS = $(MODULEDIR)/lilv.a LIBS = $(MODULEDIR)/lilv.a
LIBS += $(MODULEDIR)/water.files.a LIBS += $(MODULEDIR)/water.files.a
LIBS += $(MODULEDIR)/ysfx.a


ifeq ($(USING_JUCE),true) ifeq ($(USING_JUCE),true)
LIBS += $(MODULEDIR)/carla_juce.a LIBS += $(MODULEDIR)/carla_juce.a
@@ -43,6 +44,7 @@ endif


LINK_FLAGS += $(LILV_LIBS) LINK_FLAGS += $(LILV_LIBS)
LINK_FLAGS += $(WATER_LIBS) LINK_FLAGS += $(WATER_LIBS)
LINK_FLAGS += $(YSFX_GRAPHICS_LIBS)


ifeq ($(HAVE_X11),true) ifeq ($(HAVE_X11),true)
LINK_FLAGS += $(X11_LIBS) LINK_FLAGS += $(X11_LIBS)
@@ -65,9 +67,6 @@ LINK_FLAGS += $(JUCE_GUI_BASICS_LIBS)
LINK_FLAGS += $(JUCE_GUI_EXTRA_LIBS) LINK_FLAGS += $(JUCE_GUI_EXTRA_LIBS)
endif endif


LINK_FLAGS += $(MODULEDIR)/ysfx.a
LINK_FLAGS += $(YSFX_GRAPHICS_LIBS)

# --------------------------------------------------------------------------------------------------------------------- # ---------------------------------------------------------------------------------------------------------------------


all: $(TARGETS) all: $(TARGETS)


+ 39
- 0
source/frontend/carla_frontend.cpp View File

@@ -0,0 +1,39 @@
/*
* Carla Plugin Host
* Copyright (C) 2011-2022 Filipe Coelho <falktx@falktx.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of
* the License, or any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* For a full copy of the GNU General Public License see the doc/GPL.txt file.
*/

#include "CarlaBackend.h"
#include "CarlaUtils.hpp"

namespace CB = CARLA_BACKEND_NAMESPACE;

// -------------------------------------------------------------------------------------------------------------------

struct WidgetResult {
union {
struct {
const char* command;
const char* name;
const char* labelSetup;
} jackappdialog;
};
};

CARLA_PLUGIN_EXPORT void* carla_frontend_create_widget(void* parent, const char* widgetType);

CARLA_PLUGIN_EXPORT void* carla_frontend_get_result(void* widget, const char* widgetType);

// -------------------------------------------------------------------------------------------------------------------

Loading…
Cancel
Save