remove silly buffer stats output; apply MIDI control patch (#2655) from dhess; switch ctrl/alt for drag-selection-as-region (work ongoing); various scons cleanups; remove some dead code from editor

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@6798 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 30 insertions, 30 deletions

diff --git a/SConstruct b/SConstruct
index 9bbd2c7a24..93b02296c7 100644
--- a/SConstruct
+++ b/SConstruct
@@ -29,40 +29,40 @@ subst_dict = { }
 # Command-line options
 #
 
-opts = Options('scache.conf')
-opts.AddOptions(
+opts = Variables('scache.conf')
+opts.AddVariables(
     ('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><Super'),
     ('PROGRAM_NAME', 'Set program name (default is "Ardour")', 'Ardour'),
-    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('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', 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),
-    PathOption('PREFIX', 'Set the install "prefix"', '/usr/local'),
-    BoolOption('SURFACES', 'Build support for control surfaces', 1),
-    BoolOption('WIIMOTE', 'Build the wiimote control surface', 0),
     ('DIST_LIBDIR', 'Explicitly set library dir. If not set, Fedora-style defaults are used (typically lib or lib64)', ''),
-    BoolOption('SYSLIBS', 'USE AT YOUR OWN RISK: CANCELS ALL SUPPORT FROM ARDOUR AUTHORS: Use existing system versions of various libraries instead of internal ones', 0),
-    BoolOption('UNIVERSAL', 'Compile as universal binary.  Requires that external libraries are already universal.', 0),
-    BoolOption('VERSIONED', 'Add revision information to ardour/gtk executable name inside the build directory', 0),
-    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),
-    BoolOption('AUBIO', "Use Paul Brossier's aubio library for feature detection (if available)", 1),
-    BoolOption('AUSTATE', "Build with support for AU settings & presets saving/loading", 0)
+    PathVariable('DESTDIR', 'Set the intermediate install "prefix"', '/'),
+    PathVariable('PREFIX', 'Set the install "prefix"', '/usr/local'),
+    EnumVariable('DIST_TARGET', 'Build target for cross compiling packagers', 'auto', allowed_values=('auto', 'i386', 'i686', 'x86_64', 'powerpc', 'tiger', 'panther', 'leopard', 'none' ), ignorecase=2),
+    BoolVariable('AUDIOUNITS', 'Compile with Apple\'s AudioUnit library. (experimental)', 0),
+    BoolVariable('COREAUDIO', 'Compile with Apple\'s CoreAudio library', 0),
+    BoolVariable('GTKOSX', 'Compile for use with GTK-OSX, not GTK-X11', 0),
+    BoolVariable('OLDFONTS', 'Old school font sizes', 0),
+    BoolVariable('DEBUG', 'Set to build with debugging information and no optimizations', 0),
+    BoolVariable('STL_DEBUG', 'Set to build with Standard Template Library Debugging', 0),
+    BoolVariable('DMALLOC', 'Compile and link using the dmalloc library', 0),
+    BoolVariable('EXTRA_WARN', 'Compile with -Wextra, -ansi, and -pedantic.  Might break compilation.  For pedants', 0),
+    BoolVariable('FFT_ANALYSIS', 'Include FFT analysis window', 1),
+    BoolVariable('FREESOUND', 'Include Freesound database lookup', 0),
+    BoolVariable('FPU_OPTIMIZATION', 'Build runtime checked assembler code', 1),
+    BoolVariable('LIBLO', 'Compile with support for liblo library', 1),
+    BoolVariable('NLS', 'Set to turn on i18n support', 1),
+    BoolVariable('SURFACES', 'Build support for control surfaces', 1),
+    BoolVariable('WIIMOTE', 'Build the wiimote control surface', 0),
+    BoolVariable('SYSLIBS', 'USE AT YOUR OWN RISK: CANCELS ALL SUPPORT FROM ARDOUR AUTHORS: Use existing system versions of various libraries instead of internal ones', 0),
+    BoolVariable('UNIVERSAL', 'Compile as universal binary.  Requires that external libraries are already universal.', 0),
+    BoolVariable('VERSIONED', 'Add revision information to ardour/gtk executable name inside the build directory', 0),
+    BoolVariable('VST', 'Compile with support for VST', 0),
+    BoolVariable('LV2', 'Compile with support for LV2 (if slv2 is available)', 1),
+    BoolVariable('GPROFILE', 'Compile with support for gprofile (Developers only)', 0),
+    BoolVariable('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),
+    BoolVariable('TRANZPORT', 'Compile with support for Frontier Designs (if libusb is available)', 1),
+    BoolVariable('AUBIO', "Use Paul Brossier's aubio library for feature detection (if available)", 1),
+    BoolVariable('AUSTATE', "Build with support for AU settings & presets saving/loading", 0)
 )
 
 #----------------------------------------------------------------------