diff options
| -rw-r--r-- | SConstruct | 40 | ||||
| -rw-r--r-- | libs/appleutility/SConscript | 4 | ||||
| -rw-r--r-- | libs/fst/SConscript | 5 | ||||
| -rw-r--r-- | vst/SConscript | 10 |
4 files changed, 34 insertions, 25 deletions
diff --git a/SConstruct b/SConstruct index 20e36defa1..21f33db46a 100644 --- a/SConstruct +++ b/SConstruct @@ -15,7 +15,7 @@ import SCons.Node.FS SConsignFile() EnsureSConsVersion(0, 96) -version = '2.0beta4' +version = '2.0beta5' subst_dict = { } @@ -25,7 +25,7 @@ subst_dict = { } opts = Options('scache.conf') opts.AddOptions( - ('ARCH', 'Set architecture-specific compilation flags by hand (all flags as 1 argument)',''), + ('ARCH', 'Set architecture-specific compilation flags by hand (all flags as 1 argument)',''), BoolOption('AUDIOUNITS', 'Compile with Apple\'s AudioUnit library. (experimental)', 0), BoolOption('COREAUDIO', 'Compile with Apple\'s CoreAudio library', 0), BoolOption('DEBUG', 'Set to build with debugging information and no optimizations', 0), @@ -565,15 +565,18 @@ if env['SYSLIBS']: 'libs/libsndfile', 'libs/pbd', 'libs/midi++2', - 'libs/ardour' + 'libs/ardour', + # these are unconditionally included but have + # tests internally to avoid compilation etc + # if VST is not set + 'libs/fst', + 'vst', + # this is unconditionally included but has + # tests internally to avoid compilation etc + # if COREAUDIO is not set + 'libs/appleutility' ] - if env['VST']: - subdirs = ['libs/fst'] + subdirs + ['vst'] - - if env['COREAUDIO']: - subdirs = subdirs + ['libs/appleutility'] - gtk_subdirs = [ # 'libs/flowcanvas', 'libs/gtkmm2ext', @@ -626,15 +629,18 @@ else: 'libs/libsndfile', 'libs/pbd', 'libs/midi++2', - 'libs/ardour' + 'libs/ardour', + # these are unconditionally included but have + # tests internally to avoid compilation etc + # if VST is not set + 'libs/fst', + 'vst', + # this is unconditionally included but has + # tests internally to avoid compilation etc + # if COREAUDIO is not set + 'libs/appleutility' ] - if env['VST']: - subdirs = ['libs/fst'] + subdirs + ['vst'] - - if env['COREAUDIO']: - subdirs = subdirs + ['libs/appleutility'] - gtk_subdirs = [ 'libs/glibmm2', 'libs/gtkmm2/pango', @@ -970,6 +976,7 @@ env.Distribute (env['DISTTREE'], srcdist = env.Tarball(env['TARBALL'], env['DISTTREE']) env.Alias ('srctar', srcdist) + # # don't leave the distree around # @@ -985,6 +992,7 @@ for subdir in coredirs: for sublistdir in [ subdirs, gtk_subdirs, surface_subdirs ]: for subdir in sublistdir: + print "doing stuff in " + subdir + "\n" SConscript (subdir + '/SConscript') # cleanup diff --git a/libs/appleutility/SConscript b/libs/appleutility/SConscript index 2f3280f8b6..695b2315cb 100644 --- a/libs/appleutility/SConscript +++ b/libs/appleutility/SConscript @@ -15,8 +15,8 @@ appleutility.Append(LINKFLAGS='-framework CoreFoundation') appleutility.Append(LINKFLAGS='-framework CoreServices') libappleutility = appleutility.SharedLibrary('appleutility', appleutility_files) - -Default(libappleutility) +if appleutility['COREAUDIO']: + Default(libappleutility) env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), libappleutility)) diff --git a/libs/fst/SConscript b/libs/fst/SConscript index 0499f11c61..ce38cbf147 100644 --- a/libs/fst/SConscript +++ b/libs/fst/SConscript @@ -21,7 +21,8 @@ b = fst.Object ('fstinfofile', 'fstinfofile.c') c = fst.Object ('vstwin', 'vstwin.c') d = fst.Object ('vsti', 'vsti.c') -Default([hackSDK,a,b,c,d]) - +if fst['VST']: + Default([hackSDK,a,b,c,d]) + env.Alias('tarball', env.Distribute (env['DISTTREE'], fst_src + ['SConscript'] )) diff --git a/vst/SConscript b/vst/SConscript index a1f2bbb616..3758c8954b 100644 --- a/vst/SConscript +++ b/vst/SConscript @@ -66,11 +66,11 @@ wine_executable = ardour_vst.SubstInFile ('ardourvst', 'ardourvst.in', SUBST_DIC # make sure the scripts are executable -ardour_vst.AddPostAction (wine_executable, ardour_vst.Action (os.chmod ('ardevst', S_IRUSR|S_IROTH|S_IRGRP|S_IWUSR|S_IXUSR|S_IXOTH|S_IXGRP))) -ardour_vst.AddPostAction (wine_executable, ardour_vst.Action (os.chmod ('ardourvst', S_IRUSR|S_IROTH|S_IRGRP|S_IWUSR|S_IXUSR|S_IXOTH|S_IXGRP))) - -Default([wine_generated_executable, wine_executable]) - +if ardour_vst['VST']: + ardour_vst.AddPostAction (wine_executable, ardour_vst.Action (os.chmod ('ardevst', S_IRUSR|S_IROTH|S_IRGRP|S_IWUSR|S_IXUSR|S_IXOTH|S_IXGRP))) + ardour_vst.AddPostAction (wine_executable, ardour_vst.Action (os.chmod ('ardourvst', S_IRUSR|S_IROTH|S_IRGRP|S_IWUSR|S_IXUSR|S_IXOTH|S_IXGRP))) + Default([wine_generated_executable, wine_executable]) + # the wine script - into the bin dir env.Alias('install', env.Install(os.path.join(install_prefix, 'bin'), wine_executable)) # the win32 executable - into the lib dir since the wine script will look for it there |