Fix discovery build with Qt5

source/Makefile.mk

@@ -16,7 +16,7 @@ STRIP ?= strip
 
 DEBUG ?= false
 
-BASE_FLAGS  = -Wall -Wextra
+BASE_FLAGS  = -Wall -Wextra -fPIC
 
 ifeq ($(DEBUG),true)
 BASE_FLAGS += -O0 -g
@@ -53,7 +53,7 @@ BUILD_CXX_FLAGS += -DVESTIGE_HEADER
 
 HAVE_JACK         = $(shell pkg-config --exists jack && echo true)
 HAVE_OPENGL       = $(shell pkg-config --exists gl && echo true)
-HAVE_QT5          = $(shell pkg-config --atleast-version=5.0 QtCore && echo true)
+HAVE_QT5          = $(shell pkg-config --exists Qt5Core && echo true)
 
 HAVE_AF_DEPS      = $(shell pkg-config --exists libavcodec libavformat libavutil sndfile && echo true)
 HAVE_MF_DEPS      = $(shell pkg-config --exists smf && echo true)
@@ -74,3 +74,12 @@ ifeq ($(CARLA_RTAUDIO_SUPPORT),true)
 HAVE_ALSA         = $(shell pkg-config --exists alsa && echo true)
 HAVE_PULSEAUDIO   = $(shell pkg-config --exists libpulse-simple && echo true)
 endif
+
+# --------------------------------------------------------------
+
+ifeq ($(HAVE_QT5),true)
+# Qt5 doesn't define these
+MOC = moc
+RCC = rcc
+UIC = uic
+endif

source/discovery/Makefile

@@ -9,8 +9,14 @@ include ../Makefile.mk
 # --------------------------------------------------------------
 
 BUILD_CXX_FLAGS += -I../backend -I../includes -I../utils
+
+ifeq ($(HAVE_QT5),true)
+BUILD_CXX_FLAGS += $(shell pkg-config --cflags Qt5Core)
+LINK_FLAGS      += $(shell pkg-config --libs Qt5Core)
+else
 BUILD_CXX_FLAGS += $(shell pkg-config --cflags QtCore)
 LINK_FLAGS      += $(shell pkg-config --libs QtCore)
+endif
 
 # --------------------------------------------------------------
 
@@ -23,7 +29,7 @@ NATIVE_FLAGS    += $(shell pkg-config --cflags --libs fluidsynth) -DWANT_FLUIDSY
 endif
 
 ifeq ($(HAVE_LINUXSAMPLER),true)
-NATIVE_FLAGS    += $(shell pkg-config --cflags --libs linuxsampler) -DWANT_LINUXSAMPLER -DIS_CPP11=1
+NATIVE_FLAGS    += $(shell pkg-config --cflags --libs linuxsampler) -DWANT_LINUXSAMPLER
 endif
 
 # --------------------------------------------------------------

source/includes/CarlaDefines.hpp

@@ -48,7 +48,10 @@
 # endif
 #endif
 
-#ifndef CARLA_PROPER_CPP11_SUPPORT
+#ifdef CARLA_PROPER_CPP11_SUPPORT
+# define IS_CPP11 1
+#else
+# define IS_CPP11 0
 # define noexcept
 # define nullptr (0)
 #endif