diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-06-13 23:00:24 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-06-13 23:00:24 -0400 |
| commit | f00b3b7f111e36537d773daef0ae77b03d11f82f (patch) | |
| tree | 4bfdd432199a7d4a4cbfc7769493e6bedaa5e51f /wscript | |
| parent | 31d234b48c36bddb4d5228a3abee9c4419403879 (diff) | |
| parent | 80a13145f398e1c4ea22b3f8a25a5b38d3c5e328 (diff) | |
merge with master
Diffstat (limited to 'wscript')
| -rw-r--r-- | wscript | 17 |
1 files changed, 11 insertions, 6 deletions
@@ -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 = '.' @@ -464,6 +466,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) @@ -512,6 +516,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 @@ -520,9 +528,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) @@ -562,7 +567,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") |