ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #216 from xsacha/soundtouch 

Fix case of 'soundtouch' instead of creating a symlink as a workaround.
This commit is contained in:
ramapcsx2 2014-08-13 21:53:35 +02:00
parent d247a79e48 2ae3dd970a
commit 707d32536c
52 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -40,7 +40,7 @@ Devel
/ipch /ipch
/nsis/output/ /nsis/output/
/3rdparty/SoundTouch/Win32 /3rdparty/soundtouch/Win32
/3rdparty/bzip2/Win32 /3rdparty/bzip2/Win32
/3rdparty/libjpeg/Win32 /3rdparty/libjpeg/Win32
/3rdparty/portaudio/portaudio-2.0.pc /3rdparty/portaudio/portaudio-2.0.pc

0
3rdparty/SoundTouch/3dnow_win.cpp → 3rdparty/soundtouch/3dnow_win.cpp vendored
View File

0
3rdparty/SoundTouch/AAFilter.cpp → 3rdparty/soundtouch/AAFilter.cpp vendored
View File

0
3rdparty/SoundTouch/AAFilter.h → 3rdparty/soundtouch/AAFilter.h vendored
View File

0
3rdparty/SoundTouch/BPMDetect.cpp → 3rdparty/soundtouch/BPMDetect.cpp vendored
View File

0
3rdparty/SoundTouch/BPMDetect.h → 3rdparty/soundtouch/BPMDetect.h vendored
View File

0
3rdparty/SoundTouch/CMakeLists.txt → 3rdparty/soundtouch/CMakeLists.txt vendored
View File

0
3rdparty/SoundTouch/FIFOSampleBuffer.cpp → 3rdparty/soundtouch/FIFOSampleBuffer.cpp vendored
View File

0
3rdparty/SoundTouch/FIFOSampleBuffer.h → 3rdparty/soundtouch/FIFOSampleBuffer.h vendored
View File

0
3rdparty/SoundTouch/FIFOSamplePipe.h → 3rdparty/soundtouch/FIFOSamplePipe.h vendored
View File

0
3rdparty/SoundTouch/FIRFilter.cpp → 3rdparty/soundtouch/FIRFilter.cpp vendored
View File

0
3rdparty/SoundTouch/FIRFilter.h → 3rdparty/soundtouch/FIRFilter.h vendored
View File

0
3rdparty/SoundTouch/Makefile.am → 3rdparty/soundtouch/Makefile.am vendored
View File

0
3rdparty/SoundTouch/PeakFinder.cpp → 3rdparty/soundtouch/PeakFinder.cpp vendored
View File

0
3rdparty/SoundTouch/PeakFinder.h → 3rdparty/soundtouch/PeakFinder.h vendored
View File

0
3rdparty/SoundTouch/README.html → 3rdparty/soundtouch/README.html vendored
View File

0
3rdparty/SoundTouch/RateTransposer.cpp → 3rdparty/soundtouch/RateTransposer.cpp vendored
View File

0
3rdparty/SoundTouch/RateTransposer.h → 3rdparty/soundtouch/RateTransposer.h vendored
View File

0
3rdparty/SoundTouch/STTypes.h → 3rdparty/soundtouch/STTypes.h vendored
View File

0
3rdparty/SoundTouch/SoundTouch.cpp → 3rdparty/soundtouch/SoundTouch.cpp vendored
View File

0
3rdparty/SoundTouch/SoundTouch.h → 3rdparty/soundtouch/SoundTouch.h vendored
View File

0
3rdparty/SoundTouch/SoundTouch.vcxproj → 3rdparty/soundtouch/SoundTouch.vcxproj vendored
View File

0
3rdparty/SoundTouch/SoundTouch.vcxproj.filters → 3rdparty/soundtouch/SoundTouch.vcxproj.filters vendored
View File

0
3rdparty/SoundTouch/SoundTouch_vs2012.vcxproj → 3rdparty/soundtouch/SoundTouch_vs2012.vcxproj vendored
View File

0
3rdparty/SoundTouch/SoundTouch_vs2012.vcxproj.filters → 3rdparty/soundtouch/SoundTouch_vs2012.vcxproj.filters vendored
View File

0
3rdparty/SoundTouch/SoundTouch_vs2013.vcxproj → 3rdparty/soundtouch/SoundTouch_vs2013.vcxproj vendored
View File

0
3rdparty/SoundTouch/SoundTouch_vs2013.vcxproj.filters → 3rdparty/soundtouch/SoundTouch_vs2013.vcxproj.filters vendored
View File

0
3rdparty/SoundTouch/TDStretch.cpp → 3rdparty/soundtouch/TDStretch.cpp vendored
View File

0
3rdparty/SoundTouch/TDStretch.h → 3rdparty/soundtouch/TDStretch.h vendored
View File

0
3rdparty/SoundTouch/WavFile.cpp → 3rdparty/soundtouch/WavFile.cpp vendored
View File

0
3rdparty/SoundTouch/WavFile.h → 3rdparty/soundtouch/WavFile.h vendored
View File

0
3rdparty/SoundTouch/build.sh → 3rdparty/soundtouch/build.sh vendored
View File

0
3rdparty/SoundTouch/configure.ac → 3rdparty/soundtouch/configure.ac vendored
View File

0
3rdparty/SoundTouch/cpu_detect.h → 3rdparty/soundtouch/cpu_detect.h vendored
View File

0
3rdparty/SoundTouch/cpu_detect_x86.cpp → 3rdparty/soundtouch/cpu_detect_x86.cpp vendored
View File

0
3rdparty/SoundTouch/cpu_detect_x86_gcc.cpp → 3rdparty/soundtouch/cpu_detect_x86_gcc.cpp vendored
View File

0
3rdparty/SoundTouch/cpu_detect_x86_win.cpp → 3rdparty/soundtouch/cpu_detect_x86_win.cpp vendored
View File

0
3rdparty/SoundTouch/depcomp → 3rdparty/soundtouch/depcomp vendored
View File

0
3rdparty/SoundTouch/install-sh → 3rdparty/soundtouch/install-sh vendored
View File

0
3rdparty/SoundTouch/missing → 3rdparty/soundtouch/missing vendored
View File

0
3rdparty/SoundTouch/mmx_optimized.cpp → 3rdparty/soundtouch/mmx_optimized.cpp vendored
View File

0
3rdparty/SoundTouch/soundtouch_config.h → 3rdparty/soundtouch/soundtouch_config.h vendored
View File

0
3rdparty/SoundTouch/sse_optimized.cpp → 3rdparty/soundtouch/sse_optimized.cpp vendored
View File

1
3rdparty/soundtouch_linux_include/soundtouch vendored
View File

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

2
pcsx2_suite_2010.sln
View File

@ -46,7 +46,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SPU2-X", "plugins\spu2-x\sr
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GSdx", "plugins\GSdx\GSdx.vcxproj", "{18E42F6F-3A62-41EE-B42F-79366C4F1E95}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GSdx", "plugins\GSdx\GSdx.vcxproj", "{18E42F6F-3A62-41EE-B42F-79366C4F1E95}"
EndProject 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 EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "3rdparty\zlib\zlib.vcxproj", "{2F6C0388-20CB-4242-9F6C-A6EBB6A83F47}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "3rdparty\zlib\zlib.vcxproj", "{2F6C0388-20CB-4242-9F6C-A6EBB6A83F47}"
EndProject EndProject

2
pcsx2_suite_2012.sln
View File

@ -46,7 +46,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SPU2-X", "plugins\spu2-x\sr
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GSdx", "plugins\GSdx\GSdx_vs2012.vcxproj", "{18E42F6F-3A62-41EE-B42F-79366C4F1E95}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GSdx", "plugins\GSdx\GSdx_vs2012.vcxproj", "{18E42F6F-3A62-41EE-B42F-79366C4F1E95}"
EndProject 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 EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "3rdparty\zlib\zlib_vs2012.vcxproj", "{2F6C0388-20CB-4242-9F6C-A6EBB6A83F47}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "3rdparty\zlib\zlib_vs2012.vcxproj", "{2F6C0388-20CB-4242-9F6C-A6EBB6A83F47}"
EndProject EndProject

2
pcsx2_suite_2013.sln
View File

@ -46,7 +46,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SPU2-X", "plugins\spu2-x\sr
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GSdx", "plugins\GSdx\GSdx_vs2013.vcxproj", "{18E42F6F-3A62-41EE-B42F-79366C4F1E95}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GSdx", "plugins\GSdx\GSdx_vs2013.vcxproj", "{18E42F6F-3A62-41EE-B42F-79366C4F1E95}"
EndProject 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 EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "3rdparty\zlib\zlib_vs2013.vcxproj", "{2F6C0388-20CB-4242-9F6C-A6EBB6A83F47}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "3rdparty\zlib\zlib_vs2013.vcxproj", "{2F6C0388-20CB-4242-9F6C-A6EBB6A83F47}"
EndProject EndProject

2
plugins/spu2-x/src/Windows/ConfigSoundtouch.cpp
View File

@ -18,7 +18,7 @@
#include "Global.h" #include "Global.h"
#include "Dialogs.h" #include "Dialogs.h"
#include "SoundTouch/SoundTouch.h" #include "soundtouch/SoundTouch.h"
static int SequenceLenMS = 30; static int SequenceLenMS = 30;
static int SeekWindowMS = 20; static int SeekWindowMS = 20;

2
plugins/spu2-x/src/Windows/Spu2-X.vcxproj
View File

@ -455,7 +455,7 @@
<Project>{0a18a071-125e-442f-aff7-a3f68abecf99}</Project> <Project>{0a18a071-125e-442f-aff7-a3f68abecf99}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly> <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\..\..\3rdparty\SoundTouch\SoundTouch.vcxproj"> <ProjectReference Include="..\..\..\..\3rdparty\soundtouch\SoundTouch.vcxproj">
<Project>{e9b51944-7e6d-4bcd-83f2-7bbd5a46182d}</Project> <Project>{e9b51944-7e6d-4bcd-83f2-7bbd5a46182d}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly> <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference> </ProjectReference>

2
plugins/spu2-x/src/Windows/Spu2-X_vs2012.vcxproj
View File

@ -453,7 +453,7 @@
<Project>{0a18a071-125e-442f-aff7-a3f68abecf99}</Project> <Project>{0a18a071-125e-442f-aff7-a3f68abecf99}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly> <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\..\..\3rdparty\SoundTouch\SoundTouch_vs2012.vcxproj"> <ProjectReference Include="..\..\..\..\3rdparty\soundtouch\SoundTouch_vs2012.vcxproj">
<Project>{e9b51944-7e6d-4bcd-83f2-7bbd5a46182d}</Project> <Project>{e9b51944-7e6d-4bcd-83f2-7bbd5a46182d}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly> <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference> </ProjectReference>

2
plugins/spu2-x/src/Windows/Spu2-X_vs2013.vcxproj
View File

@ -453,7 +453,7 @@
<Project>{0a18a071-125e-442f-aff7-a3f68abecf99}</Project> <Project>{0a18a071-125e-442f-aff7-a3f68abecf99}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly> <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\..\..\3rdparty\SoundTouch\SoundTouch_vs2013.vcxproj"> <ProjectReference Include="..\..\..\..\3rdparty\soundtouch\SoundTouch_vs2013.vcxproj">
<Project>{e9b51944-7e6d-4bcd-83f2-7bbd5a46182d}</Project> <Project>{e9b51944-7e6d-4bcd-83f2-7bbd5a46182d}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly> <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference> </ProjectReference>

4
plugins/zerospu2/build.sh
View File

@ -9,12 +9,12 @@ fi
if [ $# -gt 0 ] && [ $1 = "all" ] if [ $# -gt 0 ] && [ $1 = "all" ]
then then
cd ../../3rdparty/SoundTouch/ cd ../../3rdparty/soundtouch/
sh build.sh $@ sh build.sh $@
cd $curdir cd $curdir
rm libSoundTouch.a rm libSoundTouch.a
cp ../../3rdparty/SoundTouch/libSoundTouch.a ./ cp ../../3rdparty/soundtouch/libSoundTouch.a ./
echo ----------------- echo -----------------
echo Building ZeroSPU2 echo Building ZeroSPU2