fix errors in manual conflict resolution

[ardour.git] / libs / ardour / wscript

diff --git a/libs/ardour/wscript b/libs/ardour/wscript
index 260c334a3094aa31e3f711ab71dfa57823220fd0..85326e98f8cf2cef164dba85b4e98501df13bc38 100644 (file)
--- a/libs/ardour/wscript
+++ b/libs/ardour/wscript
@@ -119,6 +119,8 @@ libardour_sources = [
         'midi_port.cc',
         'midi_region.cc',
         'midi_ring_buffer.cc',
+        'midi_scene_change.cc',
+        'midi_scene_changer.cc',
         'midi_source.cc',
         'midi_state_tracker.cc',
         'midi_stretch.cc',
@@ -138,7 +140,6 @@ libardour_sources = [
         'panner_manager.cc',
         'panner_shell.cc',
         'pcm_utils.cc',
-        'pi_controller.cc',
         'playlist.cc',
         'playlist_factory.cc',
         'playlist_source.cc',
@@ -165,6 +166,7 @@ libardour_sources = [
         'route_group.cc',
         'route_group_member.cc',
         'rb_effect.cc',
+        'scene_change.cc',
         'search_paths.cc',
         'send.cc',
         'session.cc',
@@ -192,6 +194,7 @@ libardour_sources = [
         'sndfile_helpers.cc',
         'sndfileimportable.cc',
         'sndfilesource.cc',
+        'soundcloud_upload.cc',
         'source.cc',
         'source_factory.cc',
         'speakers.cc',
@@ -353,7 +356,7 @@ def build(bld):
         obj.use.extend(['librubberband', 'libltc_includes', 'libltc'])
 
     obj.vnum         = LIBARDOUR_LIB_VERSION
-    obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
+    obj.install_path = bld.env['LIBDIR']
     obj.defines      += [
         'PACKAGE="' + I18N_PACKAGE + '"',
         'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"',
@@ -377,7 +380,7 @@ def build(bld):
         obj.includes += [ '../fst' ]
         obj.defines += [ 'WINDOWS_VST_SUPPORT' ]
         if bld.env['build_target'] == 'mingw':
-            obj.source += [ '../fst/vstwin.c', '../fst/fst.c']
+            obj.source += [ '../fst/vstwin.c']
             obj.uselib += ['GDI32']
 
     if bld.is_defined('LXVST_SUPPORT'):
@@ -419,7 +422,7 @@ def build(bld):
         testcommon.uselib       = ['CPPUNIT','SIGCPP','GLIBMM','GTHREAD',
                                    'SAMPLERATE','XML','LRDF','COREAUDIO','TAGLIB','VAMPSDK','VAMPHOSTSDK','RUBBERBAND']
         testcommon.use          = ['libpbd','libmidipp','libevoral',
-                                   'libaudiographer','ardour']
+                                   'libaudiographer','libardour']
         if bld.is_defined('USE_EXTERNAL_LIBS'):
             testcommon.uselib.extend(['LIBLTC',])
         else:
@@ -499,7 +502,7 @@ def build(bld):
         session_load_tester.includes.append ('test')
         session_load_tester.uselib    = ['CPPUNIT','SIGCPP','GLIBMM','GTHREAD',
                              'SAMPLERATE','XML','LRDF','COREAUDIO']
-        session_load_tester.use       = ['libpbd','libmidipp','ardour']
+        session_load_tester.use       = ['libpbd','libmidipp','libardour']
         session_load_tester.name      = 'libardour-session-load-tester'
         session_load_tester.target    = 'load-session'
         session_load_tester.install_path = ''
@@ -532,7 +535,7 @@ def build(bld):
             profilingobj.includes.append ('test')
             profilingobj.uselib    = ['CPPUNIT','SIGCPP','GLIBMM','GTHREAD',
                              'SAMPLERATE','XML','LRDF','COREAUDIO']
-            profilingobj.use       = ['libpbd','libmidipp','ardour']
+            profilingobj.use       = ['libpbd','libmidipp','libardour']
             profilingobj.name      = 'libardour-profiling'
             profilingobj.target    = p
             profilingobj.install_path = ''
@@ -558,7 +561,7 @@ def create_ardour_test_program(bld, includes, name, target, sources):
     testobj.uselib       = ['CPPUNIT','SIGCPP','GLIBMM','GTHREAD',
                             'SAMPLERATE','XML','LRDF','COREAUDIO','TAGLIB','VAMPSDK','VAMPHOSTSDK','RUBBERBAND']
     testobj.use          = ['libpbd','libmidipp','libevoral',
-                            'libaudiographer','ardour','testcommon']
+                            'libaudiographer','libardour','testcommon']
     if bld.is_defined('USE_EXTERNAL_LIBS'):
         testobj.uselib.extend(['LIBLTC'])
     else:
@@ -567,7 +570,7 @@ def create_ardour_test_program(bld, includes, name, target, sources):
     testobj.name         = name
     testobj.target       = target
     # not sure about install path
-    testobj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
+    testobj.install_path = bld.env['LIBDIR']
     testobj.defines      = [
         'PACKAGE="libardour3test"',
         'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"',