diff options
| author | David Robillard <d@drobilla.net> | 2008-01-11 00:07:40 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2008-01-11 00:07:40 +0000 |
| commit | bde575a8e822f3b70045593e7b8ee8882af6441b (patch) | |
| tree | 50b836fc22d0940a804a03f5449456eeadb4b32d /SConstruct | |
| parent | ed312acdedfc15398a23153fccef63d57f497a09 (diff) | |
Actually fix compilation w/ SYSLIBS=0.
Set version number to 3.0 (was 2.1).
git-svn-id: svn://localhost/ardour2/trunk@2888 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/SConstruct b/SConstruct index 859d3c654b..4be95b4cb2 100644 --- a/SConstruct +++ b/SConstruct @@ -16,7 +16,7 @@ import SCons.Node.FS SConsignFile() EnsureSConsVersion(0, 96) -ardour_version = '2.1' +ardour_version = '3.0' subst_dict = { } @@ -950,6 +950,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['cairo'] = LibraryInfo() + libraries['cairo'].ParseConfig('pkg-config --cflags --libs cairo') libraries['cairomm'] = LibraryInfo() libraries['cairomm'].ParseConfig('pkg-config --cflags --libs cairomm-1.0') libraries['gdkmm2'] = LibraryInfo() @@ -1012,12 +1014,18 @@ if env['SYSLIBS']: ] else: + libraries['cairo'] = LibraryInfo() + libraries['cairo'].ParseConfig('pkg-config --cflags --libs cairo') + + libraries['gtk2-unix-print'] = LibraryInfo() + libraries['gtk2-unix-print'].ParseConfig('pkg-config --cflags --libs gtk+-unix-print-2.0') + libraries['sigc2'] = LibraryInfo(LIBS='sigc++2', LIBPATH='#libs/sigc++2', CPPPATH='#libs/sigc++2') libraries['glibmm2'] = LibraryInfo(LIBS='glibmm2', LIBPATH='#libs/glibmm2', - CPPPATH='#libs/glibmm2') + CPPPATH='#libs/glibmm2/glib') libraries['pangomm'] = LibraryInfo(LIBS='pangomm', LIBPATH='#libs/gtkmm2/pango', CPPPATH='#libs/gtkmm2/pango') @@ -1025,8 +1033,8 @@ else: LIBPATH='#libs/gtkmm2/atk', CPPPATH='#libs/gtkmm2/atk') libraries['cairomm'] = LibraryInfo(LIBS='cairomm', - LIBPATH='#libs/cairomm/cairomm', - CPPPATH='#libs/cairomm/cairomm') + LIBPATH='#libs/cairomm', + CPPPATH='#libs/cairomm') libraries['gdkmm2'] = LibraryInfo(LIBS='gdkmm2', LIBPATH='#libs/gtkmm2/gdk', CPPPATH='#libs/gtkmm2/gdk') @@ -1072,13 +1080,12 @@ else: ] gtk_subdirs = [ - 'libs/glibmm2', - 'libs/gtkmm2/pango', - 'libs/gtkmm2/atk', - 'libs/gtkmm2/gdk', - 'libs/gtkmm2/gtk', - 'libs/libgnomecanvasmm', -# 'libs/flowcanvas', + 'libs/glibmm2', + 'libs/gtkmm2/pango', + 'libs/gtkmm2/atk', + 'libs/gtkmm2/gdk', + 'libs/gtkmm2/gtk', + 'libs/libgnomecanvasmm', 'libs/gtkmm2ext', 'gtk2_ardour', 'libs/clearlooks' |