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

diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
index bf53167f5e..4b24082d47 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,12 +59,14 @@ gtk2_ardour_sources = [
 	'canvas-simplerect.c',
 	'canvas-sysex.cc',
 	'canvas-waveview.c',
+	'configinfo.cc',
 	'control_point.cc',
 	'control_point_dialog.cc',
 	'crossfade_edit.cc',
 	'crossfade_view.cc',
 	'curvetest.cc',
 	'diamond.cc',
+	'edit_note_dialog.cc',
 	'editing.cc',
 	'editor.cc',
 	'editor_actions.cc',
@@ -79,9 +80,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 +93,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,15 +117,20 @@ gtk2_ardour_sources = [
 	'group_tabs.cc',
 	'gtk-custom-hruler.c',
 	'gtk-custom-ruler.c',
+        'gtk_pianokeyboard.c',
+	'insert_time_dialog.cc',
+	'interthread_progress_window.cc',
 	'io_selector.cc',
 	'keyboard.cc',
 	'keyeditor.cc',
 	'latency_gui.cc',
+        'led.cc',
 	'level_meter.cc',
 	'lineset.cc',
 	'location_ui.cc',
 	'main.cc',
 	'marker.cc',
+	'midi_automation_line.cc',
 	'midi_channel_selector.cc',
 	'midi_cut_buffer.cc',
 	'midi_list_editor.cc',
@@ -134,9 +139,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 +168,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',
@@ -182,6 +190,8 @@ gtk2_ardour_sources = [
 	'simplerect.cc',
 	'splash.cc',
 	'startup.cc',
+        'step_editor.cc',
+        'step_entry.cc',
 	'streamview.cc',
 	'strip_silence_dialog.cc',
 	'tape_region_view.cc',
@@ -193,10 +203,13 @@ 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',
+	'window_proxy.cc'
 ]
 
 def set_options(opt):
@@ -231,26 +244,43 @@ def configure(conf):
 	autowaf.check_header(conf, 'boost/shared_ptr.hpp')
 	autowaf.check_header(conf, 'boost/weak_ptr.hpp')
 
+# Add a waf `feature' to allow compilation of things using winegcc
+from TaskGen import feature
+@feature("wine")
+def set_winegcc(self):
+	self.env.LINK_CXX = self.env.LINK_CC = 'wineg++'
+	self.env.CC = 'winegcc'
+
 def build(bld):
-	# Program
-	obj = bld.new_task_gen(features = 'cxx cc cprogram')
+	# GTK front-end; if we're using VST we build this as a shared library, otherwise
+	# it's a normal executabale
+	if bld.env['VST_SUPPORT']:
+		obj = bld.new_task_gen(features = 'cxx cc cshlib')
+	else:
+		obj = bld.new_task_gen(features = 'cxx cc cprogram')
+
 	obj.includes     = ['.']
 	obj.source       = gtk2_ardour_sources
 	obj.name         = 'gtk2_ardour'
-	obj.target       = 'ardour-3.0'
+	if bld.env['VST_SUPPORT']:
+		obj.target = 'gtk2_ardour'
+		obj.includes += ['../libs/fst']
+	else:
+		obj.target = 'ardour-3.0'
 	obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
-	obj.uselib       = 'UUID FLAC GLIBMM GTHREAD GTK GNOMECANVAS OGG ALSA'
+	obj.uselib       = 'UUID FLAC GLIBMM GTHREAD GTK GNOMECANVAS OGG ALSA CURL DL'
 	obj.uselib       += ' GTKMM GNOMECANVASMM OSX GTKOSX COREAUDIO'
 	obj.uselib_local = '''libpbd libmidipp libtaglib libardour libardour_cp
 	                      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' ]
@@ -259,10 +289,13 @@ def build(bld):
 	if bld.env['FREESOUND']:
 		obj.source +=  [ 'sfdb_freesound_mootcher.cc' ]
 
-	if bld.env['VST']:
+	if bld.env['VST_SUPPORT']:
 		obj.source += [ 'vst_pluginui.cc' ]
 		obj.cxxflags += [ '-DVST_SUPPORT' ]
 
+        if bld.env['PHONE_HOME']:
+                obj.cxxflags += [ '-DPHONE_HOME' ]
+
 	if bld.env['GTKOSX']:
 		TaskGen.task_gen.mappings['.mm'] = TaskGen.task_gen.mappings['.cc']
 		obj.source += [ 'cocoacarbon.mm' ]
@@ -274,6 +307,24 @@ def build(bld):
 	else:
 		obj.source += [ 'x11.cc' ]
 
+	if bld.env['VST_SUPPORT']:
+		# If we require VST support we build a stub main() and the FST library here using
+		# winegcc, and link it to the GTK front-end library
+		obj = bld.new_task_gen (features = 'cxx cc cprogram wine')
+		obj.source = '''
+			../libs/fst/fst.c
+			../libs/fst/fstinfofile.c
+			../libs/fst/vsti.c
+			../libs/fst/vstwin.c
+			../vst/winmain.c
+		'''
+		obj.includes = '../libs/fst'
+		obj.target = 'ardour-3.0-vst'
+		obj.linkflags = ['-mwindows', '-Wl,--export-dynamic', '-lpthread']
+		obj.defines = ['_POSIX_SOURCE', 'USE_WS_PREFIX']
+		obj.uselib = 'ALSA'
+		obj.uselib_local = '''libpbd libmidipp libtaglib libardour libardour_cp libgtkmm2ext libtaglib gtk2_ardour'''
+
 	# Wrappers
 
 	wrapper_subst_dict = {
@@ -342,8 +393,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 +427,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')
@@ -392,15 +447,21 @@ def build(bld):
 		obj = bld.new_task_gen (
 			target = b + '.bindings',
 			source = b + '.bindings.in',
-			rule = '../tools/fmt-bindings --winkey=%s --accelmap <${SRC} >${TGT}' % bld.env['windows_key']
+			rule = '../tools/fmt-bindings --winkey="%s" --accelmap <${SRC} >${TGT}' % bld.env['WINDOWS_KEY']
 			)
 		obj.install_path = os.path.join(bld.env['CONFIGDIR'], 'ardour3')
 
+        # not modified at present
+	bld.install_files(os.path.join(bld.env['CONFIGDIR'], 'ardour3'), 'step_editing.bindings')
+
 	# Icons/Images
 	bld.install_files('${DATADIR}/ardour3/icons', 'icons/*.png')
 	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 +470,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)