From a98fbe51b173f83cf021f0963c76245a50d66c51 Mon Sep 17 00:00:00 2001 From: falkTX Date: Wed, 25 Dec 2019 14:31:25 +0000 Subject: [PATCH] Move some files around, fixes #984 --- .gitignore | 1 + source/frontend/Makefile | 6 ++++++ source/{native-plugins/resources => frontend}/bigmeter-ui | 0 source/{native-plugins/resources => frontend}/carla-plugin | 0 source/frontend/carla-plugin-patchbay | 1 + .../{native-plugins/resources => frontend}/midipattern-ui | 0 source/{native-plugins/resources => frontend}/notes-ui | 0 7 files changed, 8 insertions(+) rename source/{native-plugins/resources => frontend}/bigmeter-ui (100%) rename source/{native-plugins/resources => frontend}/carla-plugin (100%) create mode 120000 source/frontend/carla-plugin-patchbay rename source/{native-plugins/resources => frontend}/midipattern-ui (100%) rename source/{native-plugins/resources => frontend}/notes-ui (100%) diff --git a/.gitignore b/.gitignore index db349aa8a..237042482 100644 --- a/.gitignore +++ b/.gitignore @@ -34,6 +34,7 @@ bin/carla.lv2/carla-bridge-* bin/carla-database bin/carla-settings bin/jack/ +bin/resources/ bin/styles/ build/ diff --git a/source/frontend/Makefile b/source/frontend/Makefile index 867bfe338..d84924740 100644 --- a/source/frontend/Makefile +++ b/source/frontend/Makefile @@ -38,8 +38,12 @@ RES = \ else RES = \ resources_rc.py \ + $(BINDIR)/resources/modgui \ $(BINDIR)/resources/patchcanvas \ $(BINDIR)/resources/widgets \ + $(BINDIR)/resources/bigmeter-ui \ + $(BINDIR)/resources/carla-plugin \ + $(BINDIR)/resources/carla-plugin-patchbay \ $(BINDIR)/resources/carla_app.py \ $(BINDIR)/resources/carla_backend.py \ $(BINDIR)/resources/carla_backend_qt.py \ @@ -53,6 +57,8 @@ RES = \ $(BINDIR)/resources/carla_utils.py \ $(BINDIR)/resources/carla_widgets.py \ $(BINDIR)/resources/externalui.py \ + $(BINDIR)/resources/midipattern-ui \ + $(BINDIR)/resources/notes-ui \ $(BINDIR)/resources/resources_rc.py \ $(BINDIR)/resources/ui_carla_about.py \ $(BINDIR)/resources/ui_carla_about_juce.py \ diff --git a/source/native-plugins/resources/bigmeter-ui b/source/frontend/bigmeter-ui similarity index 100% rename from source/native-plugins/resources/bigmeter-ui rename to source/frontend/bigmeter-ui diff --git a/source/native-plugins/resources/carla-plugin b/source/frontend/carla-plugin similarity index 100% rename from source/native-plugins/resources/carla-plugin rename to source/frontend/carla-plugin diff --git a/source/frontend/carla-plugin-patchbay b/source/frontend/carla-plugin-patchbay new file mode 120000 index 000000000..027ec0d98 --- /dev/null +++ b/source/frontend/carla-plugin-patchbay @@ -0,0 +1 @@ +carla-plugin \ No newline at end of file diff --git a/source/native-plugins/resources/midipattern-ui b/source/frontend/midipattern-ui similarity index 100% rename from source/native-plugins/resources/midipattern-ui rename to source/frontend/midipattern-ui diff --git a/source/native-plugins/resources/notes-ui b/source/frontend/notes-ui similarity index 100% rename from source/native-plugins/resources/notes-ui rename to source/frontend/notes-ui