From 61c990dfbab37b8c3749d27684dc8dcb43554739 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 12 Nov 2007 23:44:49 +0000 Subject: Upgrade gtkmm to 2.10.8, glibmm to 2.13.3 and add cairomm 1.2.4 git-svn-id: svn://localhost/ardour2/trunk@2630 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/SConscript | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gtk2_ardour') diff --git a/gtk2_ardour/SConscript b/gtk2_ardour/SConscript index 4cf990f816..552a9ef5b8 100644 --- a/gtk2_ardour/SConscript +++ b/gtk2_ardour/SConscript @@ -18,7 +18,7 @@ domain = 'gtk2_ardour' gtkardour.Append(DOMAIN=domain, MAJOR=1,MINOR=0,MICRO=2) gtkardour.Append(CCFLAGS="-DPACKAGE=\\\"" + domain + "\\\"") gtkardour.Append(CXXFLAGS="-DPACKAGE=\\\"" + domain + "\\\"") -gtkardour.Append(CXXFLAGS="-DLIBSIGC_DISABLE_DEPRECATED") +gtkardour.Append(CXXFLAGS=["-DLIBSIGC_DISABLE_DEPRECATED", "-DGLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED", "-DGLIBMM_EXCEPTIONS_ENABLED", "-DGLIBMM_PROPERTIES_ENABLED"]) gtkardour.Append(CPPPATH="#/") # for top level svn_revision.h #gtkardour.Append(CXXFLAGS="-DFLOWCANVAS_AA") gtkardour.Append(PACKAGE=domain) @@ -53,7 +53,8 @@ gtkardour.Merge ([ libraries['rubberband'], libraries['samplerate'], libraries['jack'], - libraries['sysaudio'] + libraries['sysaudio'], + libraries['cairomm'] ]) gtkmmtests.Append(CXXFLAGS="-DLIBSIGC_DISABLE_DEPRECATED") -- cgit v1.2.3