diff options
| author | Daniel Schürmann <daschuer@mixxx.org> | 2020-05-13 14:23:40 +0200 |
|---|---|---|
| committer | Daniel Schürmann <daschuer@mixxx.org> | 2020-05-13 14:23:40 +0200 |
| commit | 35fab6e42c29bc09e03d14802a5fdda5b57723ee (patch) | |
| tree | 3b891f2181b27369422c5f14a46f71b9278525b4 | |
| parent | 1a2970ba2d7d0028a4c6f9de9e4b32c20e3b90e3 (diff) | |
build libshout out of source tree
| -rw-r--r-- | build/features.py | 9 | ||||
| -rw-r--r-- | lib/libshout/SConscript | 6 |
2 files changed, 12 insertions, 3 deletions
diff --git a/build/features.py b/build/features.py index a956202ffb..7d5c76249f 100644 --- a/build/features.py +++ b/build/features.py @@ -859,6 +859,7 @@ class LiveBroadcasting(Feature): # Clone our main environment so we don't change any settings in the # Mixxx environment libshout_env = build.env.Clone() + libshout_env['LIB_OUTPUT'] = '#lib/libshout/lib' if build.toolchain_is_gnu: libshout_env.Append(CCFLAGS='-pthread') @@ -870,10 +871,14 @@ class LiveBroadcasting(Feature): env = libshout_env SCons.Export('env') SCons.Export('build') - env.SConscript(env.File('SConscript', libshout_dir)) + env.SConscript( + env.File('SConscript', libshout_dir), + variant_dir="lib/libshout2", + duplicate=0, + exports=['build']) build.env.Append(CPPPATH="#lib/libshout/include") - build.env.Append(LIBPATH=libshout_dir) + build.env.Append(LIBPATH='#lib/libshout/lib') build.env.Append(LIBS=['shout_mixxx', 'ogg', 'vorbis', 'theora', 'speex', 'ssl', 'crypto']) depends.Qt.uic(build)('preferences/dialog/dlgprefbroadcastdlg.ui') diff --git a/lib/libshout/SConscript b/lib/libshout/SConscript index 7502884e09..9d415a2d39 100644 --- a/lib/libshout/SConscript +++ b/lib/libshout/SConscript @@ -32,4 +32,8 @@ env.Append(CPPDEFINES='HAVE_CONFIG_H') env.Append(CPPPATH='src/common') env.Append(CPPPATH='include') -env.StaticLibrary(target='libshout_mixxx', source=libshout_sources) +libshout_mixxx = env.StaticLibrary(target='libshout_mixxx', source=libshout_sources) + +# Install the libraries if needed. +if 'LIB_OUTPUT' in env.Dictionary(): + env.Install('$LIB_OUTPUT', source=[libshout_mixxx]) |