diff options
| author | David Robillard <d@drobilla.net> | 2008-09-18 14:09:45 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2008-09-18 14:09:45 +0000 |
| commit | d1536050b68b49e276ddef791cc516902a2dc80f (patch) | |
| tree | b67a5db1e2f3efe914ee45d9686d3f21c96e51d4 | |
| parent | e2ad9eeacdf089ff47cef473b5b54eb27bf61c1a (diff) | |
Fix SYSLIBS=1
git-svn-id: svn://localhost/ardour2/branches/3.0@3752 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | SConstruct | 6 | ||||
| -rw-r--r-- | libs/ardour/ardour/automation_event.h | 4 | ||||
| -rw-r--r-- | libs/ardour/ardour/parameter.h | 1 |
3 files changed, 4 insertions, 7 deletions
diff --git a/SConstruct b/SConstruct index 86f121024c..35a67d1879 100644 --- a/SConstruct +++ b/SConstruct @@ -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' diff --git a/libs/ardour/ardour/automation_event.h b/libs/ardour/ardour/automation_event.h index 18190aa9b6..4362b9c867 100644 --- a/libs/ardour/ardour/automation_event.h +++ b/libs/ardour/ardour/automation_event.h @@ -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); diff --git a/libs/ardour/ardour/parameter.h b/libs/ardour/ardour/parameter.h index b86174aa0a..a5dd9cdca9 100644 --- a/libs/ardour/ardour/parameter.h +++ b/libs/ardour/ardour/parameter.h @@ -98,7 +98,6 @@ public: * </li> * </ol> */ - inline bool operator<(const Parameter& id) const { #ifndef NDEBUG if (_type == NullAutomation) |