X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2FSConscript;h=24adb555387e4b51735e7c768fb39fb70fa4bff5;hb=003c9d6f5e4d5fdc3b95ab516b06e2f89efabdbd;hp=ca40cbfcb909a2dda30a287c00b2c334d83c1a08;hpb=ce234f363e95c38fc92728e520bf5ba240a89aa7;p=ardour.git diff --git a/gtk2_ardour/SConscript b/gtk2_ardour/SConscript index ca40cbfcb9..24adb55538 100644 --- a/gtk2_ardour/SConscript +++ b/gtk2_ardour/SConscript @@ -4,9 +4,10 @@ import os import os.path import glob -Import('env install_prefix final_prefix config_prefix libraries i18n version') +Import('env install_prefix final_prefix config_prefix libraries i18n ardour_version') gtkardour = env.Copy() +gtkmmtests = env.Copy() # # this defines the version number of the GTK interface to ardour @@ -18,6 +19,7 @@ gtkardour.Append(DOMAIN=domain, MAJOR=1,MINOR=0,MICRO=2) gtkardour.Append(CCFLAGS="-DPACKAGE=\\\"" + domain + "\\\"") gtkardour.Append(CXXFLAGS="-DPACKAGE=\\\"" + domain + "\\\"") gtkardour.Append(CXXFLAGS="-DLIBSIGC_DISABLE_DEPRECATED") +gtkardour.Append(CPPPATH="#/") # for top level svn_revision.h #gtkardour.Append(CXXFLAGS="-DFLOWCANVAS_AA") gtkardour.Append(PACKAGE=domain) gtkardour.Append(POTFILE=domain + '.pot') @@ -33,7 +35,7 @@ gtkardour.Merge ([ libraries['libgnomecanvas2'], libraries['libgnomecanvasmm'], libraries['sysmidi'], - libraries['sndfile'], + libraries['sndfile-ardour'], libraries['flac'], libraries['lrdf'], libraries['glibmm2'], @@ -49,6 +51,19 @@ gtkardour.Merge ([ libraries['jack'] ]) +gtkmmtests.Append(CXXFLAGS="-DLIBSIGC_DISABLE_DEPRECATED") + +gtkmmtests.Merge ([ + libraries['gtkmm2'], + libraries['glib2'], + libraries['glibmm2'], + libraries['pangomm'], + libraries['atkmm'], + libraries['gdkmm2'], + libraries['sigc2'], + libraries['gtk2'] +]) + if gtkardour['DMALLOC']: gtkardour.Merge([libraries['dmalloc']]) gtkardour.Append(CCFLAGS='-DUSE_DMALLOC') @@ -61,7 +76,7 @@ skipped_files=Split(""" connection_editor.cc """) -coreaudio_files=Split(""" +audiounit_files=Split(""" au_pluginui.cc """) @@ -95,6 +110,7 @@ color_manager.cc crossfade_edit.cc crossfade_view.cc curvetest.cc +enums.cc editing.cc editor.cc editor_actions.cc @@ -118,6 +134,7 @@ editor_region_list.cc editor_route_list.cc editor_rulers.cc editor_scrub.cc +editor_selection.cc editor_selection_list.cc editor_tempodisplay.cc editor_timefx.cc @@ -128,7 +145,6 @@ export_range_markers_dialog.cc gain_automation_time_axis.cc gain_meter.cc ghostregion.cc -grouped_buttons.cc gtk-custom-hruler.c gtk-custom-ruler.c imageframe.cc @@ -152,6 +168,7 @@ new_session_dialog.cc option_editor.cc opts.cc pan_automation_time_axis.cc +panner.cc panner2d.cc panner_ui.cc playlist_selector.cc @@ -192,7 +209,8 @@ fft_graph.cc fft_result.cc """) -pixmap_files=glob.glob('pixmaps/*.xpm') +pixmap_files = glob.glob('pixmaps/*.xpm') +icon_files = glob.glob ('icons/*.png') intl_files = gtkardour_files + glob.glob('*.h') @@ -213,6 +231,10 @@ stest_files=Split(""" stest.cc """) +tt_files=Split (""" +tt.cc +""") + extra_sources = [] vst_files = [ 'vst_pluginui.cc' ] @@ -221,9 +243,9 @@ if env['VST']: extra_sources += vst_files gtkardour.Append (CCFLAGS="-DVST_SUPPORT", CPPPATH="#libs/fst") -if gtkardour['COREAUDIO']: - extra_sources += coreaudio_files - gtkardour.Append(CCFLAGS='-DHAVE_COREAUDIO') +if gtkardour['AUDIOUNITS']: + extra_sources += audiounit_files + gtkardour.Append(CCFLAGS='-DHAVE_AUDIOUNITS') gtkardour.Append(LINKFLAGS='-framework Carbon') gtkardour.Merge([libraries['appleutility']]) @@ -239,9 +261,7 @@ versionflag = '-DVERSIONSTRING=\\\"' + env['VERSION'] + '\\\"' gtkardour.Append(CXXFLAGS=versionflag) -gtkardour.VersionBuild(['version.cc','version.h'], 'SConscript') - -executable = 'ardour.bin' +executable = 'ardour-' + ardour_version ardour = gtkardour.Program(target = executable, source = gtkardour_files + extra_sources) ardourlib = gtkardour.SharedLibrary(target = 'ardourgtk', source = gtkardour_files + extra_sources) @@ -249,17 +269,34 @@ ardourlib = gtkardour.SharedLibrary(target = 'ardourgtk', source = gtkardour_fil mtest = gtkardour.Program(target = 'mtest', source = mtest_files) itest = gtkardour.Program(target = 'itest', source = itest_files) rcu = gtkardour.Program(target = 'rcu', source = rcu_files) +tt = gtkmmtests.Program(target = 'tt', source = tt_files) my_subst_dict = { } -my_subst_dict['%INSTALL_PREFIX%'] = install_prefix + +# +# null substitution just to avoid ardour.bindings being in svn +# + +ardourbindings = env.SubstInFile ('ardour.bindings', 'ardour.bindings.in', SUBST_DICT = my_subst_dict); + +my_subst_dict['%INSTALL_PREFIX%'] = final_prefix +my_subst_dict['%LIBDIR%'] = env['LIBDIR'] +my_subst_dict['%VERSION%'] = ardour_version ardoursh = env.SubstInFile ('ardour.sh','ardour.sh.in', SUBST_DICT = my_subst_dict); env.AddPostAction (ardoursh, Chmod ('$TARGET', 0755)) +ardourdev = env.SubstInFile ('ardev_common.sh','ardev_common.sh.in', SUBST_DICT = my_subst_dict); +env.AddPostAction (ardourdev, Chmod ('$TARGET', 0755)) + +Default(ardourbindings) +Default(ardourdev) +Default(ardoursh) + if env['VST']: Default(ardourlib) # the library - into the library dir - env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), ardourlib)) + env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), ardourlib)) else: if env['VERSIONED']: @@ -270,7 +307,7 @@ else: #install # the executable - into the library dir - env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), ardour)) + env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), ardour)) # the script - into the bin dir env.Alias('install', env.InstallAs(os.path.join(install_prefix, 'bin')+'/ardour2', ardoursh)) @@ -283,21 +320,31 @@ env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour.bindings')) env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour.colors')) # data files -env.Alias('install', env.Install(os.path.join(install_prefix, 'share/ardour2'), 'splash.ppm')) -env.Alias('install', env.Install(os.path.join(install_prefix, 'share/ardour2/pixmaps'), pixmap_files)) +env.Alias('install', env.Install(os.path.join(install_prefix, 'share', 'ardour2'), 'splash.png')) +env.Alias('install', env.Install(os.path.join(install_prefix, 'share', 'ardour2', 'pixmaps'), pixmap_files)) +env.Alias('install', env.Install(os.path.join(install_prefix, 'share', 'ardour2', 'icons'), icon_files)) +env.Alias ('version', gtkardour.VersionBuild(['version.cc','version.h'], [])) #dist env.Alias ('tarball', env.Distribute (env['DISTTREE'], [ 'SConscript', 'i18n.h', 'gettext.h', 'ardour.sh.in', - 'ardour2_ui.rc', 'splash.ppm', - 'ardour.menus', 'ardour.bindings', 'ardour.colors', + 'ardev_common.sh.in', + 'ardev', 'ardbg', + 'ardour2_ui.rc', 'splash.png', + 'ardour.menus', 'ardour.bindings.in', 'ardour.colors', 'editor_xpms' ] + - gtkardour_files + vst_files + pixmap_files + - glob.glob('po/*.po') + glob.glob('*.h'))) + gtkardour_files + + vst_files + + pixmap_files + + icon_files + + skipped_files + + audiounit_files + + fft_analysis_files + + glob.glob('po/*.po') + glob.glob('*.h'))) # generate a prototype full-featured ardour_ui.rc file