diff options
| -rw-r--r-- | gtk2_ardour/ardour.menus.in | 11 | ||||
| -rw-r--r-- | gtk2_ardour/wscript | 2 | ||||
| -rwxr-xr-x | tools/osx_packaging/osx_build | 4 |
3 files changed, 4 insertions, 13 deletions
diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in index 9694556e56..6068055324 100644 --- a/gtk2_ardour/ardour.menus.in +++ b/gtk2_ardour/ardour.menus.in @@ -35,10 +35,9 @@ <menuitem action='addExistingAudioFiles'/> <!--menuitem action='importFromSession'/--> -#ifndef NOVIDEOTIMELINE <menuitem action='OpenVideo'/> <menuitem action='CloseVideo'/> -#endif + <menu name='Export' action='Export'> <menuitem action='ExportAudio'/> <menuitem action='StemExport'/> @@ -282,9 +281,7 @@ <menuitem action='snap-regions-to-grid'/> <menuitem action='toggle-region-lock'/> <menuitem action='toggle-region-lock-style'/> -#ifndef NOVIDEOTIMELINE <menuitem action='toggle-region-video-lock'/> -#endif <menuitem action='set-region-sync-position'/> <menuitem action='remove-region-sync'/> <menuitem action='nudge-forward'/> @@ -437,9 +434,7 @@ <menuitem action="toggle-cd-marker-ruler"/> <menuitem action="toggle-marker-ruler"/> <separator/> -#ifndef NOVIDEOTIMELINE <menuitem action="toggle-video-ruler"/> -#endif </menu> <menu action="VideoMonitorMenu"> <menuitem action="zoom-vmon-100"/> @@ -543,10 +538,8 @@ <menuitem action="toggle-marker-ruler"/> <menuitem action="toggle-cd-marker-ruler"/> <menuitem action="toggle-loop-punch-ruler"/> -#ifndef NOVIDEOTIMELINE <separator/> <menuitem action="toggle-video-ruler"/> -#endif </popup> <popup name='ProcessorMenu'> @@ -642,9 +635,7 @@ <menuitem action='naturalize-region'/> <menuitem action='toggle-region-lock'/> <menuitem action='toggle-region-lock-style'/> -#ifndef NOVIDEOTIMELINE <menuitem action='toggle-region-video-lock'/> -#endif <menuitem action='snap-regions-to-grid'/> <menuitem action='set-region-sync-position'/> <menuitem action='remove-region-sync'/> diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript index be7164cf05..311ed6ca03 100644 --- a/gtk2_ardour/wscript +++ b/gtk2_ardour/wscript @@ -646,7 +646,7 @@ def build(bld): # Menus menus_argv = [] if bld.is_defined('GTKOSX'): - menus_argv = [ '-E', '-P', '-DGTKOSX', '-DNOVIDEOTIMELINE' ] + menus_argv = [ '-E', '-P', '-DGTKOSX' ] else: menus_argv = [ '-E', '-P' ] diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build index 8d4799163e..0afb984d73 100755 --- a/tools/osx_packaging/osx_build +++ b/tools/osx_packaging/osx_build @@ -13,7 +13,7 @@ fi SAE= MIXBUS= -WITH_HARVID= +WITH_HARVID=1 WITH_LADSPA=1 STRIP=1 PRINT_SYSDEPS= @@ -61,7 +61,7 @@ while [ $# -gt 0 ] ; do # specific build flags # - --harvid) WITH_HARVID=1 ; shift ;; + --noharvid) WITH_HARVID= ; shift ;; --noladspa) WITH_LADSPA= ; shift ;; --nostrip) STRIP= ; shift ;; --sysdeps) PRINT_SYSDEPS=1; shift ;; |