From c9958b5810f104de97752eb83607f1b9c218e09c Mon Sep 17 00:00:00 2001
From: falkTX <falktx@gmail.com>
Date: Sun, 8 Apr 2012 17:16:07 +0100
Subject: [PATCH] Update makefiles

---
 src/carla-bridge-ui/Makefile            | 30 ++++++++++++-------------
 src/carla-bridge/Makefile               |  4 ++--
 src/carla-discovery/carla-discovery.cpp |  4 ++--
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/carla-bridge-ui/Makefile b/src/carla-bridge-ui/Makefile
index 3ac41bb..666e969 100644
--- a/src/carla-bridge-ui/Makefile
+++ b/src/carla-bridge-ui/Makefile
@@ -1,35 +1,35 @@
 #!/usr/bin/make -f
-# Makefile for Carla-Bridge #
-# ----------------------------------------- #
+# Makefile for Carla-Bridge-UI #
+# -------------------------------------------- #
 # Created by falkTX
 #
 
 CXX     ?= g++
 WINECXX ?= wineg++
 
-BASE_FLAGS  = -DBUILD_BRIDGE -DBUILD_BRIDGE_UI -Wall -std=c++0x -I. ../carla-bridge -I../carla-includes -I../carla $(CXXFLAGS)
-BASE_FLAGS += `pkg-config --cflags --libs liblo QtCore` -ldl -lpthread $(LDFLAGS)
-#BASE_FLAGS += -DNDEBUG -O2 -ffast-math -fomit-frame-pointer -mtune=generic -msse
-BASE_FLAGS += -DDEBUG -O0 -g
-BASE_FLAGS += -DVESTIGE_HEADER -I../carla-includes/vestige # Comment this line to not use vestige header
+BUILD_FLAGS  = -DBUILD_BRIDGE -DBUILD_BRIDGE_UI -Wall -std=c++0x -I. -I../carla-includes -I../carla-bridge `pkg-config --cflags liblo QtCore` $(CXXFLAGS)
+BUILD_FLAGS += -DNDEBUG -DQT_NO_DEBUG -DQT_NO_DEBUG_STREAM -DQT_NO_DEBUG_OUTPUT -O2 -ffast-math -fomit-frame-pointer -mtune=generic -msse
+# BUILD_FLAGS += -DDEBUG -O0 -g
+BUILD_FLAGS += -DVESTIGE_HEADER -I../carla-includes/vestige # Comment this line to not use vestige header
+LINK_FLAGS   = `pkg-config --cflags --libs liblo QtCore` -ldl -lpthread $(LDFLAGS)
 
-BRIDGE_LV2_X11_FLAGS  = $(BASE_FLAGS) -DBRIDGE_LV2_X11  `pkg-config --cflags --libs QtGui`
-BRIDGE_LV2_GTK2_FLAGS = $(BASE_FLAGS) -DBRIDGE_LV2_GTK2 `pkg-config --cflags --libs gtk+-2.0`
-BRIDGE_LV2_QT4_FLAGS  = $(BASE_FLAGS) -DBRIDGE_LV2_QT4  `pkg-config --cflags --libs QtGui`
-BRIDGE_VST_QT4_FLAGS  = $(BASE_FLAGS) -DBRIDGE_VST_QT4  `pkg-config --cflags --libs QtGui`
+BRIDGE_LV2_X11_FLAGS  = $(BUILD_FLAGS) -DBRIDGE_LV2_X11  `pkg-config --cflags --libs QtGui` $(LINK_FLAGS)
+BRIDGE_LV2_GTK2_FLAGS = $(BUILD_FLAGS) -DBRIDGE_LV2_GTK2 `pkg-config --cflags --libs gtk+-2.0` $(LINK_FLAGS)
+BRIDGE_LV2_QT4_FLAGS  = $(BUILD_FLAGS) -DBRIDGE_LV2_QT4  `pkg-config --cflags --libs QtGui` $(LINK_FLAGS)
+BRIDGE_VST_QT4_FLAGS  = $(BUILD_FLAGS) -DBRIDGE_VST_QT4  `pkg-config --cflags --libs QtGui` $(LINK_FLAGS)
 
 
 all: carla-bridge-lv2-gtk2
-#carla-bridge-lv2-x11  carla-bridge-lv2-qt4 
-#carla-bridge-vst-qt4
+# all: carla-bridge-lv2-x11 carla-bridge-lv2-gtk2 carla-bridge-lv2-qt4
+# carla-bridge-vst-qt4
 
-# carla-bridge-lv2-x11: carla_bridge_lv2.cpp carla-bridge-x11.cpp osc.cpp carla-bridge.h bridge-includes.h osc.h
+# carla-bridge-lv2-x11: carla_bridge_lv2.cpp carla_bridge_x11.cpp ../carla-bridge/carla_osc.cpp
 # 	$(CXX) carla-bridge-lv2.cpp carla-bridge-x11.cpp osc.cpp $(BRIDGE_LV2_X11_FLAGS) -o $@
 
 carla-bridge-lv2-gtk2: carla_bridge_lv2.cpp carla_bridge_gtk2.cpp ../carla-bridge/carla_osc.cpp
 	$(CXX) carla_bridge_lv2.cpp carla_bridge_gtk2.cpp ../carla-bridge/carla_osc.cpp $(BRIDGE_LV2_GTK2_FLAGS) -o $@
 
-# carla-bridge-lv2-qt4: carla-bridge-lv2.cpp carla-bridge-qt4.cpp osc.cpp carla-bridge.h bridge-includes.h osc.h
+# carla-bridge-lv2-qt4: carla_bridge_lv2.cpp carla_bridge_qt4.cpp ../carla-bridge/carla_osc.cpp
 # 	$(CXX) carla-bridge-lv2.cpp carla-bridge-qt4.cpp osc.cpp $(BRIDGE_LV2_QT4_FLAGS) -o $@
 
 # carla-bridge-vst-qt4: carla-bridge-vst.cpp carla-bridge-qt4.cpp osc.cpp carla-bridge.h bridge-includes.h osc.h
diff --git a/src/carla-bridge/Makefile b/src/carla-bridge/Makefile
index cb0f86a..884a59a 100644
--- a/src/carla-bridge/Makefile
+++ b/src/carla-bridge/Makefile
@@ -8,8 +8,8 @@ CXX     ?= g++
 WINECXX ?= wineg++
 
 BUILD_FLAGS  = -DBUILD_BRIDGE -Wall -std=c++0x -I. -I../carla-includes -I../carla `pkg-config --cflags jack liblo QtCore QtGui` $(CXXFLAGS)
-#BUILD_FLAGS += -DNDEBUG -DQT_NO_DEBUG -DQT_NO_DEBUG_STREAM -DQT_NO_DEBUG_OUTPUT -O2 -ffast-math -fomit-frame-pointer -mtune=generic -msse
-BUILD_FLAGS += -DDEBUG -O0 -g
+BUILD_FLAGS += -DNDEBUG -DQT_NO_DEBUG -DQT_NO_DEBUG_STREAM -DQT_NO_DEBUG_OUTPUT -O2 -ffast-math -fomit-frame-pointer -mtune=generic -msse
+# BUILD_FLAGS += -DDEBUG -O0 -g
 BUILD_FLAGS += -DVESTIGE_HEADER -I../carla-includes/vestige # Comment this line to not use vestige header
 LINK_FLAGS   = `pkg-config --libs jack liblo QtCore QtGui` $(LDFLAGS)
 
diff --git a/src/carla-discovery/carla-discovery.cpp b/src/carla-discovery/carla-discovery.cpp
index 891b758..00a58ca 100644
--- a/src/carla-discovery/carla-discovery.cpp
+++ b/src/carla-discovery/carla-discovery.cpp
@@ -35,8 +35,8 @@
 
 #include <cmath>
 #include <cstdio>
-//#include <cstdlib>
-//#include <cstring>
+#include <cstdlib>
+#include <cstring>
 #include <iostream>
 
 #include "ladspa/ladspa.h"