Fix OSX builds in the wake of the source-tree layout changes

diff --git a/gtk2_ardour/au_pluginui.mm b/gtk2_ardour/au_pluginui.mm
index fc73b9b74877c8b0a5229d450249aa2a8dab7007..d3c38d87d5de8138a70e824334a06972f7482ce8 100644 (file)
--- a/gtk2_ardour/au_pluginui.mm
+++ b/gtk2_ardour/au_pluginui.mm
@@ -3,6 +3,7 @@
 
 #include <sys/time.h>
 #include <gtkmm/button.h>
+#include <gtkmm/comboboxtext.h>
 #include <gdk/gdkquartz.h>
 
 #include "pbd/convert.h"

diff --git a/libs/waveview/wave_view.cc b/libs/waveview/wave_view.cc
index 80292ce53dfdeedfdeb4da0a285ff472c7f0802a..e794dd48a3611df80f496e82fce88f3a9284b470 100644 (file)
--- a/libs/waveview/wave_view.cc
+++ b/libs/waveview/wave_view.cc
@@ -51,6 +51,10 @@
 #include "waveview/wave_view.h"
 #include "waveview/wave_view_private.h"
 
+#ifdef __APPLE__
+#define Rect ArdourCanvas::Rect
+#endif
+
 using namespace std;
 using namespace PBD;
 using namespace ARDOUR;