summaryrefslogtreecommitdiff
path: root/gtk2_ardour
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2013-06-11 01:26:49 +0200
committerRobin Gareus <robin@gareus.org>2013-06-11 01:26:49 +0200
commit1ca430babd9682fc403b561117f122bbd5e8adae (patch)
tree8dae2e3b354c35bbaeeba0439977048cae87f198 /gtk2_ardour
parent9b9ebee02c19c9f08f9ccc40cd3553c66305061c (diff)
separate general vs temporary(no vtl) OSX defines
Diffstat (limited to 'gtk2_ardour')
-rw-r--r--gtk2_ardour/ardour.menus.in10
-rw-r--r--gtk2_ardour/wscript2
2 files changed, 6 insertions, 6 deletions
diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in
index 632136c734..f666262f16 100644
--- a/gtk2_ardour/ardour.menus.in
+++ b/gtk2_ardour/ardour.menus.in
@@ -35,7 +35,7 @@
<menuitem action='addExistingAudioFiles'/>
<!--menuitem action='importFromSession'/-->
-#ifndef GTKOSX
+#ifndef NOVIDEOTIMELINE
<menuitem action='OpenVideo'/>
<menuitem action='CloseVideo'/>
#endif
@@ -282,7 +282,7 @@
<menuitem action='snap-regions-to-grid'/>
<menuitem action='toggle-region-lock'/>
<menuitem action='toggle-region-lock-style'/>
-#ifndef GTKOSX
+#ifndef NOVIDEOTIMELINE
<menuitem action='toggle-region-video-lock'/>
#endif
<menuitem action='set-region-sync-position'/>
@@ -437,7 +437,7 @@
<menuitem action="toggle-cd-marker-ruler"/>
<menuitem action="toggle-marker-ruler"/>
<separator/>
-#ifndef GTKOSX
+#ifndef NOVIDEOTIMELINE
<menuitem action="toggle-video-ruler"/>
#endif
</menu>
@@ -557,7 +557,7 @@
<menuitem action="toggle-marker-ruler"/>
<menuitem action="toggle-cd-marker-ruler"/>
<menuitem action="toggle-loop-punch-ruler"/>
-#ifndef GTKOSX
+#ifndef NOVIDEOTIMELINE
<separator/>
<menuitem action="toggle-video-ruler"/>
#endif
@@ -656,7 +656,7 @@
<menuitem action='naturalize-region'/>
<menuitem action='toggle-region-lock'/>
<menuitem action='toggle-region-lock-style'/>
-#ifndef GTKOSX
+#ifndef NOVIDEOTIMELINE
<menuitem action='toggle-region-video-lock'/>
#endif
<menuitem action='snap-regions-to-grid'/>
diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
index a9dc2ceff7..c25338a343 100644
--- a/gtk2_ardour/wscript
+++ b/gtk2_ardour/wscript
@@ -649,7 +649,7 @@ def build(bld):
# Menus
menus_argv = []
if bld.is_defined('GTKOSX'):
- menus_argv = [ '-E', '-P', '-DGTKOSX' ]
+ menus_argv = [ '-E', '-P', '-DGTKOSX', '-DNOVIDEOTIMELINE' ]
else:
menus_argv = [ '-E', '-P' ]