diff options
| author | Taybin Rutkin <taybin@taybin.com> | 2006-06-29 22:21:30 +0000 |
|---|---|---|
| committer | Taybin Rutkin <taybin@taybin.com> | 2006-06-29 22:21:30 +0000 |
| commit | 481f7c39655afec832ac10430dd61a3bb464aa58 (patch) | |
| tree | cde736699cbe49374a6aaa079258f88c1d0c7059 /gtk2_ardour | |
| parent | d1a4f74ef2c86042a0cbe0e83e611596df27575f (diff) | |
Fixed i18n system.
Renamed pbd3 back to pbd, since it's version 4.1 now.
Very minor fixes
git-svn-id: svn://localhost/ardour2/trunk@656 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/SConscript | 5 | ||||
| -rw-r--r-- | gtk2_ardour/fft_result.cc | 6 | ||||
| -rw-r--r-- | gtk2_ardour/po/SConscript | 2 | ||||
| -rw-r--r-- | gtk2_ardour/route_ui.cc | 2 |
4 files changed, 7 insertions, 8 deletions
diff --git a/gtk2_ardour/SConscript b/gtk2_ardour/SConscript index 65f8dfca73..68e07ebd22 100644 --- a/gtk2_ardour/SConscript +++ b/gtk2_ardour/SConscript @@ -27,7 +27,7 @@ gtkardour.Merge ([ libraries['ardour_cp'], libraries['gtkmm2ext'], libraries['midi++2'], - libraries['pbd3'], + libraries['pbd'], libraries['gtkmm2'], libraries['glib2'], libraries['libgnomecanvas2'], @@ -255,8 +255,7 @@ else: env.Alias('install', env.InstallAs(os.path.join(install_prefix, 'bin')+'/ardour2', ardoursh)) if env['NLS']: - Export('gtkardour', 'intl_files') - SConscript ('po/SConscript') + i18n (gtkardour, gtkardour_files+skipped_files+fft_analysis_files, env) # configuration files env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour2_ui.rc')) diff --git a/gtk2_ardour/fft_result.cc b/gtk2_ardour/fft_result.cc index 9a55b59cb5..f5acef92ed 100644 --- a/gtk2_ardour/fft_result.cc +++ b/gtk2_ardour/fft_result.cc @@ -20,9 +20,9 @@ #include <fft_result.h> #include <fft_graph.h> -#include <stdlib.h> -#include <string.h> -#include <math.h> +#include <cstdlib> +#include <string> +#include <cmath> #include <iostream> diff --git a/gtk2_ardour/po/SConscript b/gtk2_ardour/po/SConscript index 868f123988..d7e957b3eb 100644 --- a/gtk2_ardour/po/SConscript +++ b/gtk2_ardour/po/SConscript @@ -27,7 +27,7 @@ print "Updating pot file: " domain = gtkardour['DOMAIN'] potfile = gtkardour['POTFILE'] -poaction = Action('intltool-update -p -g=' + domain) +poaction = env.Action('intltool-update -p -g=' + domain) Execute(poaction) diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc index 4559058b8d..06f86bb545 100644 --- a/gtk2_ardour/route_ui.cc +++ b/gtk2_ardour/route_ui.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2002 Paul Davis + Copyright (C) 2002-2006 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by |