diff options
| author | John Emmas <johne53@tiscali.co.uk> | 2013-09-21 09:17:25 +0100 |
|---|---|---|
| committer | John Emmas <johne53@tiscali.co.uk> | 2013-09-21 09:17:25 +0100 |
| commit | 19bb2b33a89a1291451f0740739a36daebe00bae (patch) | |
| tree | d0cafb4792ec4ff61d04d16c1e86199b2714a36f /wscript | |
| parent | 66aa6dfc8ecdb7591768bc45866a8c2b0d77e767 (diff) | |
| parent | fd23ebd0886cd61f8ee68d52d6576d00a16c9032 (diff) | |
Merge remote-tracking branch 'remotes/origin/cairocanvas' into windows
Conflicts (hopefully resolved):
gtk2_ardour/marker.cc
gtk2_ardour/midi_region_view.h
gtk2_ardour/region_gain_line.h
gtk2_ardour/utils.cc
gtk2_ardour/video_image_frame.cc
gtk2_ardour/wscript
libs/backends/jack/wscript
Diffstat (limited to 'wscript')
| -rw-r--r-- | wscript | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -34,6 +34,7 @@ children = [ 'libs/ardour', 'libs/gtkmm2ext', 'libs/audiographer', + 'libs/canvas', 'gtk2_ardour', 'export', 'midi_maps', @@ -378,6 +379,8 @@ def set_compiler_flags (conf,opt): conf.env.append_value('CXXFLAGS', '-D__STDC_LIMIT_MACROS') conf.env.append_value('CXXFLAGS', '-D__STDC_FORMAT_MACROS') + conf.env.append_value('CXXFLAGS', '-DCANVAS_COMPATIBILITY') + conf.env.append_value('CXXFLAGS', '-DCANVAS_DEBUG') if opt.nls: conf.env.append_value('CXXFLAGS', '-DENABLE_NLS') |