Merge pull request #216 from xsacha/soundtouch

Fix case of 'soundtouch' instead of creating a symlink as a workaround.
2014-08-13 21:53:35 +02:00 · 2014-08-13 21:53:35 +02:00 · 707d32536c
parent d247a79e48 2ae3dd970a
commit 707d32536c
52 changed files with 13 additions and 14 deletions
--- a/.gitignore
+++ b/.gitignore
@ -40,7 +40,7 @@ Devel
 /ipch
 /nsis/output/

-/3rdparty/SoundTouch/Win32
+/3rdparty/soundtouch/Win32
 /3rdparty/bzip2/Win32
 /3rdparty/libjpeg/Win32
 /3rdparty/portaudio/portaudio-2.0.pc
--- a/3rdparty/soundtouch/3dnow_win.cpp
+++ b/3rdparty/soundtouch/3dnow_win.cpp
--- a/3rdparty/soundtouch/AAFilter.cpp
+++ b/3rdparty/soundtouch/AAFilter.cpp
--- a/3rdparty/soundtouch/AAFilter.h
+++ b/3rdparty/soundtouch/AAFilter.h
--- a/3rdparty/soundtouch/BPMDetect.cpp
+++ b/3rdparty/soundtouch/BPMDetect.cpp
--- a/3rdparty/soundtouch/BPMDetect.h
+++ b/3rdparty/soundtouch/BPMDetect.h
--- a/3rdparty/soundtouch/CMakeLists.txt
+++ b/3rdparty/soundtouch/CMakeLists.txt
--- a/3rdparty/soundtouch/FIFOSampleBuffer.cpp
+++ b/3rdparty/soundtouch/FIFOSampleBuffer.cpp
--- a/3rdparty/soundtouch/FIFOSampleBuffer.h
+++ b/3rdparty/soundtouch/FIFOSampleBuffer.h
--- a/3rdparty/soundtouch/FIFOSamplePipe.h
+++ b/3rdparty/soundtouch/FIFOSamplePipe.h
--- a/3rdparty/soundtouch/FIRFilter.cpp
+++ b/3rdparty/soundtouch/FIRFilter.cpp
--- a/3rdparty/soundtouch/FIRFilter.h
+++ b/3rdparty/soundtouch/FIRFilter.h
--- a/3rdparty/soundtouch/Makefile.am
+++ b/3rdparty/soundtouch/Makefile.am
--- a/3rdparty/soundtouch/PeakFinder.cpp
+++ b/3rdparty/soundtouch/PeakFinder.cpp
--- a/3rdparty/soundtouch/PeakFinder.h
+++ b/3rdparty/soundtouch/PeakFinder.h
--- a/3rdparty/soundtouch/README.html
+++ b/3rdparty/soundtouch/README.html
--- a/3rdparty/soundtouch/RateTransposer.cpp
+++ b/3rdparty/soundtouch/RateTransposer.cpp
--- a/3rdparty/soundtouch/RateTransposer.h
+++ b/3rdparty/soundtouch/RateTransposer.h
--- a/3rdparty/soundtouch/STTypes.h
+++ b/3rdparty/soundtouch/STTypes.h
--- a/3rdparty/soundtouch/SoundTouch.cpp
+++ b/3rdparty/soundtouch/SoundTouch.cpp
--- a/3rdparty/soundtouch/SoundTouch.h
+++ b/3rdparty/soundtouch/SoundTouch.h
--- a/3rdparty/soundtouch/SoundTouch.vcxproj
+++ b/3rdparty/soundtouch/SoundTouch.vcxproj
--- a/3rdparty/soundtouch/SoundTouch.vcxproj.filters
+++ b/3rdparty/soundtouch/SoundTouch.vcxproj.filters
--- a/3rdparty/soundtouch/SoundTouch_vs2012.vcxproj
+++ b/3rdparty/soundtouch/SoundTouch_vs2012.vcxproj
--- a/3rdparty/soundtouch/SoundTouch_vs2012.vcxproj.filters
+++ b/3rdparty/soundtouch/SoundTouch_vs2012.vcxproj.filters
--- a/3rdparty/soundtouch/SoundTouch_vs2013.vcxproj
+++ b/3rdparty/soundtouch/SoundTouch_vs2013.vcxproj
--- a/3rdparty/soundtouch/SoundTouch_vs2013.vcxproj.filters
+++ b/3rdparty/soundtouch/SoundTouch_vs2013.vcxproj.filters
--- a/3rdparty/soundtouch/TDStretch.cpp
+++ b/3rdparty/soundtouch/TDStretch.cpp
--- a/3rdparty/soundtouch/TDStretch.h
+++ b/3rdparty/soundtouch/TDStretch.h
--- a/3rdparty/soundtouch/WavFile.cpp
+++ b/3rdparty/soundtouch/WavFile.cpp
--- a/3rdparty/soundtouch/WavFile.h
+++ b/3rdparty/soundtouch/WavFile.h
--- a/3rdparty/soundtouch/build.sh
+++ b/3rdparty/soundtouch/build.sh
--- a/3rdparty/soundtouch/configure.ac
+++ b/3rdparty/soundtouch/configure.ac
--- a/3rdparty/soundtouch/cpu_detect.h
+++ b/3rdparty/soundtouch/cpu_detect.h
--- a/3rdparty/soundtouch/cpu_detect_x86.cpp
+++ b/3rdparty/soundtouch/cpu_detect_x86.cpp
--- a/3rdparty/soundtouch/cpu_detect_x86_gcc.cpp
+++ b/3rdparty/soundtouch/cpu_detect_x86_gcc.cpp
--- a/3rdparty/soundtouch/cpu_detect_x86_win.cpp
+++ b/3rdparty/soundtouch/cpu_detect_x86_win.cpp
--- a/3rdparty/soundtouch/depcomp
+++ b/3rdparty/soundtouch/depcomp
--- a/3rdparty/soundtouch/install-sh
+++ b/3rdparty/soundtouch/install-sh
--- a/3rdparty/soundtouch/missing
+++ b/3rdparty/soundtouch/missing
--- a/3rdparty/soundtouch/mmx_optimized.cpp
+++ b/3rdparty/soundtouch/mmx_optimized.cpp
--- a/3rdparty/soundtouch/soundtouch_config.h
+++ b/3rdparty/soundtouch/soundtouch_config.h
--- a/3rdparty/soundtouch/sse_optimized.cpp
+++ b/3rdparty/soundtouch/sse_optimized.cpp
--- a/3rdparty/soundtouch_linux_include/soundtouch
+++ b/3rdparty/soundtouch_linux_include/soundtouch
@ -1 +0,0 @@
-../SoundTouch
--- a/pcsx2_suite_2010.sln
+++ b/pcsx2_suite_2010.sln
@ -46,7 +46,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SPU2-X", "plugins\spu2-x\sr
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GSdx", "plugins\GSdx\GSdx.vcxproj", "{18E42F6F-3A62-41EE-B42F-79366C4F1E95}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SoundTouch", "3rdparty\SoundTouch\SoundTouch.vcxproj", "{E9B51944-7E6D-4BCD-83F2-7BBD5A46182D}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SoundTouch", "3rdparty\soundtouch\SoundTouch.vcxproj", "{E9B51944-7E6D-4BCD-83F2-7BBD5A46182D}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "3rdparty\zlib\zlib.vcxproj", "{2F6C0388-20CB-4242-9F6C-A6EBB6A83F47}"
 EndProject
--- a/pcsx2_suite_2012.sln
+++ b/pcsx2_suite_2012.sln
@ -46,7 +46,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SPU2-X", "plugins\spu2-x\sr
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GSdx", "plugins\GSdx\GSdx_vs2012.vcxproj", "{18E42F6F-3A62-41EE-B42F-79366C4F1E95}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SoundTouch", "3rdparty\SoundTouch\SoundTouch_vs2012.vcxproj", "{E9B51944-7E6D-4BCD-83F2-7BBD5A46182D}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SoundTouch", "3rdparty\soundtouch\SoundTouch_vs2012.vcxproj", "{E9B51944-7E6D-4BCD-83F2-7BBD5A46182D}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "3rdparty\zlib\zlib_vs2012.vcxproj", "{2F6C0388-20CB-4242-9F6C-A6EBB6A83F47}"
 EndProject
--- a/pcsx2_suite_2013.sln
+++ b/pcsx2_suite_2013.sln
@ -46,7 +46,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SPU2-X", "plugins\spu2-x\sr
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GSdx", "plugins\GSdx\GSdx_vs2013.vcxproj", "{18E42F6F-3A62-41EE-B42F-79366C4F1E95}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SoundTouch", "3rdparty\SoundTouch\SoundTouch_vs2013.vcxproj", "{E9B51944-7E6D-4BCD-83F2-7BBD5A46182D}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SoundTouch", "3rdparty\soundtouch\SoundTouch_vs2013.vcxproj", "{E9B51944-7E6D-4BCD-83F2-7BBD5A46182D}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "3rdparty\zlib\zlib_vs2013.vcxproj", "{2F6C0388-20CB-4242-9F6C-A6EBB6A83F47}"
 EndProject
--- a/plugins/spu2-x/src/Windows/ConfigSoundtouch.cpp
+++ b/plugins/spu2-x/src/Windows/ConfigSoundtouch.cpp
@ -18,7 +18,7 @@
 #include "Global.h"
 #include "Dialogs.h"

-#include "SoundTouch/SoundTouch.h"
+#include "soundtouch/SoundTouch.h"

 static int SequenceLenMS = 30;
 static int SeekWindowMS = 20;
--- a/plugins/spu2-x/src/Windows/Spu2-X.vcxproj
+++ b/plugins/spu2-x/src/Windows/Spu2-X.vcxproj
@ -455,7 +455,7 @@
      <Project>{0a18a071-125e-442f-aff7-a3f68abecf99}</Project>
      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\3rdparty\SoundTouch\SoundTouch.vcxproj">
+    <ProjectReference Include="..\..\..\..\3rdparty\soundtouch\SoundTouch.vcxproj">
      <Project>{e9b51944-7e6d-4bcd-83f2-7bbd5a46182d}</Project>
      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
    </ProjectReference>
@ -499,4 +499,4 @@
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
  </ImportGroup>
-</Project>
+</Project>
--- a/plugins/spu2-x/src/Windows/Spu2-X_vs2012.vcxproj
+++ b/plugins/spu2-x/src/Windows/Spu2-X_vs2012.vcxproj
@ -453,7 +453,7 @@
      <Project>{0a18a071-125e-442f-aff7-a3f68abecf99}</Project>
      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\3rdparty\SoundTouch\SoundTouch_vs2012.vcxproj">
+    <ProjectReference Include="..\..\..\..\3rdparty\soundtouch\SoundTouch_vs2012.vcxproj">
      <Project>{e9b51944-7e6d-4bcd-83f2-7bbd5a46182d}</Project>
      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
    </ProjectReference>
@ -497,4 +497,4 @@
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
  </ImportGroup>
-</Project>
+</Project>
--- a/plugins/spu2-x/src/Windows/Spu2-X_vs2013.vcxproj
+++ b/plugins/spu2-x/src/Windows/Spu2-X_vs2013.vcxproj
@ -453,7 +453,7 @@
      <Project>{0a18a071-125e-442f-aff7-a3f68abecf99}</Project>
      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\3rdparty\SoundTouch\SoundTouch_vs2013.vcxproj">
+    <ProjectReference Include="..\..\..\..\3rdparty\soundtouch\SoundTouch_vs2013.vcxproj">
      <Project>{e9b51944-7e6d-4bcd-83f2-7bbd5a46182d}</Project>
      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
    </ProjectReference>
@ -497,4 +497,4 @@
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
  </ImportGroup>
-</Project>
+</Project>
--- a/plugins/zerospu2/build.sh
+++ b/plugins/zerospu2/build.sh
@ -9,12 +9,12 @@ fi
 if [ $# -gt 0 ] && [ $1 = "all" ]
 then

-cd ../../3rdparty/SoundTouch/
+cd ../../3rdparty/soundtouch/
 sh build.sh $@
 cd $curdir

 rm libSoundTouch.a
-cp ../../3rdparty/SoundTouch/libSoundTouch.a ./
+cp ../../3rdparty/soundtouch/libSoundTouch.a ./

 echo -----------------
 echo Building ZeroSPU2