Merge branch '2.3' of git@github.com:mixxxdj/mixxx.git into googletest-1.10.x

3 files changed, 0 insertions, 105 deletions

diff --git a/lib/benchmark/SConscript b/lib/benchmark/SConscript
deleted file mode 100644
index bcad8b1909..0000000000
--- a/lib/benchmark/SConscript
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/usr/bin/python2.4
-
-Import('build')
-Import('env')
-env = env.Clone()
-
-# Add include folder.
-env.Prepend(CPPPATH = ['./include'])
-
-# Since we're using C++11 we can use std::chrono and std::regex.
-env.Append(CPPDEFINES = 'HAVE_STD_REGEX')
-env.Append(CPPDEFINES = 'HAVE_STEADY_CLOCK')
-if build.compiler_is_clang:
-  env.Append(CPPDEFINES = 'HAVE_THREAD_SAFETY_ATTRIBUTES')
-
-# Sources used by base library and library that includes main.
-sources = [
-  "src/benchmark_api_internal.cc",
-  "src/benchmark_name.cc",
-  "src/benchmark_register.cc",
-  "src/benchmark_runner.cc",
-  "src/benchmark.cc",
-  "src/colorprint.cc",
-  "src/commandlineflags.cc",
-  "src/complexity.cc",
-  "src/console_reporter.cc",
-  "src/counter.cc",
-  "src/csv_reporter.cc",
-  "src/json_reporter.cc",
-  "src/reporter.cc",
-  "src/sleep.cc",
-  "src/statistics.cc",
-  "src/string_util.cc",
-  "src/sysinfo.cc",
-  "src/timers.cc"
-]
-
-benchmark_lib = env.StaticLibrary(target='benchmark',
-                                  source=[sources])
diff --git a/lib/libshout/SConscript b/lib/libshout/SConscript
deleted file mode 100644
index 9d415a2d39..0000000000
--- a/lib/libshout/SConscript
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/usr/bin/env python
-
-Import('env')
-env = env.Clone()
-
-libshout_sources = [
-  'src/common/avl/avl.c',
-  'src/common/net/sock.c',
-  'src/common/net/resolver.c',
-  'src/common/timing/timing.c',
-  'src/common/httpp/httpp.c',
-  'src/common/httpp/encoding.c',
-  'src/common/thread/thread.c',
-  'src/shout.c',
-  'src/util.c',
-  'src/queue.c',
-  'src/proto_http.c',
-  'src/proto_xaudiocast.c',
-  'src/proto_icy.c',
-  'src/proto_roaraudio.c',
-  'src/format_ogg.c',
-  'src/format_webm.c',
-  'src/format_mp3.c',
-  'src/codec_vorbis.c',
-  'src/codec_opus.c',
-  'src/codec_theora.c',
-  'src/codec_speex.c',
-  'src/tls.c'
-]
-
-env.Append(CPPDEFINES='HAVE_CONFIG_H')
-env.Append(CPPPATH='src/common')
-env.Append(CPPPATH='include')
-
-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])
diff --git a/lib/soundtouch/SConscript b/lib/soundtouch/SConscript
deleted file mode 100644
index 1df1e68b28..0000000000
--- a/lib/soundtouch/SConscript
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/usr/bin/env python
-
-Import('env')
-env = env.Clone()
-
-soundtouch_sources = [
-  'AAFilter.cpp',
-  'BPMDetect.cpp',
-  'FIFOSampleBuffer.cpp',
-  'FIRFilter.cpp',
-  'InterpolateCubic.cpp',
-  'InterpolateLinear.cpp',
-  'InterpolateShannon.cpp',
-  'PeakFinder.cpp',
-  'RateTransposer.cpp',
-  'SoundTouch.cpp',
-  'TDStretch.cpp',
-  # SoundTouch CPU optimizations are only for x86
-  # architectures. SoundTouch automatically ignores these files
-  # when it is not being built for an architecture that supports
-  # them.
-  'cpu_detect_x86.cpp',
-  'mmx_optimized.cpp',
-  'sse_optimized.cpp',
-]
-
-env.StaticLibrary(target='soundtouch', source=soundtouch_sources)