smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-24 06:07:29 +01:00
Code Issues Projects Releases Wiki Activity

Fix SYSLIBS=1

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@3752 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
David Robillard 2008-09-18 14:09:45 +00:00
parent e2ad9eeacd
commit d1536050b6
3 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
SConstruct
View file

@ -1056,6 +1056,8 @@ if env['SYSLIBS']:
libraries['pangomm'].ParseConfig ('pkg-config --cflags --libs pangomm-1.4')
libraries['libgnomecanvasmm'] = LibraryInfo()
libraries['libgnomecanvasmm'].ParseConfig ('pkg-config --cflags --libs libgnomecanvasmm-2.6')
libraries['taglib'] = LibraryInfo()
libraries['taglib'].ParseConfig ('pkg-config --cflags --libs taglib')
# libraries['libglademm'] = LibraryInfo()
# libraries['libglademm'].ParseConfig ('pkg-config --cflags --libs libglademm-2.4')
@ -1073,10 +1075,6 @@ if env['SYSLIBS']:
libraries['sndfile'] = LibraryInfo()
libraries['sndfile'].ParseConfig ('pkg-config --cflags --libs sndfile')
libraries['taglib'] = LibraryInfo(LIBS='libtaglib',
LIBPATH='#libs/taglib',
CPPPATH=['#libs/taglib/headers','#libs/taglib/headers/taglib'])
coredirs = [
'templates',
'manual'

4
libs/ardour/ardour/automation_event.h
View file

@ -139,11 +139,11 @@ class AutomationList : public PBD::StatefulDestructible
void set_automation_state (AutoState);
AutoState automation_state() const { return _state; }
sigc::signal<void> automation_style_changed;
sigc::signal<void> automation_state_changed;
void set_automation_style (AutoStyle m);
AutoStyle automation_style() const { return _style; }
sigc::signal<void> automation_state_changed;
sigc::signal<void> automation_style_changed;
bool automation_playback() const {
return (_state & Play) || ((_state & Touch) && !_touching);

1
libs/ardour/ardour/parameter.h
View file

@ -98,7 +98,6 @@ public:
* </li>
* </ol>
*/
inline bool operator<(const Parameter& id) const {
#ifndef NDEBUG
if (_type == NullAutomation)