Move some code around

Signed-off-by: falkTX <falktx@falktx.com>
2021-02-07 18:47:03 +00:00 · 2021-02-07 18:47:03 +00:00 · 1dcd6a9b95
parent d765234d65
commit 1dcd6a9b95
19 changed files with 10 additions and 2 deletions
--- a/Makefile.dist.mk
+++ b/Makefile.dist.mk
@ -256,7 +256,7 @@ build/Carla.app/Contents/MacOS/lib/library.zip: $(CARLA_APP_ZIPS) data/macos/bun

 build/Carla/Carla.exe: build/Carla/lib/library.zip

-build/Carla/lib/library.zip: data/windows/app-gui.py # source/frontend/*
+build/Carla/lib/library.zip: data/windows/app-gui.py source/frontend/*
 	$(call GENERATE_LIBRARY_ZIP,Carla)

 # $(CARLA_APP_ZIPS)
@ -325,6 +325,14 @@ build/Carla/iconengines/% build/Carla-Control/iconengines/%: $(QT5_PREFIX)/lib/q
 	-@mkdir -p $(shell dirname $@)
 	@cp -v $< $@

+build/Carla/imageformats/% build/Carla-Control/imageformats/%: $(QT5_PREFIX)/lib/qt5/plugins/imageformats/%
+	-@mkdir -p $(shell dirname $@)
+	@cp -v $< $@
+
+build/Carla/platforms/% build/Carla-Control/platforms/%: $(QT5_PREFIX)/lib/qt5/plugins/platforms/%
+	-@mkdir -p $(shell dirname $@)
+	@cp -v $< $@
+
 build/Carla/% build/Carla-Control/%: bin/%
 	-@mkdir -p $(shell dirname $@)
 	@cp -v $< $@
--- a/source/frontend/C++/carla.cpp
+++ b/source/frontend/C++/carla.cpp
--- a/source/frontend/C++/carla_app.cpp
+++ b/source/frontend/C++/carla_app.cpp
--- a/source/frontend/C++/carla_app.hpp
+++ b/source/frontend/C++/carla_app.hpp
--- a/source/frontend/C++/carla_database.cpp
+++ b/source/frontend/C++/carla_database.cpp
--- a/source/frontend/C++/carla_database.hpp
+++ b/source/frontend/C++/carla_database.hpp
--- a/source/frontend/C++/carla_database_app.cpp
+++ b/source/frontend/C++/carla_database_app.cpp
--- a/source/frontend/C++/carla_host.cpp
+++ b/source/frontend/C++/carla_host.cpp
--- a/source/frontend/C++/carla_host.hpp
+++ b/source/frontend/C++/carla_host.hpp
--- a/source/frontend/C++/carla_settings.cpp
+++ b/source/frontend/C++/carla_settings.cpp
--- a/source/frontend/C++/carla_settings.hpp
+++ b/source/frontend/C++/carla_settings.hpp
--- a/source/frontend/C++/carla_settings_app.cpp
+++ b/source/frontend/C++/carla_settings_app.cpp
--- a/source/frontend/C++/carla_shared.cpp
+++ b/source/frontend/C++/carla_shared.cpp
--- a/source/frontend/C++/carla_shared.hpp
+++ b/source/frontend/C++/carla_shared.hpp
--- a/source/frontend/C++/carla_skin.cpp
+++ b/source/frontend/C++/carla_skin.cpp
--- a/source/frontend/C++/carla_skin.hpp
+++ b/source/frontend/C++/carla_skin.hpp
--- a/source/frontend/C++/carla_widgets.cpp
+++ b/source/frontend/C++/carla_widgets.cpp
--- a/source/frontend/C++/carla_widgets.hpp
+++ b/source/frontend/C++/carla_widgets.hpp
--- a/source/frontend/carla_database.py
+++ b/source/frontend/carla_database.py
@ -1135,11 +1135,11 @@ class PluginRefreshW(QDialog):
            self.ui.ico_native.setPixmap(self.fIconNo)
            self.ui.ch_native.setEnabled(False)
            self.ui.ch_sf2.setEnabled(False)
-            self.ui.ch_sfz.setEnabled(False)
            if not hasNonNative:
                self.ui.ch_ladspa.setEnabled(False)
                self.ui.ch_dssi.setEnabled(False)
                self.ui.ch_vst.setEnabled(False)
+                self.ui.ch_vst3.setEnabled(False)

        self.setWindowFlags(self.windowFlags() & ~Qt.WindowContextHelpButtonHint)