smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-15 19:16:40 +01:00
Code Issues Projects Releases Wiki Activity

merge with master and fix 2 conflicts

Browse source
This commit is contained in:
Paul Davis 2013-10-16 22:06:56 -04:00
commit e5888d3983
107 changed files with 7557 additions and 6246 deletions
Download patch file Download diff file Expand all files Collapse all files

3
gtk2_ardour/wscript
View file

@ -196,6 +196,7 @@ gtk2_ardour_sources = [
'search_path_option.cc',
'selection.cc',
'send_ui.cc',
'session_dialog.cc',
'session_import_dialog.cc',
'session_metadata_dialog.cc',
'session_option_editor.cc',
@ -635,7 +636,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' ]