* got MIDI clock working really smoothly (29 frames until sync, ardour transport...

[ardour.git] / libs / surfaces / generic_midi / SConscript

diff --git a/libs/surfaces/generic_midi/SConscript b/libs/surfaces/generic_midi/SConscript
index f9c2de08f8da1be37234244a000aa8fdacf9cfdf..d4c9e92214adb1b8f6cb486ea204bd98e50ce0e5 100644 (file)
--- a/libs/surfaces/generic_midi/SConscript
+++ b/libs/surfaces/generic_midi/SConscript
@@ -6,7 +6,7 @@ import glob
 
 Import('env final_prefix install_prefix final_config_prefix libraries i18n')
 
-genericmidi = env.Copy()
+genericmidi = env.Clone()
 
 #
 # this defines the version number of libardour_genericmidi
@@ -30,17 +30,21 @@ genericmidi.Append(CCFLAGS="-D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOUR
 genericmidi.Append(CXXFLAGS="-DDATA_DIR=\\\""+final_prefix+"/share\\\"")
 genericmidi.Append(CXXFLAGS="-DCONFIG_DIR=\\\""+final_config_prefix+"\\\"")
 genericmidi.Append(CXXFLAGS="-DLOCALEDIR=\\\""+final_prefix+"/share/locale\\\"")
+genericmidi.Append(CPPPATH = libraries['jack'].get('CPPPATH', []))
 
 genericmidi.Merge ([
+       libraries['evoral'],
        libraries['ardour'],
        libraries['ardour_cp'],
+       libraries['sndfile'],
        libraries['midi++2'],
+       libraries['evoral'],
        libraries['pbd'],
        libraries['sigc2'],
        libraries['usb'],
        libraries['xml'],
-    libraries['glib2'],
-    libraries['glibmm2']
+       libraries['glib2'],
+       libraries['glibmm2']
        ])
 
 libardour_genericmidi = genericmidi.SharedLibrary('ardour_genericmidi', genericmidi_files)
@@ -50,7 +54,7 @@ Default(libardour_genericmidi)
 if env['NLS']:
        i18n (genericmidi, genericmidi_files, env)
              
-env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2/surfaces'), libardour_genericmidi))
+env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3', 'surfaces'), libardour_genericmidi))
 
 env.Alias('tarball', env.Distribute (env['DISTTREE'],
                                     [ 'SConscript' ] +