X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fwscript;h=ddae851127e33039f132ec941ab962c937639f82;hb=6fbaa5403bcefba3186fb5490017e110210122e3;hp=bf53167f5e1fbc95a751cc030008f0f12bd8019c;hpb=aefcce1c99598cc8c1748940a01e2d8aa55caf85;p=ardour.git

diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
index bf53167f5e..ddae851127 100644
--- a/gtk2_ardour/wscript
+++ b/gtk2_ardour/wscript
@@ -6,12 +6,11 @@ import Options
 import sys
 import TaskGen
 import re
-from w18n import build_i18n
 
 # Version of this package (even if built as a child)
-MAJOR = '1'
+MAJOR = '3'
 MINOR = '0'
-MICRO = '2'
+MICRO = '0'
 GTK2_ARDOUR_VERSION = "%s.%s.%s" % (MAJOR, MINOR, MICRO)
 
 # Variables for 'waf dist'
@@ -60,6 +59,7 @@ gtk2_ardour_sources = [
 	'canvas-simplerect.c',
 	'canvas-sysex.cc',
 	'canvas-waveview.c',
+	'configinfo.cc',
 	'control_point.cc',
 	'control_point_dialog.cc',
 	'crossfade_edit.cc',
@@ -79,9 +79,9 @@ gtk2_ardour_sources = [
 	'editor_route_groups.cc',
 	'editor_export_audio.cc',
 	'editor_group_tabs.cc',
-	'editor_hscroller.cc',
 	'editor_keyboard.cc',
 	'editor_keys.cc',
+	'editor_locations.cc',
 	'editor_markers.cc',
 	'editor_mixer.cc',
 	'editor_mouse.cc',
@@ -92,7 +92,6 @@ gtk2_ardour_sources = [
 	'editor_rulers.cc',
 	'editor_scrub.cc',
 	'editor_selection.cc',
-	'editor_selection_list.cc',
 	'editor_snapshots.cc',
 	'editor_summary.cc',
 	'editor_tempodisplay.cc',
@@ -117,10 +116,12 @@ gtk2_ardour_sources = [
 	'group_tabs.cc',
 	'gtk-custom-hruler.c',
 	'gtk-custom-ruler.c',
+	'interthread_progress_window.cc',
 	'io_selector.cc',
 	'keyboard.cc',
 	'keyeditor.cc',
 	'latency_gui.cc',
+        'led.cc',
 	'level_meter.cc',
 	'lineset.cc',
 	'location_ui.cc',
@@ -134,9 +135,11 @@ gtk2_ardour_sources = [
 	'midi_scroomer.cc',
 	'midi_streamview.cc',
 	'midi_time_axis.cc',
+	'midi_tracer.cc',
 	'mixer_group_tabs.cc',
 	'mixer_strip.cc',
 	'mixer_ui.cc',
+        'monitor_section.cc',
 	'nag.cc',
 	'option_editor.cc',
 	'opts.cc',
@@ -161,6 +164,7 @@ gtk2_ardour_sources = [
 	'public_editor.cc',
 	'quantize_dialog.cc',
 	'rc_option_editor.cc',
+	'region_editor.cc',
 	'region_gain_line.cc',
 	'region_selection.cc',
 	'region_view.cc',
@@ -193,9 +197,11 @@ gtk2_ardour_sources = [
 	'time_fx_dialog.cc',
 	'time_selection.cc',
 	'track_selection.cc',
+	'track_view_list.cc',
 	'ui_config.cc',
 	'utils.cc',
 	'version.cc',
+        'volume_controller.cc',
 	'waveview.cc',
 ]
 
@@ -245,12 +251,13 @@ def build(bld):
 	                      libgtkmm2ext libtaglib'''
 	obj.cflags       = ['-DPACKAGE="gtk2_ardour"']
 	obj.cxxflags     = ['-DPACKAGE="gtk2_ardour"']
-	obj.cxxflags     += ['-DVERSIONSTRING="' + GTK2_ARDOUR_VERSION + '"']
-	obj.cxxflags     += ['-DDATA_DIR="' + os.path.normpath(bld.env['DATADIRNAME']) + '"']
-	obj.cxxflags     += ['-DCONFIG_DIR="' + os.path.normpath(bld.env['CONFIGDIRNAME']) + '"']
-	obj.cxxflags     += ['-DMODULE_DIR="' + os.path.normpath(bld.env['LIBDIRNAME']) + '"']
+	obj.cxxflags     += ['-DVERSIONSTRING="' + bld.env['VERSION'] + '"']
+	obj.cxxflags     += ['-DDATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"']
+	obj.cxxflags     += ['-DCONFIG_DIR="' + os.path.normpath(bld.env['CONFIGDIR']) + '"']
+	obj.cxxflags     += ['-DMODULE_DIR="' + os.path.normpath(bld.env['LIBDIR']) + '"']
 	obj.cxxflags     += ['-DLOCALEDIR="' + os.path.join(
-			os.path.normpath(bld.env['DATADIRNAME']), 'locale') + '"']
+			os.path.normpath(bld.env['DATADIR']), 'locale') + '"']
+        obj.cxxflags     += ['-DPROGRAM_NAME="' + bld.env['PROGRAM_NAME'] + '"']
 
 	if bld.env['HAVE_SLV2']:
 		obj.source += [ 'lv2_plugin_ui.cc' ]
@@ -342,8 +349,12 @@ def build(bld):
 			else:
 				key = "_".join (['FONT',sizename])
 				fontstyle = " ".join ([basefont,points])
+				
 			font_subst_dict[key] = fontstyle
 
+	# add normal monospace to font dict
+	font_subst_dict['FONT_MONOSPACE_NORMAL'] = 'monospace 10'
+
 	# RC files
 	obj              = bld.new_task_gen('subst')
 	obj.source       = 'ardour3_ui_dark.rc.in'
@@ -372,7 +383,7 @@ def build(bld):
 	# Menus
 	menus_argv = []
 	if bld.env['GTKOSX']:
-		menus_argv = [ '-E', '-P', '-DGTKOSX', '-DTOP_MENUBAR' ]
+		menus_argv = [ '-E', '-P', '-DGTKOSX' ]
 	else:
 		menus_argv = [ '-E', '-P' ]
 	obj = bld.new_task_gen('command-output')
@@ -401,6 +412,9 @@ def build(bld):
 	bld.install_files('${DATADIR}/ardour3/pixmaps', 'pixmaps/*.xpm')
 	bld.install_files('${DATADIR}/ardour3', 'splash.png')
 
+	# Default UI configuration
+	bld.install_files('${CONFIGDIR}/ardour3', 'ardour3_ui_default.conf')
+
 	# i18n
 	if bld.env['ENABLE_NLS']:
 		mo_files = glob.glob (os.path.join (bld.get_curdir(), 'po/*.mo'))
@@ -409,5 +423,5 @@ def build(bld):
 			bld.install_as (os.path.join (bld.env['PREFIX'], 'share', 'locale', lang, 'LC_MESSAGES', APPNAME + '.mo'), mo)
 
 def i18n(bld):
-	build_i18n (bld, 'gtk2_ardour', APPNAME, gtk2_ardour_sources)
+	autowaf.build_i18n (bld, 'gtk2_ardour', APPNAME, gtk2_ardour_sources)