diff options
| author | David Robillard <d@drobilla.net> | 2008-02-02 17:46:56 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2008-02-02 17:46:56 +0000 |
| commit | d747d82f650a4e64a1b491448ecd132b82541a78 (patch) | |
| tree | 51121dbb0e29e0e897586d8b5e9f1094f8845c6f /gtk2_ardour/SConscript | |
| parent | 80c3677c837cc9eb432df3d65a34aba543fa7258 (diff) | |
Sort various things to reduce merge hell. No functional changes.
git-svn-id: svn://localhost/ardour2/branches/3.0@2992 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/SConscript')
| -rw-r--r-- | gtk2_ardour/SConscript | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/gtk2_ardour/SConscript b/gtk2_ardour/SConscript index 6adf0ee8ae..8a15d8b38f 100644 --- a/gtk2_ardour/SConscript +++ b/gtk2_ardour/SConscript @@ -30,46 +30,46 @@ if gtkardour['IS_OSX']: gtkardour.Merge ([ libraries['ardour'], libraries['ardour_cp'], - libraries['gtkmm2ext'], - libraries['midi++2'], - libraries['pbd'], - libraries['gtkmm2'], + libraries['asound'] + libraries['atkmm'], + libraries['cairomm'], + libraries['fftw3'], + libraries['fftw3f'], + libraries['flac'], + libraries['gdkmm2'], libraries['glib2'], + libraries['glibmm2'], + libraries['gtk2'], + libraries['gtkmm2'], + libraries['gtkmm2ext'], + libraries['jack'], libraries['libgnomecanvas2'], libraries['libgnomecanvasmm'], - libraries['sysmidi'], - libraries['sndfile-ardour'], - libraries['flac'], libraries['lrdf'], - libraries['glibmm2'], + libraries['midi++2'], libraries['pangomm'], - libraries['atkmm'], - libraries['gdkmm2'], - libraries['sigc2'], - libraries['gtk2'], - libraries['xml'], - libraries['xslt'], + libraries['pbd'], libraries['samplerate'], + libraries['sigc2'], + libraries['sndfile-ardour'], + libraries['sysmidi'], libraries['vamp'], libraries['vamphost'], - libraries['fftw3f'], - libraries['fftw3'], - libraries['jack'], - libraries['cairomm'], - libraries['asound'] + libraries['xml'], + libraries['xslt'], ]) gtkmmtests.Append(CXXFLAGS="-DLIBSIGC_DISABLE_DEPRECATED") gtkmmtests.Merge ([ - libraries['gtkmm2'], + libraries['atkmm'], + libraries['gdkmm2'], libraries['glib2'], libraries['glibmm2'], + libraries['gtk2'] + libraries['gtkmm2'], libraries['pangomm'], - libraries['atkmm'], - libraries['gdkmm2'], libraries['sigc2'], - libraries['gtk2'] ]) if gtkardour['DMALLOC']: |