From ef42f74985118c537db4be3032d97e2f4ba3aef1 Mon Sep 17 00:00:00 2001 From: falkTX Date: Wed, 10 Sep 2014 09:12:55 +0100 Subject: [PATCH] Set default qt based on PyQt; Print more stuff in make features --- Makefile | 49 ++++++++++++++++++++++++++++++++--- source/Makefile.mk | 29 ++++++++++++++++++++- source/modules/theme/Makefile | 4 +++ source/plugin/Makefile | 8 +++++- 4 files changed, 85 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 642db44ca..ca7edcd0a 100644 --- a/Makefile +++ b/Makefile @@ -149,10 +149,14 @@ bin/carla-native-lv2-export$(APP_EXT): bin/carla-native.lv2/carla-native$(LIB_EX # -------------------------------------------------------------- +ifeq ($(HAVE_QT),true) theme: bin/styles/carlastyle$(LIB_EXT) bin/styles/carlastyle$(LIB_EXT): .FORCE $(MAKE) -C source/modules/theme +else +theme: +endif # -------------------------------------------------------------- # Binaries (posix32) @@ -589,7 +593,6 @@ uninstall: # -------------------------------------------------------------- USE_COLORS=true -USE_VST3=false ifeq ($(HAIKU),true) USE_COLORS=false @@ -609,6 +612,34 @@ ANS_YES=" YES " endif features: + @echo "$(tS)---> Main features $(tE)" +ifeq ($(HAVE_PYQT),true) + @echo "Front-End: $(ANS_YES)" +ifneq ($(WIN32),true) + @echo "LV2 plugin: $(ANS_YES)" +else + @echo "LV2 plugin: $(ANS_NO) $(mZ)Not available for Windows$(mE)" +endif +ifeq ($(LINUX),true) +ifeq ($(DEFAULT_QT),4) +ifeq ($(HAVE_X11),true) + @echo "VST plugin: $(ANS_YES)" +else # HAVE_X11 + @echo "VST plugin: $(ANS_NO) $(mS)X11 missing$(mE)" +endif +else # DEFAULT_QT + @echo "VST plugin: $(ANS_NO) $(mZ)Qt4 only$(mE)" +endif +else # LINUX + @echo "VST plugin: $(ANS_NO) $(mZ)Linux only$(mE)" +endif +else + @echo "Front-End: $(ANS_NO) $(mS)Missing PyQt$(mE)" + @echo "LV2 plugin: $(ANS_NO) $(mS)No front-end$(mE)" + @echo "VST plugin: $(ANS_NO) $(mS)No front-end$(mE)" +endif + @echo "" + @echo "$(tS)---> Engine drivers $(tE)" @echo "JACK: $(ANS_YES)" ifeq ($(LINUX),true) @@ -645,7 +676,19 @@ endif @echo "LADSPA: $(ANS_YES)" @echo "DSSI: $(ANS_YES)" @echo "LV2: $(ANS_YES)" - @echo "VST: $(ANS_YES)" +ifeq ($(MACOS_OR_WIN32),true) + @echo "VST: $(ANS_YES) (with UI)" +else +ifeq ($(LINUX),true) +ifeq ($(HAVE_X11),true) + @echo "VST: $(ANS_YES) (with UI)" +else + @echo "VST: $(ANS_YES) (without UI) $(mS)Missing X11$(mE)" +endif +else # LINUX + @echo "VST: $(ANS_YES) (without UI) $(mZ)Linux, Mac and Windows only$(mE)" +endif +endif ifeq ($(MACOS_OR_WIN32),true) @echo "VST3: $(ANS_YES)" else @@ -659,7 +702,7 @@ endif @echo "" @echo "$(tS)---> LV2 UI toolkit support: $(tE)" -# @echo "External:$(ANS_YES) (direct+bridge)" + @echo "External:$(ANS_YES) (direct)" ifeq ($(HAVE_GTK2),true) @echo "Gtk2: $(ANS_YES) (bridge)" else diff --git a/source/Makefile.mk b/source/Makefile.mk index bae381a6a..907bfe2dc 100644 --- a/source/Makefile.mk +++ b/source/Makefile.mk @@ -210,10 +210,37 @@ HAVE_QT5=false endif endif +ifeq ($(HAVE_QT4),true) +HAVE_QT=true +endif +ifeq ($(HAVE_QT5),true) +HAVE_QT=true +endif + +# -------------------------------------------------------------- +# Set PyQt tools + +PYUIC4 ?= /usr/bin/pyuic4 +PYUIC5 ?= /usr/bin/pyuic5 + +ifneq (,$(wildcard $(PYUIC4))) +HAVE_PYQT=true +HAVE_PYQT4=true +else +HAVE_PYQT4=false +endif + +ifneq (,$(wildcard $(PYUIC5))) +HAVE_PYQT=true +HAVE_PYQT5=true +else +HAVE_PYQT5=false +endif + # -------------------------------------------------------------- # Set default Qt used in frontend -ifeq ($(HAVE_QT4),true) +ifeq ($(HAVE_PYQT4),true) DEFAULT_QT ?= 4 else DEFAULT_QT ?= 5 diff --git a/source/modules/theme/Makefile b/source/modules/theme/Makefile index 1420e374b..859cbc7fa 100644 --- a/source/modules/theme/Makefile +++ b/source/modules/theme/Makefile @@ -6,6 +6,10 @@ include ../../Makefile.mk +ifneq ($(HAVE_QT),true) +$(error No Qt version available) +endif + # -------------------------------------------------------------- BUILD_CXX_FLAGS += -I. -I../../includes -I../../utils diff --git a/source/plugin/Makefile b/source/plugin/Makefile index 8d0e145fb..34a9eb198 100644 --- a/source/plugin/Makefile +++ b/source/plugin/Makefile @@ -74,17 +74,23 @@ endif # -------------------------------------------------------------- -TARGETS = \ +TARGETS = + +ifneq ($(WIN32),true) +TARGETS += \ ../../bin/carla-native.lv2/carla-native$(LIB_EXT) \ ../../bin/carla-native-lv2-export$(APP_EXT) +endif ifeq ($(LINUX),true) ifeq ($(DEFAULT_QT),4) +ifeq ($(HAVE_X11),true) TARGETS += \ ../../bin/carla-native-vstfx$(LIB_EXT) \ ../../bin/carla-native-vstsyn$(LIB_EXT) endif endif +endif # --------------------------------------------------------------