diff options
| author | Daniel Schürmann <daschuer@mixxx.org> | 2018-11-05 22:45:55 +0100 |
|---|---|---|
| committer | Daniel Schürmann <daschuer@mixxx.org> | 2018-11-05 22:45:55 +0100 |
| commit | 54261f3b8f3221578aa95c928ca5217852eeac9b (patch) | |
| tree | c1c88dca105dae05d09f0d6a2ccc21ed6525bb99 /SConscript | |
| parent | 4fbb87560e64aa77242f2d4fd79ed68ed6f95a99 (diff) | |
| parent | 6420867cc8a73d3845bf25d5b98babb142386da4 (diff) | |
Merge remote-tracking branch 'upstream/2.2'
Conflicts:
SConscript
src/defs_version.h
src/sources/soundsourceproxy.cpp
Diffstat (limited to 'SConscript')
| -rw-r--r-- | SConscript | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/SConscript b/SConscript index 2dc0d2a573..57be668e51 100644 --- a/SConscript +++ b/SConscript @@ -381,9 +381,8 @@ if build.platform_is_linux or build.platform_is_bsd: skins = env.Install(os.path.join(unix_share_path, 'mixxx', 'skins'), skin_files) fonts = env.Install(os.path.join(unix_share_path, 'mixxx', 'fonts'), font_files) vamp_plugin = env.Install( - os.path.join(unix_lib_path, 'mixxx', 'plugins', 'vamp'), - libmixxxminimal_vamp_plugin) - + os.path.join(unix_lib_path, 'mixxx', 'plugins', 'vampqt5'), + libmixxxminimal_vamp_plugin) controllermappings = env.Install(os.path.join(unix_share_path, 'mixxx', 'controllers'), controllermappings_files) translations = env.Install(os.path.join(unix_share_path, 'mixxx', 'translations'), translation_files) keyboardmappings = env.Install(os.path.join(unix_share_path, 'mixxx', 'keyboard'), keyboardmappings_files) |