From 6858049441d4deddf838e9e84a3acf44ba248434 Mon Sep 17 00:00:00 2001 From: falkTX Date: Fri, 1 Nov 2013 01:58:57 +0000 Subject: [PATCH] Fix build of qt4+qt5 --- source/Makefile.mk | 2 +- source/bridges/Makefile | 4 +-- source/modules/Makefile | 3 ++ source/modules/theme/Makefile | 63 ++++++++++++++++++++--------------- 4 files changed, 43 insertions(+), 29 deletions(-) diff --git a/source/Makefile.mk b/source/Makefile.mk index 5f1002392..97e80e2d4 100644 --- a/source/Makefile.mk +++ b/source/Makefile.mk @@ -17,7 +17,7 @@ CARLA_CSOUND_SUPPORT = true CARLA_SAMPLERS_SUPPORT = true # Use the free vestige header instead of the official VST SDK -# CARLA_VESTIGE_HEADER = true +CARLA_VESTIGE_HEADER = true # -------------------------------------------------------------- # DO NOT MODIFY PAST THIS POINT! diff --git a/source/bridges/Makefile b/source/bridges/Makefile index f81a2a35d..06985617f 100644 --- a/source/bridges/Makefile +++ b/source/bridges/Makefile @@ -46,7 +46,7 @@ LINK_PLUGIN_FLAGS += $(JUCE_GUI_BASICS_LIBS) POSIX_BUILD_FLAGS = $(BUILD_PLUGIN_FLAGS) POSIX_32BIT_FLAGS = $(32BIT_FLAGS) -L/usr/lib32 -L/usr/lib/i386-linux-gnu POSIX_64BIT_FLAGS = $(64BIT_FLAGS) -L/usr/lib64 -L/usr/lib/x86_64-linux-gnu -POSIX_LINK_FLAGS = $(LINK_PLUGIN_FLAGS) -ldl -ljack +POSIX_LINK_FLAGS = $(LINK_PLUGIN_FLAGS) -ldl ifneq ($(MACOS),true) POSIX_LINK_FLAGS += -lrt @@ -264,7 +264,7 @@ OBJS_UI_LV2_QT4 = CarlaBridgeUI-LV2__lv2-qt4.o \ CarlaBridgeClient__lv2.o CarlaBridgeOsc__lv2.o \ CarlaBridgeToolkit__lv2.o CarlaBridgeToolkitQt__lv2-qt4.o -carla-bridge-lv2-qt4: $(OBJS_UI_LV2_QT4) $(OBJS_UI_LV2_LIBS) ../modules/theme.a +carla-bridge-lv2-qt4: $(OBJS_UI_LV2_QT4) $(OBJS_UI_LV2_LIBS) ../modules/theme.qt4.a $(CXX) $^ $(LINK_UI_LV2_QT4_FLAGS) -o $@ %__lv2-qt4.o: %.cpp CarlaBridgeToolkitQt4.moc resources.qt4.cpp diff --git a/source/modules/Makefile b/source/modules/Makefile index 8f3171e73..96c619f02 100644 --- a/source/modules/Makefile +++ b/source/modules/Makefile @@ -131,6 +131,9 @@ theme: theme_%: $(MAKE) -C theme $* +theme.qt4: + $(MAKE) -C theme qt4 + # -------------------------------------------------------------- jackbridge: diff --git a/source/modules/theme/Makefile b/source/modules/theme/Makefile index c59729e77..261598765 100644 --- a/source/modules/theme/Makefile +++ b/source/modules/theme/Makefile @@ -9,16 +9,19 @@ include ../../Makefile.mk # -------------------------------------------------------------- BUILD_CXX_FLAGS += -I. -I../../includes -I../../utils -QT4_CXX_FLAGS = $(BUILD_CXX_FLAGS) # FIXME: use copy instead of reference -BUILD_CXX_FLAGS += $(shell pkg-config --cflags Qt5Core Qt5Gui Qt5Widgets) -LINK_FLAGS += $(shell pkg-config --libs Qt5Core Qt5Gui Qt5Widgets) -QT_STYLES_DIR = $(shell pkg-config --variable=libdir Qt5Core)/qt5/plugins/styles +QT5_CXX_FLAGS = $(BUILD_CXX_FLAGS) +QT5_CXX_FLAGS += $(shell pkg-config --cflags Qt5Core Qt5Gui Qt5Widgets) +QT5_LINK_FLAGS += $(shell pkg-config --libs Qt5Core Qt5Gui Qt5Widgets) ifeq ($(HAVE_QT4),true) -QT4_CXX_FLAGS += $(shell pkg-config --cflags Qt5Core Qt5Gui Qt5Widgets) +QT4_CXX_FLAGS = $(BUILD_CXX_FLAGS) +QT4_CXX_FLAGS += $(shell pkg-config --cflags QtCore QtGui) +QT4_LINK_FLAGS += $(shell pkg-config --libs QtCore QtGui) endif +QT_STYLES_DIR = $(shell pkg-config --variable=libdir Qt5Core)/qt5/plugins/styles + # -------------------------------------------------------------- FILES = \ @@ -41,44 +44,49 @@ OBJS = \ CarlaStyle.cpp.o \ moc_CarlaStyle.cpp.o \ moc_CarlaStyleAnimations.cpp.o \ - moc_CarlaStylePrivate.cpp.o + moc_CarlaStylePrivate.cpp.o \ + resources.cpp.o OBJS_shared = $(OBJS) \ CarlaStylePlugin.cpp.o \ - moc_CarlaStylePlugin.cpp.o \ - resources.cpp.o + moc_CarlaStylePlugin.cpp.o # -------------------------------------------------------------- OBJS_qt4 = \ CarlaStyle.cpp.qt4.o \ - moc_CarlaStyle.cpp.qt4.o \ - moc_CarlaStyleAnimations.cpp.qt4.o \ - moc_CarlaStylePrivate.cpp.qt4.o + moc_CarlaStyle.qt4.cpp.o \ + moc_CarlaStyleAnimations.qt4.cpp.o \ + moc_CarlaStylePrivate.qt4.cpp.o \ + resources.qt4.cpp.o OBJS_posix32 = \ CarlaStyle.cpp.posix32.o \ moc_CarlaStyle.cpp.posix32.o \ moc_CarlaStyleAnimations.cpp.posix32.o \ - moc_CarlaStylePrivate.cpp.posix32.o + moc_CarlaStylePrivate.cpp.posix32.o \ + resources.cpp.posix32.o OBJS_posix64 = \ CarlaStyle.cpp.posix64.o \ moc_CarlaStyle.cpp.posix64.o \ moc_CarlaStyleAnimations.cpp.posix64.o \ - moc_CarlaStylePrivate.cpp.posix64.o + moc_CarlaStylePrivate.cpp.posix64.o \ + resources.cpp.posix64.o OBJS_win32 = \ CarlaStyle.cpp.win32.o \ moc_CarlaStyle.cpp.win32.o \ moc_CarlaStyleAnimations.cpp.win32.o \ - moc_CarlaStylePrivate.cpp.win32.o + moc_CarlaStylePrivate.cpp.win32.o \ + resources.cpp.win32.o OBJS_win64 = \ CarlaStyle.cpp.win64.o \ moc_CarlaStyle.cpp.win64.o \ moc_CarlaStyleAnimations.cpp.win64.o \ - moc_CarlaStylePrivate.cpp.win64.o + moc_CarlaStylePrivate.cpp.win64.o \ + resources.cpp.win64.o # -------------------------------------------------------------- @@ -129,33 +137,36 @@ win64: ../theme.win64.a # -------------------------------------------------------------- styles/carlastyle.dll: $(FILES) $(OBJS_shared) - $(CXX) $(OBJS_shared) -shared $(LINK_FLAGS) -o $@ + $(CXX) $(OBJS_shared) -shared $(QT5_LINK_FLAGS) -o $@ styles/carlastyle.dynlib: $(FILES) $(OBJS_shared) - $(CXX) $(OBJS_shared) -dynamiclib $(LINK_FLAGS) -o $@ + $(CXX) $(OBJS_shared) -dynamiclib $(QT5_LINK_FLAGS) -o $@ styles/carlastyle.so: $(FILES) $(OBJS_shared) - $(CXX) $(OBJS_shared) -shared $(LINK_FLAGS) -o $@ + $(CXX) $(OBJS_shared) -shared $(QT5_LINK_FLAGS) -o $@ # -------------------------------------------------------------- -%.cpp.o: %.cpp CarlaStyle.hpp moc_CarlaStyle.cpp - $(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ +%.qt4.cpp.o: %.qt4.cpp CarlaStyle.hpp moc_CarlaStyle.qt4.cpp + $(CXX) $< $(QT4_CXX_FLAGS) -c -o $@ -%.cpp.qt4.o: %.cpp CarlaStyle.hpp moc_CarlaStyle.cpp +%.cpp.qt4.o: %.cpp CarlaStyle.hpp moc_CarlaStyle.qt4.cpp $(CXX) $< $(QT4_CXX_FLAGS) -c -o $@ %.cpp.posix32.o: %.cpp CarlaStyle.hpp moc_CarlaStyle.cpp - $(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -c -o $@ + $(CXX) $< $(QT5_CXX_FLAGS) $(32BIT_FLAGS) -c -o $@ %.cpp.posix64.o: %.cpp CarlaStyle.hpp moc_CarlaStyle.cpp - $(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@ + $(CXX) $< $(QT5_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@ %.cpp.win32.o: %.cpp CarlaStyle.hpp moc_CarlaStyle.cpp - $(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -c -o $@ + $(CXX) $< $(QT5_CXX_FLAGS) $(32BIT_FLAGS) -c -o $@ %.cpp.win64.o: %.cpp CarlaStyle.hpp moc_CarlaStyle.cpp - $(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@ + $(CXX) $< $(QT5_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@ + +%.cpp.o: %.cpp CarlaStyle.hpp moc_CarlaStyle.cpp + $(CXX) $< $(QT5_CXX_FLAGS) -c -o $@ moc_%.qt4.cpp: %.hpp $(MOC_QT4) $< -o $@ @@ -172,7 +183,7 @@ resources.qt4.cpp: ../../../resources/resources-theme.qrc # -------------------------------------------------------------- clean: - $(RM) *.o ../theme*.a $(CARLASTYLE) $(FILES) + $(RM) *.o ../theme*.a $(CARLASTYLE) $(FILES) $(FILES_qt4) debug: $(MAKE) DEBUG=true