add vestige dir to tarball

[ardour.git] / SConstruct

diff --git a/SConstruct b/SConstruct
index 16eca1f59f15223171687a8a144b594071626ad9..c276f9825a21684a5ddab6b1c16ff02f07160761 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -21,7 +21,7 @@ import SCons.Node.FS
 SConsignFile()
 EnsureSConsVersion(0, 96)
 
-ardour_version = '2.7.1'
+ardour_version = '2.8'
 
 subst_dict = { }
 
@@ -401,11 +401,11 @@ env.Append (BUILDERS = {'Tarball' : tarball_bld})
 def pushEnvironment(context):
     if os.environ.has_key('PATH'):
        context.Append(PATH = os.environ['PATH'])
-       context.['ENV']['PATH'] = os.environ['PATH'])
+       context['ENV']['PATH'] = os.environ['PATH']
        
     if os.environ.has_key('PKG_CONFIG_PATH'):
        context.Append(PKG_CONFIG_PATH = os.environ['PKG_CONFIG_PATH'])
-       context.['ENV']['PKG_CONFIG_PATH'] = os.environ['PKG_CONFIG_PATH'])
+       context['ENV']['PKG_CONFIG_PATH'] = os.environ['PKG_CONFIG_PATH']
            
     if os.environ.has_key('CC'):
        context['CC'] = os.environ['CC']
@@ -750,6 +750,17 @@ if env['DIST_TARGET'] == 'x86_64':
 else:
     env['LIBDIR']='lib'
 
+#
+# no VST on x86_64
+#
+
+if env['DIST_TARGET'] == 'x86_64' and env['VST']:
+    print "\n\n=================================================="
+    print "You cannot use VST plugins with a 64 bit host. Please run scons with VST=0"
+    print "\nIt is theoretically possible to build a 32 bit host on a 64 bit system."
+    print "However, this is tricky and not recommended for beginners."
+    sys.exit (-1)
+
 #
 # a single way to test if we're on OS X
 #