From 20de2657a48bb35972e5bc66bba7db2db8ca00f7 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 18 Oct 2011 22:36:00 +0000 Subject: [PATCH] fix bindings generation process for OS X git-svn-id: svn://localhost/ardour2/branches/3.0@10226 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/wscript | 2 +- tools/fmt-bindings | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript index 296c0aaa64..e18373b368 100644 --- a/gtk2_ardour/wscript +++ b/gtk2_ardour/wscript @@ -596,7 +596,7 @@ def build(bld): obj = bld( target = b + '.bindings', source = b + '.bindings.in', - rule = '../tools/fmt-bindings --winkey="%s" --accelmap <${SRC} >${TGT}' % bld.env['WINDOWS_KEY'] + rule = '../tools/fmt-bindings --platform="%s" --winkey="%s" --accelmap <${SRC} >${TGT}' % (sys.platform, bld.env['WINDOWS_KEY'] ) ) obj.install_path = os.path.join(bld.env['SYSCONFDIR'], 'ardour3') diff --git a/tools/fmt-bindings b/tools/fmt-bindings index 39849b1847..363dad02dd 100755 --- a/tools/fmt-bindings +++ b/tools/fmt-bindings @@ -29,7 +29,7 @@ GetOptions ("platform=s" => \$platform, "accelmap" => \$make_accelmap, "merge=s" => \$merge_from); -if ($platform eq "osx") { +if ($platform eq "darwin") { $gtk_modifier_map{'PRIMARY'} = 'meta'; $gtk_modifier_map{'SECONDARY'} = 'Mod1';