X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fwscript;h=2cfd2ea4977da5b2fbd801337aac28c19e2e6afa;hb=5399425f534e2d96d07cf29f427bfa0f39d904b7;hp=d385da5a200ab9dab9abb1817ae7ec9e37922e42;hpb=b9185d2c07c77eccf3679ac99f6b69f8fdd79c48;p=ardour.git diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript index d385da5a20..2cfd2ea497 100644 --- a/gtk2_ardour/wscript +++ b/gtk2_ardour/wscript @@ -25,6 +25,7 @@ gtk2_ardour_sources = [ 'analysis_window.cc', 'ardour_button.cc', 'ardour_dialog.cc', + 'ardour_dropdown.cc', 'ardour_ui.cc', 'ardour_ui2.cc', 'ardour_ui_dependents.cc', @@ -203,6 +204,7 @@ gtk2_ardour_sources = [ 'session_option_editor.cc', 'sfdb_ui.cc', 'shuttle_control.cc', + 'soundcloud_export_selector.cc', 'splash.cc', 'speaker_dialog.cc', 'startup.cc', @@ -237,7 +239,6 @@ gtk2_ardour_sources = [ 'add_video_dialog.cc', 'editor_videotimeline.cc', 'video_timeline.cc', - 'system_exec.cc', 'video_monitor.cc', 'transcode_ffmpeg.cc', 'transcode_video_dialog.cc', @@ -357,14 +358,12 @@ def build(bld): VERSION = "%s.%s" % (bld.env['MAJOR'], bld.env['MINOR']) - if bld.is_defined('WINDOWS_VST_SUPPORT'): + if bld.is_defined('WINDOWS_VST_SUPPORT') and bld.env['build_target'] != 'mingw': + # Windows VST support w/wine # 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 (features = 'cxx c cxxprogram wine') obj.source = ( - '../libs/fst/fst.c', - '../libs/fst/fstinfofile.c', - '../libs/fst/vsti.c', '../libs/fst/vstwin.c', '../vst/winmain.c', ) @@ -385,7 +384,7 @@ def build(bld): obj.includes = [ '../libs/fst', '.' ] obj.linkflags = ['-mwindows', '-Wl,--export-dynamic'] obj.defines = ['_POSIX_SOURCE', 'USE_WS_PREFIX'] - obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3') + obj.install_path = bld.env['DLLDIR'] # end of the wine executable # now the shared library containing the GTK GUI for ardour @@ -400,6 +399,12 @@ def build(bld): obj.source = gtk2_ardour_sources obj.target = 'ardour-' + bld.env['VERSION'] obj.includes = ['.'] + obj.ldflags = ['-no-undefined'] + + if bld.is_defined('WINDOWS_VST_SUPPORT'): + # Windows VST support mingw + obj.source += [ '../vst/winmain.c' ] + obj.includes += [ '../libs/fst' ] # at this point, "obj" refers to either the normal native executable # OR the shared library built for use with wine on linux. @@ -419,9 +424,8 @@ def build(bld): 'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"', 'CONFIG_DIR="' + os.path.normpath(bld.env['SYSCONFDIR']) + '"', 'LOCALEDIR="' + os.path.join(os.path.normpath(bld.env['DATADIR']), 'locale') + '"', - 'PROGRAM_NAME="' + bld.env['PROGRAM_NAME'] + '"' ] - obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3') + obj.install_path = bld.env['DLLDIR'] obj.uselib = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD GTK OGG CURL DL' obj.uselib += ' GTKMM CANVAS FFTW3F' obj.uselib += ' AUDIOUNITS OSX GTKOSX LO ' @@ -430,10 +434,16 @@ def build(bld): if sys.platform == 'darwin': obj.uselib += ' AUDIOUNITS OSX GTKOSX' obj.use += ' libappleutility' + obj.source += [ 'cocoacarbon.mm', 'bundle_env_cocoa.cc' ] + elif bld.env['build_target'] == 'mingw': + obj.source += [ 'bundle_env_mingw.cc' ] + else: + obj.source += [ 'bundle_env_linux.cc' ] + obj.includes += ['../libs'] if bld.env['build_target'] == 'mingw': - if bld.env['DEBUG'] == False: + if bld.env['DEBUG'] == False: obj.linkflags = ['-mwindows'] if bld.is_defined('HAVE_SUIL'): @@ -446,7 +456,8 @@ def build(bld): if bld.is_defined('WINDOWS_VST_SUPPORT'): obj.source += [ 'windows_vst_plugin_ui.cc' ] obj.defines += [ 'WINDOWS_VST_SUPPORT' ] - obj.use += [ 'X11' ] + if bld.env['build_target'] != 'mingw': + obj.use += [ 'X11' ] if bld.is_defined('LXVST_SUPPORT'): obj.source += [ 'linux_vst_gui_support.cc', 'lxvst_plugin_ui.cc' ] @@ -461,7 +472,6 @@ def build(bld): if bld.is_defined('HAVE_COREAUDIO'): TaskGen.task_gen.mappings['.mm'] = TaskGen.task_gen.mappings['.cc'] - obj.source += [ 'cocoacarbon.mm' ] obj.use += ' libappleutility ' if bld.is_defined('AUDIOUNIT_SUPPORT'): @@ -469,11 +479,15 @@ def build(bld): # Wrappers + print 'DLL = ' + bld.env['DLLDIR'], '\n' + print 'DATADIR = ' + bld.env['DATADIR'], '\n' + print 'CONF = ' + bld.env['CONFDIR'], '\n' + wrapper_subst_dict = { 'INSTALL_PREFIX' : bld.env['PREFIX'], - 'LIBDIR' : os.path.normpath(bld.env['LIBDIR']), + 'LIBDIR' : os.path.normpath(bld.env['DLLDIR']), 'DATADIR' : os.path.normpath(bld.env['DATADIR']), - 'SYSCONFDIR' : os.path.normpath(bld.env['SYSCONFDIR']), + 'SYSCONFDIR' : os.path.normpath(bld.env['CONFDIR']), 'LIBS' : 'build/libs', 'VERSION' : bld.env['VERSION'], 'EXECUTABLE' : 'build/gtk2_ardour/ardour-' + bld.env['VERSION'] @@ -638,14 +652,14 @@ def build(bld): # find and add all ##include dependencies as sources obj.source += _doPyp (bld.path.find_resource ('ardour3_ui_dark.rc.in').srcpath(), True) obj.target = 'ardour3_ui_dark.rc' - obj.install_path = '${SYSCONFDIR}/ardour3' + obj.install_path = bld.env['CONFDIR'] obj = bld (rule = include_processor) obj.source = [ 'ardour3_ui_light.rc.pre' ] # find and add all ##include dependencies as sources obj.source += _doPyp (bld.path.find_resource ('ardour3_ui_light.rc.in').srcpath(), True) obj.target = 'ardour3_ui_light.rc' - obj.install_path = '${SYSCONFDIR}/ardour3' + obj.install_path = bld.env['CONFDIR'] # Menus menus_argv = [] @@ -654,16 +668,18 @@ def build(bld): else: menus_argv = [ '-E', '-P' ] - obj = bld(features = 'command-output') - obj.command = 'cpp' - obj.command_is_external = True - obj.no_inputs = True - obj.argv = menus_argv - obj.stdin = 'ardour.menus.in' - obj.stdout = 'ardour.menus' - obj.dep_vars = ['GTKOSX'] - bld.install_files(os.path.join(bld.env['SYSCONFDIR'], 'ardour3'), - 'ardour.menus') + # always build all versions of the menu definitions + # so that we can try them out with different program builds. + for program in [ 'ardour', 'trx' ]: + obj = bld(features = 'command-output') + obj.command = 'cpp' + obj.command_is_external = True + obj.no_inputs = True + obj.argv = menus_argv + obj.dep_vars = ['GTKOSX'] + obj.stdin = program + '.menus.in' + obj.stdout = program + '.menus' + bld.install_files (bld.env['CONFDIR'], program + '.menus') # Keybindings @@ -680,25 +696,24 @@ def build(bld): source = b + '.bindings.in', rule = a_rule ) - obj.install_path = os.path.join(bld.env['SYSCONFDIR'], 'ardour3') + obj.install_path = bld.env['CONFDIR'] # not modified at present - bld.install_files(os.path.join(bld.env['SYSCONFDIR'], 'ardour3'), - 'step_editing.bindings') - bld.install_files(os.path.join(bld.env['SYSCONFDIR'], 'ardour3'), - 'mixer.bindings') + bld.install_files(bld.env['CONFDIR'], 'step_editing.bindings') + bld.install_files(bld.env['CONFDIR'], 'mixer.bindings') # Icons/Images - bld.install_files('${DATADIR}/ardour3/icons', bld.path.ant_glob('icons/*.png')) - bld.install_files('${DATADIR}/ardour3/pixmaps', bld.path.ant_glob('pixmaps/*.xpm')) - bld.install_files('${DATADIR}/ardour3', 'splash.png') - bld.install_files('${DATADIR}/ardour3', 'ArdourMono.ttf') + bld.install_files(os.path.join (bld.env['DATADIR'], 'icons'), bld.path.ant_glob('icons/*.png')) + bld.install_files(os.path.join (bld.env['DATADIR'], 'pixmaps'), bld.path.ant_glob('pixmaps/*.xpm')) + bld.install_files(bld.env['DATADIR'], 'splash.png') + bld.install_files(bld.env['DATADIR'], 'small-splash.png') + bld.install_files(bld.env['DATADIR'], 'ArdourMono.ttf') # Default UI configuration - bld.install_files('${SYSCONFDIR}/ardour3', 'ardour3_ui_default.conf') + bld.install_files(bld.env['CONFDIR'], 'ardour3_ui_default.conf') # Default export stuff - bld.install_files('${SYSCONFDIR}/ardour3/export', bld.path.ant_glob('export/*.format')) + bld.install_files(os.path.join(bld.env['CONFDIR'],' export'), bld.path.ant_glob('export/*.format')) # i18n if bld.is_defined('ENABLE_NLS'):