diff options
| author | David Robillard <d@drobilla.net> | 2007-04-30 17:50:43 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2007-04-30 17:50:43 +0000 |
| commit | a9e06980c1b9538f06c613307a633005123f7ac8 (patch) | |
| tree | 4c83a46887c66c1b0ea247ebf2abb96b28e48abe /SConstruct | |
| parent | b3fe7cfc892f7d5978ad14eb81e9305fa9c14d13 (diff) | |
Merged with trunk R1769... apparently. (?)
git-svn-id: svn://localhost/ardour2/branches/midi@1770 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 d00321c155..e6b632a73e 100644 --- a/SConstruct +++ b/SConstruct @@ -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', |