diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2013-12-23 15:35:49 -0500 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-12-23 15:35:49 -0500 |
commit | 84f55440a3c6317dd2ab5d7e3d638016609e4d03 (patch) | |
tree | 2329f57523432a698f99927a2f070555fd31fe20 /gtk2_ardour/wscript | |
parent | e1bca03857070ba390bba729933c2d72ad5169fd (diff) | |
parent | dc7878760da040ad74b077318d2e9868d427199a (diff) |
fix redrawing of canvas with an optimized build
Best guess right now is that optimization does something bad when ceil() is called twice on a very large dbl-precision number,
which results in a zero (empty) redraw area. Without the removal of the redundant ceil & floor functions, no expose events
would be delivered to the canvas in an optimized build during drags (and maybe more).
Diffstat (limited to 'gtk2_ardour/wscript')
-rw-r--r-- | gtk2_ardour/wscript | 44 |
1 files changed, 25 insertions, 19 deletions
diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript index db6116c3c3..28a8ad5b5a 100644 --- a/gtk2_ardour/wscript +++ b/gtk2_ardour/wscript @@ -357,14 +357,17 @@ def build(bld): if bld.is_defined('WINDOWS_VST_SUPPORT'): # If we require VST support we build a stub main() and the FST library # here using winegcc, and link it to the GTK front-end library - obj = bld(features = 'cxx c cxxprogram wine') - obj.source = ''' - ../libs/fst/fst.c - ../libs/fst/fstinfofile.c - ../libs/fst/vsti.c - ../libs/fst/vstwin.c - ../vst/winmain.c - ''' + obj = bld (features = 'cxx c cxxprogram wine') + obj.source = ( + '../libs/fst/fst.c', + '../libs/fst/fstinfofile.c', + '../libs/fst/vsti.c', + '../libs/fst/vstwin.c', + '../vst/winmain.c', + ) + # + # XXX do we really need to explicitly link to all of these for the wine executable? + # obj.use = [ 'libpbd', 'libmidipp', 'libardour', @@ -390,19 +393,22 @@ def build(bld): obj.target = 'gtk2_ardour' else: # just the normal executable version of the GTK GUI - obj = bld(features = 'cxx c cxxprogram') + obj = bld (features = 'cxx c cxxprogram') obj.source = gtk2_ardour_sources obj.target = 'ardour-' + bld.env['VERSION'] obj.includes = ['.'] - obj.use = [ 'libpbd', - 'libardour', - 'libardour_cp', - 'libtimecode', - 'libmidipp', - 'libgtk2_ardour', - 'libgtkmm2ext', - 'libcanvas', - ] + + # at this point, "obj" refers to either the normal native executable + # OR the shared library built for use with wine on linux. + + obj.use = [ 'libpbd', + 'libardour', + 'libardour_cp', + 'libtimecode', + 'libmidipp', + 'libgtkmm2ext', + 'libcanvas', + ] # continue with setup of obj, which could be a shared library # or an executable. @@ -415,7 +421,7 @@ def build(bld): if bld.is_defined('USE_EXTERNAL_LIBS'): obj.uselib += ' TAGLIB' else: - obj.use.append('libtaglib') + obj.use += ('libtaglib') if sys.platform == 'darwin': obj.uselib += ' AUDIOUNITS OSX GTKOSX' obj.use += ' libappleutility' |