-=== modified file 'mixxx/build/depends.py'
---- build/depends.py 2011-11-08 20:10:32 +0000
-+++ build/depends.py 2011-11-08 23:38:43 +0000
-@@ -222,33 +222,19 @@
- build.env.Append(CPPPATH="#lib/replaygain")
-
- class SoundTouch(Dependence):
-- SOUNDTOUCH_PATH = 'soundtouch-1.6.0'
-
- def sources(self, build):
-- sources = ['engine/enginebufferscalest.cpp',
-- '#lib/%s/SoundTouch.cpp' % self.SOUNDTOUCH_PATH,
-- '#lib/%s/TDStretch.cpp' % self.SOUNDTOUCH_PATH,
-- '#lib/%s/RateTransposer.cpp' % self.SOUNDTOUCH_PATH,
-- '#lib/%s/AAFilter.cpp' % self.SOUNDTOUCH_PATH,
-- '#lib/%s/FIFOSampleBuffer.cpp' % self.SOUNDTOUCH_PATH,
-- '#lib/%s/FIRFilter.cpp' % self.SOUNDTOUCH_PATH,
-- '#lib/%s/PeakFinder.cpp' % self.SOUNDTOUCH_PATH,
-- '#lib/%s/BPMDetect.cpp' % self.SOUNDTOUCH_PATH,
-- '#lib/%s/mmx_optimized.cpp' % self.SOUNDTOUCH_PATH,
-- '#lib/%s/sse_optimized.cpp' % self.SOUNDTOUCH_PATH,]
--
-- # 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_detection = '#lib/%s/cpu_detect_x86_win.cpp' if build.toolchain_is_msvs else '#lib/%s/cpu_detect_x86_gcc.cpp'
-- sources.append(cpu_detection % self.SOUNDTOUCH_PATH)
-+ sources = ['engine/enginebufferscalest.cpp']
- return sources
-
- def configure(self, build, conf):
- if build.platform_is_windows:
- # Regardless of the bitwidth, ST checks for WIN32
- build.env.Append(CPPDEFINES = 'WIN32')
-- build.env.Append(CPPPATH=['#lib/%s' % self.SOUNDTOUCH_PATH])
-+ if not conf.CheckLib(['SoundTouch','libSoundTouch']):
-+ raise Exception('Did not find libSoundTouch.a, libSoundTouch.lib, or the libSoundTouch development header files - exiting!')
-+ build.env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix', '/usr/local') + '/include/soundtouch'])
-+ build.env.Append(LIBS='SoundTouch')
-
- class TagLib(Dependence):
- def configure(self, build, conf):
-
+=== modified file 'mixxx/build/depends.py'\r
+--- build/depends.py 2012-03-12 05:23:47 +0000\r
++++ build/depends.py 2012-03-16 04:18:42 +0000\r
+@@ -218,34 +218,20 @@\r
+ build.env.Append(CPPPATH="#lib/replaygain")\r
+ \r
+ class SoundTouch(Dependence):\r
+- SOUNDTOUCH_PATH = 'soundtouch-1.6.0'\r
+ \r
+ def sources(self, build):\r
+- sources = ['engine/enginebufferscalest.cpp',\r
+- '#lib/%s/SoundTouch.cpp' % self.SOUNDTOUCH_PATH,\r
+- '#lib/%s/TDStretch.cpp' % self.SOUNDTOUCH_PATH,\r
+- '#lib/%s/RateTransposer.cpp' % self.SOUNDTOUCH_PATH,\r
+- '#lib/%s/AAFilter.cpp' % self.SOUNDTOUCH_PATH,\r
+- '#lib/%s/FIFOSampleBuffer.cpp' % self.SOUNDTOUCH_PATH,\r
+- '#lib/%s/FIRFilter.cpp' % self.SOUNDTOUCH_PATH,\r
+- '#lib/%s/PeakFinder.cpp' % self.SOUNDTOUCH_PATH,\r
+- '#lib/%s/BPMDetect.cpp' % self.SOUNDTOUCH_PATH,\r
+- '#lib/%s/mmx_optimized.cpp' % self.SOUNDTOUCH_PATH,\r
+- '#lib/%s/sse_optimized.cpp' % self.SOUNDTOUCH_PATH,]\r
+-\r
+- # SoundTouch CPU optimizations are only for x86\r
+- # architectures. SoundTouch automatically ignores these files when it is\r
+- # not being built for an architecture that supports them.\r
+- cpu_detection = '#lib/%s/cpu_detect_x86_win.cpp' if build.toolchain_is_msvs else \\r
+- '#lib/%s/cpu_detect_x86_gcc.cpp'\r
+- sources.append(cpu_detection % self.SOUNDTOUCH_PATH)\r
++ sources = ['engine/enginebufferscalest.cpp']\r
+ return sources\r
+ \r
+ def configure(self, build, conf):\r
+ if build.platform_is_windows:\r
+ # Regardless of the bitwidth, ST checks for WIN32\r
+ build.env.Append(CPPDEFINES = 'WIN32')\r
+- build.env.Append(CPPPATH=['#lib/%s' % self.SOUNDTOUCH_PATH])\r
++ if not conf.CheckLib(['SoundTouch','libSoundTouch']):\r
++ raise Exception('Did not find libSoundTouch.a, libSoundTouch.lib, or the libSoundTouch development header files - exiting!')\r
++ build.env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix', '/usr/local') + '/include/soundtouch'])\r
++ build.env.Append(LIBS='SoundTouch')\r
++\r
+ \r
+ class TagLib(Dependence):\r
+ def configure(self, build, conf):\r
+\r