Merge branch 'master' into wii-network

Conflicts:
	Source/Core/Common/Src/CommonPaths.h
	Source/Core/Common/Src/FileUtil.h
	Source/Core/Core/Src/HLE/HLE.cpp
	Source/Core/Core/Src/PowerPC/Interpreter/Interpreter.cpp

CMakeLists.txt

@@ -302,7 +302,7 @@ else()
 	message("bluez NOT found, disabling bluetooth support")
 endif(BLUEZ_FOUND)
 
-check_lib(PULSEAUDIO libpulse QUIET)
+check_lib(PULSEAUDIO libpulse-simple QUIET)
 if(PULSEAUDIO_FOUND)
 	add_definitions(-DHAVE_PULSEAUDIO=1)
 	message("PulseAudio found, enabling PulseAudio sound backend")
@@ -420,6 +420,19 @@ else()
 	set(LZO lzo2)
 endif()
 
+if(OPENAL_FOUND)
+	if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+		check_lib(SOUNDTOUCH SoundTouch soundtouch/soundtouch.h QUIET)
+	endif()
+	if (SOUNDTOUCH_FOUND)
+		message("Using shared soundtouch")
+	else()
+		message("Using static soundtouch from Externals")
+		add_subdirectory(Externals/soundtouch)
+		include_directories(Externals)
+	endif()
+endif()
+
 if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 	include(FindSDL2 OPTIONAL)
 endif()