some fixes to sex. it starts and runs and starts transferring, but it never finishes...

[ardour.git] / SConstruct

diff --git a/SConstruct b/SConstruct
index 0113fd34669e93c5ce57873763c708354730d536..95f166b232bb69cb86053b8584f2757b593b203d 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -16,7 +16,7 @@ import SCons.Node.FS
 SConsignFile()
 EnsureSConsVersion(0, 96)
 
-ardour_version = '2.2'
+ardour_version = '2.3'
 
 subst_dict = { }
 
@@ -31,6 +31,7 @@ opts.AddOptions(
     BoolOption('COREAUDIO', 'Compile with Apple\'s CoreAudio library', 0),
     BoolOption('GTKOSX', 'Compile for use with GTK-OSX, not GTK-X11', 0),
     BoolOption('NATIVE_OSX_KEYS', 'Build key bindings file that matches OS X conventions', 0),
+    BoolOption('OLDFONTS', 'Old school font sizes', 0),
     BoolOption('DEBUG', 'Set to build with debugging information and no optimizations', 0),
     PathOption('DESTDIR', 'Set the intermediate install "prefix"', '/'),
     EnumOption('DIST_TARGET', 'Build target for cross compiling packagers', 'auto', allowed_values=('auto', 'i386', 'i686', 'x86_64', 'powerpc', 'tiger', 'panther', 'leopard', 'none' ), ignorecase=2),
@@ -531,12 +532,15 @@ if env['FFT_ANALYSIS']:
 if env['LV2']:
        conf = env.Configure(custom_tests = { 'CheckPKGExists' : CheckPKGExists })
        
-       if conf.CheckPKGExists ('\"slv2 >= 0.4.4\"'):
+       if conf.CheckPKGExists ('\"slv2 >= 0.6.0\"'):
                libraries['slv2'] = LibraryInfo()
                libraries['slv2'].ParseConfig('pkg-config --cflags --libs slv2')
+                env.Append (CCFLAGS="-DHAVE_LV2")
        else:
-               print 'Building Ardour with LV2 support requires SLV2 >= 0.4.4'
+               print 'Building Ardour with LV2 support requires SLV2 >= 0.6.0'
                print 'WARNING: SLV2 not found, or too old.  Ardour will be built without LV2 support.'
+               print 'Until the 2.4 release, Ardour requires SLV2 out of SVN.'
+               print 'Testing would be very much appreciated!  svn co http://svn.drobilla.net/lad/slv2'
                env['LV2'] = 0
        conf.Finish()
 else:
@@ -692,9 +696,9 @@ elif ((re.search ("i[0-9]86", config[config_cpu]) != None) or (re.search ("x86_6
 
 # optimization section
 if env['FPU_OPTIMIZATION']:
-    if env['DIST_TARGET'] == 'tiger':
-        opt_flags.append ("-DBUILD_VECLIB_OPTIMIZATIONS")
-        debug_flags.append ("-DBUILD_VECLIB_OPTIMIZATIONS")
+    if env['DIST_TARGET'] == 'tiger' or env['DIST_TARGET'] == 'leopard':
+        opt_flags.append ("-DBUILD_VECLIB_OPTIMIZATIONS");
+        debug_flags.append ("-DBUILD_VECLIB_OPTIMIZATIONS");
         libraries['core'].Append(LINKFLAGS= '-framework Accelerate')
     elif env['DIST_TARGET'] == 'i686' or env['DIST_TARGET'] == 'x86_64':
         opt_flags.append ("-DBUILD_SSE_OPTIMIZATIONS")
@@ -719,6 +723,9 @@ else:
 
 if env['DIST_TARGET'] in ['panther', 'tiger', 'leopard' ]:
     env['IS_OSX'] = 1
+    # force tiger or later, to avoid issues on PPC which defaults
+    # back to 10.1 if we don't tell it otherwise.
+    env.Append (CCFLAGS="-DMAC_OS_X_VERSION_MIN_REQUIRED=1040")
 else:
     env['IS_OSX'] = 0