Matthew Parlane
|
9de7611ff9
|
Merge branch 'master' into wii-network
Conflicts:
CMakeLists.txt
Source/Core/Core/Core.vcxproj
Source/Core/DolphinWX/Dolphin.vcxproj
Source/Core/DolphinWX/Dolphin.vcxproj.filters
Source/Dolphin_2010.sln
Source/VSProps/Dolphin.Win32.props
Source/VSProps/Dolphin.x64.props
|
2013-08-16 19:17:07 +12:00 |
|
Matthew Parlane
|
fede38985e
|
Replace OpenSSL with PolarSSL
Works on windows, not yet cmake.
|
2013-08-15 20:47:47 +12:00 |
|
Tetsuo55
|
0c9c3c9737
|
forgot to add free() to the previous malloc change
|
2013-06-23 00:14:45 +02:00 |
|
Tetsuo55
|
02351b77f9
|
replace alloca with malloc to fix windows builds
|
2013-06-22 22:44:27 +02:00 |
|
Tetsuo55
|
1bd80d781c
|
fix deb-x64 and osx-x64 builds after soundtouch update
|
2013-06-22 21:51:11 +02:00 |
|
Tetsuo55
|
d8f5ecf3ce
|
update soundtouch to svn revision 173
|
2013-06-22 20:19:27 +02:00 |
|
calc84maniac
|
a031351eb2
|
Use SOUNDTOUCH_INTEGER_SAMPLES only on Android build. Some audio backends (i.e. OpenAL) only support floating-point samples.
|
2013-05-07 23:22:28 -04:00 |
|
skidau
|
808eaf7c49
|
Fixed the Windows 32bit debug build.
|
2013-03-14 22:18:13 +11:00 |
|
skidau
|
6d4a566bc4
|
Changed SoundTouch to use float samples, allowing SSE to be used.
Made the DPL2 decoder disabled by default.
Re-added the audio hack used by the Accurate VBeam emulation option.
|
2013-01-15 22:29:26 +11:00 |
|
Ryan Houdek
|
01f4d9f386
|
Fix include paths and compiling in Linux. Externals soundtouch is 1.7.1, while Ubuntu 12.10 is 1.6.x. Externals soundtouch is compiled with integer samples, while ubuntu is compiled with float samples. Float samples is probably the more common route. If you're going to use soundtouch, you should probably use SAMPLETYPE instead of explicitly choosing short. This probably breaks the windows build since its includes aren't setup.
|
2013-01-09 10:26:12 -06:00 |
|