[Scummvm-git-logs] scummvm master -> 9dd91d651c0b872b4c930751e50c35a32f4b154d

[digitall]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
9dd91d651c POSIX: Support building with TTS support on FreeBSD


Commit: 9dd91d651c0b872b4c930751e50c35a32f4b154d
    https://github.com/scummvm/scummvm/commit/9dd91d651c0b872b4c930751e50c35a32f4b154d
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2020-06-24T21:10:44+01:00

Commit Message:
POSIX: Support building with TTS support on FreeBSD

This fixes Trac #11347.

Changed paths:
    backends/text-to-speech/linux/linux-text-to-speech.cpp
    backends/text-to-speech/linux/linux-text-to-speech.h
    configure


diff --git a/backends/text-to-speech/linux/linux-text-to-speech.cpp b/backends/text-to-speech/linux/linux-text-to-speech.cpp
index b4a0d8c393..9d8ed8fd2c 100644
--- a/backends/text-to-speech/linux/linux-text-to-speech.cpp
+++ b/backends/text-to-speech/linux/linux-text-to-speech.cpp
@@ -33,7 +33,6 @@
 #include "common/ustr.h"
 #include "common/config-manager.h"
 #include "common/encoding.h"
-#include <pthread.h>
 
 SPDConnection *_connection;
 
diff --git a/backends/text-to-speech/linux/linux-text-to-speech.h b/backends/text-to-speech/linux/linux-text-to-speech.h
index c67e22aa74..0e0c8d2f4d 100644
--- a/backends/text-to-speech/linux/linux-text-to-speech.h
+++ b/backends/text-to-speech/linux/linux-text-to-speech.h
@@ -32,6 +32,8 @@
 #include "common/list.h"
 #include "common/mutex.h"
 
+#include <pthread.h>
+
 struct StartSpeechParams {
 	pthread_mutex_t *mutex;
 	Common::List<Common::String> *speechQueue;
diff --git a/configure b/configure
index fae3305788..2ac34a76f5 100755
--- a/configure
+++ b/configure
@@ -4375,7 +4375,7 @@ int main(void) { return 0; }
 EOF
 			cc_check -lsapi -lole32 && _tts=yes
 			;;
-		linux*)
+		linux* | freebsd*)
 			cat > $TMPC << EOF
 #include <speech-dispatcher/libspeechd.h>
 int main(void) { return 0; }
@@ -5697,8 +5697,8 @@ if test "$_tts" = "no"; then
 	echo "no"
 else
 	case $_host_os in
-	linux*)
-		echo "linux"
+	linux* | freebsd*)
+		echo "speech dispatcher"
 		_tts=yes
 		define_in_config_if_yes $_tts 'USE_SPEECH_DISPATCHER'
 		append_var LIBS '-lspeechd -lpthread'