Merged with trunk R1769... apparently. (?)
git-svn-id: svn://localhost/ardour2/branches/midi@1770 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
b3fe7cfc89
commit
a9e06980c1
@ -16,7 +16,7 @@ import SCons.Node.FS
|
||||
SConsignFile()
|
||||
EnsureSConsVersion(0, 96)
|
||||
|
||||
ardour_version = '2.0rc2'
|
||||
ardour_version = '2.1pre'
|
||||
|
||||
subst_dict = { }
|
||||
|
||||
@ -841,6 +841,8 @@ if env['SYSLIBS']:
|
||||
libraries['sigc2'].ParseConfig('pkg-config --cflags --libs sigc++-2.0')
|
||||
libraries['glibmm2'] = LibraryInfo()
|
||||
libraries['glibmm2'].ParseConfig('pkg-config --cflags --libs glibmm-2.4')
|
||||
libraries['cairomm'] = LibraryInfo()
|
||||
libraries['cairomm'].ParseConfig('pkg-config --cflags --libs cairomm-1.0')
|
||||
libraries['gdkmm2'] = LibraryInfo()
|
||||
libraries['gdkmm2'].ParseConfig ('pkg-config --cflags --libs gdkmm-2.4')
|
||||
libraries['gtkmm2'] = LibraryInfo()
|
||||
@ -867,7 +869,7 @@ if env['SYSLIBS']:
|
||||
libraries['soundtouch'] = LibraryInfo()
|
||||
libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs libSoundTouch')
|
||||
# Comment the previous line and uncomment this for Debian:
|
||||
#libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs libSoundTouch')
|
||||
#libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs libSoundTouch')
|
||||
|
||||
libraries['appleutility'] = LibraryInfo(LIBS='libappleutility',
|
||||
LIBPATH='#libs/appleutility',
|
||||
|
@ -20,19 +20,7 @@
|
||||
#ifndef __ardour_export_dialog_h__
|
||||
#define __ardour_export_dialog_h__
|
||||
|
||||
#include <gtkmm/alignment.h>
|
||||
#include <gtkmm/box.h>
|
||||
#include <gtkmm/table.h>
|
||||
#include <gtkmm/frame.h>
|
||||
#include <gtkmm/frame.h>
|
||||
#include <gtkmm/button.h>
|
||||
#include <gtkmm/progressbar.h>
|
||||
#include <gtkmm/scrolledwindow.h>
|
||||
#include <gtkmm/fileselection.h>
|
||||
#include <gtkmm/filechooser.h>
|
||||
#include <gtkmm/comboboxtext.h>
|
||||
#include <gtkmm/treeview.h>
|
||||
#include <gtkmm/liststore.h>
|
||||
#include <gtkmm.h>
|
||||
|
||||
#include <ardour/export.h>
|
||||
#include <ardour/location.h>
|
||||
|
Loading…
Reference in New Issue
Block a user