]>
Commit | Line | Data |
---|---|---|
9b6c8bab JB |
1 | --- ardour-0.9beta2/aclocal.m4.orig 2003-06-29 02:45:29.000000000 +0200 |
2 | +++ ardour-0.9beta2/aclocal.m4 2003-07-15 00:02:13.000000000 +0200 | |
3 | @@ -806,19 +806,19 @@ | |
4 | ||
5 | ARDOUR_TOP=`cd $ARDOUR_TOP; pwd` | |
6 | ||
7 | -export LIBDIRS="sigc++ pbd soundtouch midi++ ardour gtkmm gtkmmext gtk-canvas" | |
d4e64ead | 8 | +export LIBDIRS="pbd soundtouch midi++ ardour gtkmmext gtk-canvas" |
9b6c8bab JB |
9 | |
10 | ACLOCAL_FLAGS="-I $ARDOUR_TOP/aclocal" | |
11 | ACLOCAL_AMFLAGS="-I $ARDOUR_TOP/aclocal `if test -d m4 ; then echo -I m4; fi`" | |
12 | AC_SUBST(ACLOCAL_FLAGS) | |
13 | AC_SUBST(ACLOCAL_AMFLAGS) | |
14 | ||
15 | -BASE_LIBS="$ARDOUR_TOP/libs/midi++/libmidipp.a $ARDOUR_TOP/libs/pbd/libpbd.a $ARDOUR_TOP/libs/sigc++/sigc++/libsigc.a" | |
16 | -BASE_INCLUDES="-I$ARDOUR_TOP/libs/sigc++ -I$ARDOUR_TOP/libs/sigc++/sigc++/config -I$ARDOUR_TOP/libs/pbd -I$ARDOUR_TOP/libs/midi++ -I$ARDOUR_TOP/libs/ardour -I$ARDOUR_TIP/libs/soundtouch" | |
17 | -GUI_LIBS="$ARDOUR_TOP/libs/gtkmmext/libgtkmmext.a $ARDOUR_TOP/libs/midi++/libmidipp.a $ARDOUR_TOP/libs/gtk-canvas/libgtk-canvas.a $ARDOUR_TOP/libs/gtkmm/src/gtk--/libgtkmm.a $ARDOUR_TOP/libs/gtkmm/gdk--/gdk--/libgdkmm.a" | |
18 | -GUI_INCLUDES="-I$ARDOUR_TOP/libs/ -I$ARDOUR_TOP/libs/gtk-canvas -I$ARDOUR_TOP/libs/gtk-canvas/gtk-canvas -I$ARDOUR_TOP/libs/gtkmmext -I$ARDOUR_TOP/libs/gtkmm/gdk-- -I$ARDOUR_TOP/libs/gtkmm/src -I$ARDOUR_TOP/libs/gtkmm" | |
19 | -CFLAGS="$CFLAGS -I$ARDOUR_TOP/libs/sigc++ -I$ARDOUR_TOP/libs/sigc++/sigc++/config -I$ARDOUR_TOP/libs/pbd -I$ARDOUR_TOP/libs/midi++ -I$ARDOUR_TOP/libs/ardour -I$ARDOUR_TOP/libs/soundtouch" | |
20 | -CXXFLAGS="$CXXFLAGS -I$ARDOUR_TOP/libs/sigc++ -I$ARDOUR_TOP/libs/sigc++/sigc++/config -I$ARDOUR_TOP/libs/pbd -I$ARDOUR_TOP/libs/midi++ -I$ARDOUR_TOP/libs/ardour -I$ARDOUR_TOP/libs/soundtouch" | |
21 | -LIBS="$LIBS $ARDOUR_TOP/libs/soundtouch/libsoundtouch.a $ARDOUR_TOP/libs/midi++/libmidipp.a $ARDOUR_TOP/libs/pbd/libpbd.a $ARDOUR_TOP/libs/sigc++/sigc++/libsigc.a" | |
22 | +BASE_LIBS="$ARDOUR_TOP/libs/midi++/libmidipp.a $ARDOUR_TOP/libs/pbd/libpbd.a `sigc-config --libs`" | |
23 | +BASE_INCLUDES="`sigc-config --cflags` -I$ARDOUR_TOP/libs/pbd -I$ARDOUR_TOP/libs/midi++ -I$ARDOUR_TOP/libs/ardour -I$ARDOUR_TIP/libs/soundtouch" | |
d4e64ead | 24 | +GUI_LIBS="$ARDOUR_TOP/libs/gtkmmext/libgtkmmext.a $ARDOUR_TOP/libs/midi++/libmidipp.a $ARDOUR_TOP/libs/gtk-canvas/libgtk-canvas.a `gtkmm-config --libs`" |
25 | +GUI_INCLUDES="-I$ARDOUR_TOP/libs/ -I$ARDOUR_TOP/libs/gtk-canvas -I$ARDOUR_TOP/libs/gtk-canvas/gtk-canvas -I$ARDOUR_TOP/libs/gtkmmext `gtkmm-config --cflags`" | |
9b6c8bab JB |
26 | +CFLAGS="$CFLAGS `sigc-config --cflags` -I$ARDOUR_TOP/libs/pbd -I$ARDOUR_TOP/libs/midi++ -I$ARDOUR_TOP/libs/ardour -I$ARDOUR_TOP/libs/soundtouch" |
27 | +CXXFLAGS="$CXXFLAGS `sigc-config --cflags` -I$ARDOUR_TOP/libs/pbd -I$ARDOUR_TOP/libs/midi++ -I$ARDOUR_TOP/libs/ardour -I$ARDOUR_TOP/libs/soundtouch" | |
28 | +LIBS="$LIBS $ARDOUR_TOP/libs/soundtouch/libsoundtouch.a $ARDOUR_TOP/libs/midi++/libmidipp.a $ARDOUR_TOP/libs/pbd/libpbd.a `sigc-config --libs`" | |
29 | ]) | |
30 | ||
31 | --- ardour-0.9beta2/libs/configure.ac.orig 2003-06-24 05:11:36.000000000 +0200 | |
32 | +++ ardour-0.9beta2/libs/configure.ac 2003-07-15 00:03:21.000000000 +0200 | |
33 | @@ -5,10 +5,10 @@ | |
34 | ||
35 | AM_BUILD_ENVIRONMENT | |
36 | ||
37 | -AC_CONFIG_SUBDIRS(sigc++ pbd soundtouch midi++ ardour) | |
38 | +AC_CONFIG_SUBDIRS(pbd soundtouch midi++ ardour) | |
39 | ||
40 | if test x$WITH_GTK_GUI != x ; then | |
41 | - AC_CONFIG_SUBDIRS(gtkmm gtkmmext gtk-canvas) | |
d4e64ead | 42 | + AC_CONFIG_SUBDIRS(gtkmmext gtk-canvas) |
9b6c8bab JB |
43 | fi |
44 | ||
45 | if test x$WITH_VST_WIN != x ; then | |
46 | --- ardour-0.9beta2/gtk_ardour/editor_audiotrack.cc.orig 2003-06-24 05:11:35.000000000 +0200 | |
47 | +++ ardour-0.9beta2/gtk_ardour/editor_audiotrack.cc 2003-07-15 00:57:21.000000000 +0200 | |
48 | @@ -1,11 +1,12 @@ | |
49 | -#include <ardour/location.h> | |
50 | -#include <ardour/diskstream.h> | |
51 | - | |
52 | #include "editor.h" | |
53 | #include "audio_time_axis.h" | |
54 | #include "regionview.h" | |
55 | #include "selection.h" | |
56 | ||
57 | +/* must be after Gtk-- includes - LOCK define conflict */ | |
58 | +#include <ardour/location.h> | |
59 | +#include <ardour/diskstream.h> | |
60 | + | |
61 | using namespace ARDOUR; | |
62 | ||
63 | void | |
64 | --- ardour-0.9beta2/gtk_ardour/selection.cc.orig 2003-06-24 05:11:35.000000000 +0200 | |
65 | +++ ardour-0.9beta2/gtk_ardour/selection.cc 2003-07-15 01:12:34.000000000 +0200 | |
66 | @@ -22,8 +22,6 @@ | |
67 | #include <sigc++/bind.h> | |
68 | #include <pbd/error.h> | |
69 | ||
70 | -#include <ardour/route.h> | |
71 | - | |
72 | #include "regionview.h" | |
73 | #include "selection.h" | |
74 | #include "selection_templates.h" | |
75 | @@ -31,6 +29,9 @@ | |
76 | ||
77 | #include "i18n.h" | |
78 | ||
79 | +/* must be after Gtk-- includes - LOCK define conflict */ | |
80 | +#include <ardour/route.h> | |
81 | + | |
82 | using namespace ARDOUR; | |
83 | using namespace SigC; | |
84 |