X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=SConstruct;h=cca846a0a7974503a178c59501d923355d701acb;hb=c59bbdb7a97a331e9cb258c065f1181f1e7107bb;hp=0113fd34669e93c5ce57873763c708354730d536;hpb=315dd3d7705d314b935a7a35007347a41e0f9bfd;p=ardour.git diff --git a/SConstruct b/SConstruct index 0113fd3466..cca846a0a7 100644 --- a/SConstruct +++ b/SConstruct @@ -16,7 +16,7 @@ import SCons.Node.FS SConsignFile() EnsureSConsVersion(0, 96) -ardour_version = '2.2' +ardour_version = '2.4' subst_dict = { } @@ -27,16 +27,20 @@ subst_dict = { } opts = Options('scache.conf') opts.AddOptions( ('ARCH', 'Set architecture-specific compilation flags by hand (all flags as 1 argument)',''), + ('WINDOWS_KEY', 'Set X Modifier (Mod1,Mod2,Mod3,Mod4,Mod5) for "Windows" key', 'Mod4'), BoolOption('AUDIOUNITS', 'Compile with Apple\'s AudioUnit library. (experimental)', 0), 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), + BoolOption('STL_DEBUG', 'Set to build with Standard Template Library Debugging', 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), BoolOption('DMALLOC', 'Compile and link using the dmalloc library', 0), BoolOption('EXTRA_WARN', 'Compile with -Wextra, -ansi, and -pedantic. Might break compilation. For pedants', 0), - BoolOption('FFT_ANALYSIS', 'Include FFT analysis window', 0), + BoolOption('FFT_ANALYSIS', 'Include FFT analysis window', 1), + BoolOption('FREESOUND', 'Include Freesound database lookup', 0), BoolOption('FPU_OPTIMIZATION', 'Build runtime checked assembler code', 1), BoolOption('LIBLO', 'Compile with support for liblo library', 1), BoolOption('NLS', 'Set to turn on i18n support', 1), @@ -48,6 +52,7 @@ opts.AddOptions( BoolOption('VST', 'Compile with support for VST', 0), BoolOption('LV2', 'Compile with support for LV2 (if slv2 is available)', 1), BoolOption('GPROFILE', 'Compile with support for gprofile (Developers only)', 0), + BoolOption('FREEDESKTOP', 'Install MIME type, icons and .desktop file as per the freedesktop.org spec (requires xdg-utils and shared-mime-info). "scons uninstall" removes associations in desktop database', 0), BoolOption('TRANZPORT', 'Compile with support for Frontier Designs (if libusb is available)', 1) ) @@ -524,19 +529,40 @@ if env['FFT_ANALYSIS']: conf = Configure(libraries['fftw3']) if conf.CheckHeader ('fftw3.h') == False: - print ('FFT Analysis cannot be compiled without the FFTW3 headers, which do not seem to be installed') + print ('Ardour cannot be compiled without the FFTW3 headers, which do not seem to be installed') sys.exit (1) conf.Finish() +if env['FREESOUND']: + # + # Check for curl header as well as the library + # + + libraries['curl'] = LibraryInfo() + + conf = Configure(libraries['curl']) + + if conf.CheckHeader ('curl/curl.h') == False: + print ('Ardour cannot be compiled without the curl headers, which do not seem to be installed') + sys.exit (1) + else: + libraries['curl'].ParseConfig('pkg-config --cflags --libs libcurl') + conf.Finish() +else: + print 'FREESOUND support is not enabled. Build with \'scons FREESOUND=1\' to enable.' + 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: @@ -557,6 +583,9 @@ libraries['glib2'].ParseConfig ('pkg-config --cflags --libs gobject-2.0') libraries['glib2'].ParseConfig ('pkg-config --cflags --libs gmodule-2.0') libraries['glib2'].ParseConfig ('pkg-config --cflags --libs gthread-2.0') +libraries['freetype2'] = LibraryInfo() +libraries['freetype2'].ParseConfig ('pkg-config --cflags --libs freetype2') + libraries['gtk2'] = LibraryInfo() libraries['gtk2'].ParseConfig ('pkg-config --cflags --libs gtk+-2.0') @@ -692,9 +721,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 +748,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 @@ -754,10 +786,14 @@ else: env.Append(CCFLAGS=" ".join (opt_flags)) env.Append(LINKFLAGS=" ".join (opt_flags)) +if env['STL_DEBUG'] == 1: + env.Append(CXXFLAGS="-D_GLIBCXX_DEBUG") + if env['UNIVERSAL'] == 1: env.Append(CCFLAGS="-arch i386 -arch ppc") env.Append(LINKFLAGS="-arch i386 -arch ppc") + # # warnings flags # @@ -915,6 +951,26 @@ else: libraries['dmalloc'] = conf.Finish () +# +# ensure FREEDESKTOP target is doable.. +# + +conf = env.Configure () +if env['FREEDESKTOP']: + have_update_mime_database = conf.TryAction (Action ('update-mime-database -v')) + if have_update_mime_database[0] != 1: + print "Warning. You have no update-mime-database command in your PATH. FREEDESKTOP is now disabled." + env['FREEDESKTOP'] = 0 + have_gtk_update_icon_cache = conf.TryAction (Action ('gtk-update-icon-cache -?')) + if have_gtk_update_icon_cache[0] != 1: + print "Warning. You have no gtk-update-icon-cache command in your PATH. FREEDESKTOP is now disabled." + env['FREEDESKTOP'] = 0 + have_update_desktop_database = conf.TryAction (Action ('update-desktop-database -?')) + if have_update_desktop_database[0] != 1: + print "Warning. You have no update-desktop-database command in your PATH. FREEDESKTOP is now disabled." + env['FREEDESKTOP'] = 0 +env = conf.Finish() + # # Audio/MIDI library (needed for MIDI, since audio is all handled via JACK) # @@ -1247,7 +1303,8 @@ the_revision = env.Command ('frobnicatory_decoy', [], create_stored_revision) remove_ardour = env.Command ('frobnicatory_decoy2', [], [ Delete ('$PREFIX/etc/ardour2'), Delete ('$PREFIX/lib/ardour2'), - Delete ('$PREFIX/bin/ardour2')]) + Delete ('$PREFIX/bin/ardour2'), + Delete ('$PREFIX/share/ardour2')]) env.Alias('revision', the_revision) env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour_system.rc'))