diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2006-06-20 18:50:38 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2006-06-20 18:50:38 +0000 |
| commit | be362ae53c1d191e23d8a084d0327044bce4544c (patch) | |
| tree | fb64f8276c64a495a0fdcf99e772d983af7725c0 /gtk2_ardour/SConscript | |
| parent | c03dbd7568322d553ff681cb7f0bbd3452abd6cf (diff) | |
fixes for libsndfile conversion issues, tape track waveform display and overloaded virtual functions
git-svn-id: svn://localhost/ardour2/trunk@624 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/SConscript')
| -rw-r--r-- | gtk2_ardour/SConscript | 42 |
1 files changed, 25 insertions, 17 deletions
diff --git a/gtk2_ardour/SConscript b/gtk2_ardour/SConscript index b670a6d969..99c97d20a4 100644 --- a/gtk2_ardour/SConscript +++ b/gtk2_ardour/SConscript @@ -58,9 +58,6 @@ if gtkardour['FFT_ANALYSIS']: gtkardour.Merge ([libraries['fftw3f']]) gtkardour.Append(CCFLAGS='-DFFT_ANALYSIS') -if gtkardour['VST']: - gtkardour.Merge ([ libraries['fst']]) - skipped_files=Split(""" connection_editor.cc """) @@ -203,15 +200,16 @@ itest.cc """) extra_sources = [] + vst_files = [ 'vst_pluginui.cc' ] if env['VST']: - extra_sources += vst_files - + extra_sources += vst_files + gtkardour.Append (CCFLAGS="-DVST_SUPPORT", CPPPATH="#libs/fst") + if env['FFT_ANALYSIS']: extra_sources += fft_analysis_files - intl_files += extra_sources gtkardour.Append(CCFLAGS="-D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE") @@ -226,6 +224,8 @@ gtkardour.VersionBuild(['version.cc','version.h'], 'SConscript') executable = 'ardour.bin' ardour = gtkardour.Program(target = executable, source = gtkardour_files + extra_sources) +ardourlib = gtkardour.SharedLibrary(target = 'ardourgtk', source = gtkardour_files + extra_sources) + mtest = gtkardour.Program(target = 'mtest', source = mtest_files) itest = gtkardour.Program(target = 'itest', source = itest_files) @@ -235,21 +235,28 @@ my_subst_dict['%INSTALL_PREFIX%'] = install_prefix ardoursh = env.SubstInFile ('ardour.sh','ardour.sh.in', SUBST_DICT = my_subst_dict); env.AddPostAction (ardoursh, Chmod ('$TARGET', 0755)) -Default(ardour) +if env['VST']: + Default(ardourlib) + # the library - into the library dir + env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), ardourlib)) +else: + + if env['VERSIONED']: + Default (env.VersionedExecutable ('tagged_executable', ardour)) + else: + Default(ardour) -if env['VERSIONED']: - Default (env.VersionedExecutable ('tagged_executable', ardour)) + #install + + # the executable - into the library dir + env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), ardour)) + # the script - into the bin dir + env.Alias('install', env.InstallAs(os.path.join(install_prefix, 'bin')+'/ardour2', ardoursh)) if env['NLS']: - Export('gtkardour', 'intl_files') - SConscript ('po/SConscript') + Export('gtkardour', 'intl_files') + SConscript ('po/SConscript') -#install - -# the executable - into the library dir -env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), ardour)) -# the script - into the bin dir -env.Alias('install', env.InstallAs(os.path.join(install_prefix, 'bin')+'/ardour2', ardoursh)) # configuration files env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour2_ui.rc')) env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour.menus')) @@ -259,6 +266,7 @@ env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour 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)) + #dist env.Alias ('tarball', env.Distribute (env['DISTTREE'], [ 'SConscript', |