diff options
| author | John Emmas <johne53@tiscali.co.uk> | 2013-10-14 19:31:22 +0100 |
|---|---|---|
| committer | John Emmas <johne53@tiscali.co.uk> | 2013-10-14 19:31:22 +0100 |
| commit | e466ce40ad1ba591543020cb7c0aa15dbebef81e (patch) | |
| tree | f8e43560917a0a70c48d32ac171e828472cfd794 /libs/ardour/wscript | |
| parent | 4fac237fdcf025c5fd5aafe207113abd6abb469b (diff) | |
| parent | a901f28c6287ff99444d6a8afe67b71531a5f7d0 (diff) | |
Merge branch 'master' into windows+cc
Conflicts (hopefully resolved):
gtk2_ardour/ardour_ui.cc
Diffstat (limited to 'libs/ardour/wscript')
| -rw-r--r-- | libs/ardour/wscript | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/ardour/wscript b/libs/ardour/wscript index d0c8eeb877..39584c6390 100644 --- a/libs/ardour/wscript +++ b/libs/ardour/wscript @@ -402,7 +402,7 @@ def build(bld): # only build these common sources once testcommon = bld(features = 'cxx') testcommon.includes = obj.includes + ['test', '../pbd', '..'] - testcommon.source = ['test/test_globals.cc', 'test/testrunner.cc', 'test/test_needing_session.cc', + testcommon.source = ['test/testrunner.cc', 'test/test_needing_session.cc', 'test/test_common.cc', 'test/dummy_lxvst.cc', 'test/audio_region_test.cc', 'test/test_util.cc'] testcommon.uselib = ['CPPUNIT','SIGCPP','GLIBMM','GTHREAD', 'SAMPLERATE','XML','LRDF','COREAUDIO'] |