Merge pull request #216 from xsacha/soundtouch

Fix case of 'soundtouch' instead of creating a symlink as a workaround.

.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

3rdparty/soundtouch_linux_include/soundtouch

@@ -1 +0,0 @@
-../SoundTouch

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

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

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

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;

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>

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>

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>

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