diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2007-05-07 04:41:08 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2007-05-07 04:41:08 +0000 |
| commit | 653c6d61f93d29e0d050aa97b1f42736a5288d3b (patch) | |
| tree | 0fff794dd3b19fb4b677ae8b3b0ec56d463b483d /SConstruct | |
| parent | 6959b1728ef34d2e394604e041289a0128fe6cf9 (diff) | |
merge changes from trunk
git-svn-id: svn://localhost/ardour2/branches/2.0.1@1790 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/SConstruct b/SConstruct index 3cf983c9ff..df835b593c 100644 --- a/SConstruct +++ b/SConstruct @@ -16,7 +16,7 @@ import SCons.Node.FS SConsignFile() EnsureSConsVersion(0, 96) -ardour_version = '2.0' +ardour_version = '2.0.1' subst_dict = { } @@ -834,6 +834,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() @@ -860,7 +862,7 @@ if env['SYSLIBS']: libraries['soundtouch'] = LibraryInfo() libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs soundtouch-1.0') # 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', |