diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-02-21 15:35:15 -0500 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-02-21 15:35:15 -0500 |
| commit | e7fca2fa9ddaa5468374c1f664a0ddc7043709db (patch) | |
| tree | d4323dd7bfce9c3a3d3eba6f62402918022c171c | |
| parent | 9f2ff1a31b0f4e8ea47a11f0e9674620b97f1e68 (diff) | |
| parent | 61b90a54cd5b5d452585669498ad2bf692b6e543 (diff) | |
Merge branch 'master' into next
| -rw-r--r-- | gr-utils/python/modtool/templates.py | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/gr-utils/python/modtool/templates.py b/gr-utils/python/modtool/templates.py index 8777357112..bfdba19c0f 100644 --- a/gr-utils/python/modtool/templates.py +++ b/gr-utils/python/modtool/templates.py @@ -495,15 +495,13 @@ gr_modtool help -- Show a list of commands. gr_modtool help <command> -- Shows the help for a given command. ''' # SWIG string -Templates['swig_block_magic'] = """#if $version == '37' -#set $mod_block_sep = '/' -#set $block_magic_version = '2' +Templates['swig_block_magic'] = """#if $version == '36' +GR_SWIG_BLOCK_MAGIC($modname, $blockname); +%include "${modname}_${blockname}.h" #else -#set $mod_block_sep = '_' -#set $block_magic_version = '' -#end if -%include "${modname}${mod_block_sep}${blockname}.h" -GR_SWIG_BLOCK_MAGIC${block_magic_version}($modname, $blockname); +%include "${modname}/${blockname}.h" +GR_SWIG_BLOCK_MAGIC2($modname, $blockname); +#end """ ## Old stuff |