Make scroll-wheel modifier keys consistent in editor summary pane.

[ardour.git] / wscript

diff --git a/wscript b/wscript
index dc0279be8c60aa0016bf3397d432b241e1a1233b..6c5ea19d6471f076d4defe0c8303778355f3a047 100644 (file)
--- a/wscript
+++ b/wscript
@@ -7,9 +7,11 @@ import string
 import subprocess
 import sys
 
-VERSION = '3.1'
+MAJOR = '3'
+MINOR = '2'
+VERSION = MAJOR + '.' + MINOR
 
-APPNAME = 'Ardour3'
+APPNAME = 'Ardour' + MAJOR
 
 # Mandatory variables
 top = '.'
@@ -461,6 +463,8 @@ def configure(conf):
     conf.load('compiler_c')
     conf.load('compiler_cxx')
     conf.env['VERSION'] = VERSION
+    conf.env['MAJOR'] = MAJOR
+    conf.env['MINOR'] = MINOR
     conf.line_just = 52
     autowaf.set_recursive()
     autowaf.configure(conf)
@@ -509,6 +513,10 @@ def configure(conf):
     else:
         autowaf.display_msg(conf, 'Will build against private Ardour dependency stack', 'no')
         
+    if Options.options.freebie:
+        conf.env.append_value ('CFLAGS', '-DNO_PLUGIN_STATE')
+        conf.env.append_value ('CXXFLAGS', '-DNO_PLUGIN_STATE')
+
     if sys.platform == 'darwin':
 
         # this is required, potentially, for anything we link and then relocate into a bundle
@@ -517,9 +525,6 @@ def configure(conf):
         conf.define ('HAVE_COREAUDIO', 1)
         conf.define ('AUDIOUNIT_SUPPORT', 1)
 
-        if not Options.options.freebie:
-            conf.define ('AU_STATE_SUPPORT', 1)
-
         conf.define ('GTKOSX', 1)
         conf.define ('TOP_MENUBAR',1)
         conf.define ('GTKOSX',1)
@@ -559,7 +564,7 @@ def configure(conf):
         conf.env.append_value('LINKFLAGS_AUDIOUNITS', ['-framework', 'Cocoa'])
 
         if not Options.options.freebie:
-            conf.env.append_value('CXXFLAGS_AUDIOUNITS', "-DAU_STATE_SUPPORT")
+            conf.env.append_value('CXXFLAGS_AUDIOUNITS')
 
         if re.search ("^[1-9][0-9]\.", os.uname()[2]) == None and not Options.options.nocarbon:
             conf.env.append_value('CXXFLAGS_AUDIOUNITS', "-DWITH_CARBON")