From 851c89ec07cb7ecb3a9810cb079736de711c905a Mon Sep 17 00:00:00 2001
From: falkTX <falktx@gmail.com>
Date: Fri, 15 Mar 2013 02:48:29 +0000
Subject: [PATCH] Fix build

---
 source/bridges/Makefile              | 7 ++++---
 source/discovery/Makefile            | 2 ++
 source/discovery/carla-discovery.cpp | 8 ++++----
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/source/bridges/Makefile b/source/bridges/Makefile
index 83e316ffb..cf48bed68 100644
--- a/source/bridges/Makefile
+++ b/source/bridges/Makefile
@@ -41,8 +41,8 @@ BUILD_PLUGIN_FLAGS += $(shell pkg-config --cflags gl)
 LINK_PLUGIN_FLAGS   = $(LINK_FLAGS)
 LINK_PLUGIN_FLAGS  += $(shell pkg-config --libs gl)
 
-NATIVE_BUILD_FLAGS  = $(BUILD_PLUGIN_FLAGS) $(shell pkg-config --cflags jack) -DWANT_NATIVE
-NATIVE_LINK_FLAGS   = $(LINK_PLUGIN_FLAGS) $(shell pkg-config --libs jack) -ldl
+NATIVE_BUILD_FLAGS  = $(BUILD_PLUGIN_FLAGS) $(shell pkg-config --cflags jack QtGui) -DWANT_NATIVE
+NATIVE_LINK_FLAGS   = $(LINK_PLUGIN_FLAGS) $(shell pkg-config --libs jack QtGui) -ldl
 
 ifeq ($(HAVE_AF_DEPS),true)
 NATIVE_BUILD_FLAGS += -DWANT_AUDIOFILE
@@ -279,7 +279,8 @@ OBJS_NATIVE += \
 	../backend/libcarla_native.a \
 	../libs/dgl.a \
 	../libs/lilv.a \
-	../libs/rtmempool.a
+	../libs/rtmempool.a \
+	../libs/widgets.a
 
 carla-bridge-native: $(OBJS_NATIVE)
 	$(CXX) $^ $(NATIVE_LINK_FLAGS) -o $@ && $(STRIP) $@
diff --git a/source/discovery/Makefile b/source/discovery/Makefile
index 53457089c..7667c5f14 100644
--- a/source/discovery/Makefile
+++ b/source/discovery/Makefile
@@ -9,6 +9,8 @@ include ../Makefile.mk
 # --------------------------------------------------------------
 
 BUILD_CXX_FLAGS += -I../backend -I../includes -I../utils
+BUILD_CXX_FLAGS += $(shell pkg-config --cflags QtCore)
+LINK_FLAGS      += $(shell pkg-config --libs QtCore)
 
 ifeq ($(CARLA_PLUGIN_SUPPORT),true)
 BUILD_CXX_FLAGS += -DWANT_LADSPA -DWANT_DSSI -DWANT_LV2 -DWANT_VST
diff --git a/source/discovery/carla-discovery.cpp b/source/discovery/carla-discovery.cpp
index d16d6b847..7338a76cd 100644
--- a/source/discovery/carla-discovery.cpp
+++ b/source/discovery/carla-discovery.cpp
@@ -16,10 +16,10 @@
  */
 
 #include "CarlaBackendUtils.hpp"
-//#include "CarlaJuceUtils.hpp"
-//#include "CarlaLibUtils.hpp"
-//#include "CarlaString.hpp"
-//#include "CarlaMIDI.h"
+#include "CarlaJuceUtils.hpp"
+#include "CarlaLibUtils.hpp"
+#include "CarlaString.hpp"
+#include "CarlaMIDI.h"
 
 #ifdef WANT_LADSPA
 # include "CarlaLadspaUtils.hpp"