diff options
| author | David Runge <dave@sleepmap.de> | 2020-01-20 23:08:11 +0100 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2020-01-25 04:07:37 +0100 |
| commit | 2e9ac80e998bc79d5ef9029415008198b22168dc (patch) | |
| tree | 230cc17d741c519a8acc8925e556555c8edbf1cf /gtk2_ardour/wscript | |
| parent | dfe712c5649ecc248242d35ee55fbb273b7fa150 (diff) | |
Towards waf python 2+3 support
Diffstat (limited to 'gtk2_ardour/wscript')
| -rw-r--r-- | gtk2_ardour/wscript | 32 |
1 files changed, 12 insertions, 20 deletions
diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript index 194282cb66..7b0d6c56a7 100644 --- a/gtk2_ardour/wscript +++ b/gtk2_ardour/wscript @@ -401,20 +401,15 @@ def configure(conf): conf.env.append_value(var, ['-isystem', d]) if sys.platform == 'darwin': - retval = conf.run_c_code (code='#include <AppKit/NSWindow.h>\n\ - int main(void) { (void) NSWindowWillStartLiveResizeNotification; return 0; }\n', - env = conf.env.derive (), - features = [ 'c' ], - compiler = 'cc', - compile_filename='test.m', - mandatory = False, - ) - - if retval == 0: - autowaf.display_msg (conf, 'Checking for Cocoa live resizing constants', 'ok') - conf.define ('HAVE_COCOA_LIVE_RESIZING', 1) - else: - autowaf.display_msg (conf, 'Checking for Cocoa live resizing constants', 'too old - AU plugin windows will be fixed size') + conf.check( + msg ='Checking for Cocoa live resizing constants', + fragment = '#include <AppKit/NSWindow.h>\n int main(void) { (void) NSWindowWillStartLiveResizeNotification; return 0; }\n', + define_name = 'HAVE_COCOA_LIVE_RESIZING', + uselib_store = 'COCOA_LIVE_RESIZING', + compiler = 'cc', + compile_filename = 'test.m', + execute = True, + mandatory = False) conf.write_config_header('gtk2ardour-config.h', remove=False) @@ -507,7 +502,6 @@ def build(bld): obj.source = list(gtk2_ardour_sources) obj.target = 'luadoc' obj.includes = ['.', '../libs'] - obj.ldflags = ['-no-undefined'] obj.use = [ 'libpbd', 'libardour', @@ -547,7 +541,6 @@ def build(bld): # obj.source = [ 'ardour_button.cc', 'ui_config.cc', 'tooltips.cc' ] # obj.target = 'canvas_test' # obj.includes = ['.', '../libs'] -# obj.ldflags = ['-no-undefined'] # obj.use = [ # 'libpbd', # 'libardour', @@ -618,9 +611,8 @@ def build(bld): obj = bld (features = 'cxx c cxxprogram') # operate on copy to avoid adding sources twice obj.source = list(gtk2_ardour_sources) - obj.target = 'ardour-' + str (bld.env['VERSION']) - obj.includes = ['.'] - obj.ldflags = ['-no-undefined'] + obj.target = 'ardour-' + str (bld.env['VERSION']) + obj.includes = ['.'] if bld.is_defined('WINDOWS_VST_SUPPORT'): # Windows VST support mingw @@ -649,7 +641,7 @@ def build(bld): ] obj.install_path = bld.env['DLLDIR'] obj.linkflags = '' - obj.uselib = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD GTK OGG CURL DL GTKMM CANVAS FFTW3F LO TAGLIB XML ' + obj.uselib = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD GTK OGG CURL DL GTKMM CANVAS FFTW3F LO TAGLIB XML LILV' if sys.platform == 'darwin': obj.uselib += ' AUDIOUNITS OSX ' |