TTS: Remove USE_PLATFORM_TTS defines

Use defined(USE_TTS) && defined(PLATFORM) instead

12 files changed, 29 insertions, 34 deletions

diff --git a/backends/module.mk b/backends/module.mk
index 11185fcf05..3fe829b42a 100644
--- a/backends/module.mk
+++ b/backends/module.mk
@@ -166,6 +166,12 @@ MODULE_OBJS += \
 	plugins/posix/posix-provider.o \
 	saves/posix/posix-saves.o \
 	taskbar/unity/unity-taskbar.o
+
+ifdef USE_TTS
+MODULE_OBJS += \
+	text-to-speech/linux/linux-text-to-speech.o
+endif
+
 endif
 
 ifdef MACOSX
@@ -176,6 +182,12 @@ MODULE_OBJS += \
 	midi/coremidi.o \
 	updates/macosx/macosx-updates.o \
 	taskbar/macosx/macosx-taskbar.o
+
+ifdef USE_TTS
+MODULE_OBJS += \
+	text-to-speech/macosx/macosx-text-to-speech.o
+endif
+
 endif
 
 ifdef WIN32
@@ -189,6 +201,12 @@ MODULE_OBJS += \
 	saves/windows/windows-saves.o \
 	updates/win32/win32-updates.o \
 	taskbar/win32/win32-taskbar.o
+
+ifdef USE_TTS
+MODULE_OBJS += \
+	text-to-speech/windows/windows-text-to-speech.o
+endif
+
 endif
 
 ifeq ($(BACKEND),android)
@@ -344,18 +362,5 @@ MODULE_OBJS += \
 	saves/recorder/recorder-saves.o
 endif
 
-ifdef USE_LINUX_TTS
-MODULE_OBJS += \
-	text-to-speech/linux/linux-text-to-speech.o
-endif
-ifdef USE_WINDOWS_TTS
-MODULE_OBJS += \
-	text-to-speech/windows/windows-text-to-speech.o
-endif
-ifdef USE_MACOSX_TTS
-MODULE_OBJS += \
-	text-to-speech/macosx/macosx-text-to-speech.o
-endif
-
 # Include common rules
 include $(srcdir)/rules.mk
diff --git a/backends/platform/sdl/macosx/macosx.cpp b/backends/platform/sdl/macosx/macosx.cpp
index 3cca69b4a5..1c47401c13 100644
--- a/backends/platform/sdl/macosx/macosx.cpp
+++ b/backends/platform/sdl/macosx/macosx.cpp
@@ -87,7 +87,7 @@ void OSystem_MacOSX::initBackend() {
 	_updateManager = new MacOSXUpdateManager();
 #endif
 
-#ifdef USE_MACOSX_TTS
+#ifdef USE_TTS
 	// Initialize Text to Speech manager
 	_textToSpeechManager = new MacOSXTextToSpeechManager();
 #endif
diff --git a/backends/platform/sdl/posix/posix.cpp b/backends/platform/sdl/posix/posix.cpp
index 50a1ccdc58..0b6c4d65ef 100644
--- a/backends/platform/sdl/posix/posix.cpp
+++ b/backends/platform/sdl/posix/posix.cpp
@@ -55,7 +55,7 @@
 #include <spawn.h>
 #endif
 
-#ifdef USE_LINUX_TTS
+#ifdef USE_TTS
 #include "backends/text-to-speech/linux/linux-text-to-speech.h"
 #endif
 extern char **environ;
@@ -83,7 +83,7 @@ void OSystem_POSIX::initBackend() {
 	if (_savefileManager == 0)
 		_savefileManager = new POSIXSaveFileManager();
 
-#ifdef USE_LINUX_TTS
+#ifdef USE_TTS
 	// Initialize Text to Speech manager
 	_textToSpeechManager = new LinuxTextToSpeechManager();
 #endif
diff --git a/backends/platform/sdl/win32/win32.cpp b/backends/platform/sdl/win32/win32.cpp
index 4328773c36..5f35d46d39 100644
--- a/backends/platform/sdl/win32/win32.cpp
+++ b/backends/platform/sdl/win32/win32.cpp
@@ -54,7 +54,7 @@
 #include "common/ustr.h"
 #include "common/encoding.h"
 
-#ifdef USE_WINDOWS_TTS
+#if defined(USE_TTS)
 #include "backends/text-to-speech/windows/windows-text-to-speech.h"
 #endif
 
@@ -121,7 +121,7 @@ void OSystem_Win32::initBackend() {
 #endif
 
 	// Initialize text to speech
-#ifdef USE_WINDOWS_TTS
+#ifdef USE_TTS
 	_textToSpeechManager = new WindowsTextToSpeechManager();
 #endif
 
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 eb864eb60e..31efb393e1 100644
--- a/backends/text-to-speech/linux/linux-text-to-speech.cpp
+++ b/backends/text-to-speech/linux/linux-text-to-speech.cpp
@@ -25,7 +25,7 @@
 
 #include "backends/text-to-speech/linux/linux-text-to-speech.h"
 
-#if defined(USE_LINUX_TTS)
+#if defined(USE_TTS) && defined(POSIX)
 #include <speech-dispatcher/libspeechd.h>
 #include "backends/platform/sdl/sdl-sys.h"
 
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 33135d29d9..db3e64dae8 100644
--- a/backends/text-to-speech/linux/linux-text-to-speech.h
+++ b/backends/text-to-speech/linux/linux-text-to-speech.h
@@ -25,7 +25,7 @@
 
 #include "common/scummsys.h"
 
-#if defined(USE_LINUX_TTS)
+#if defined(USE_TTS) && defined(POSIX)
 
 #include "common/text-to-speech.h"
 #include "common/str.h"
diff --git a/backends/text-to-speech/macosx/macosx-text-to-speech.h b/backends/text-to-speech/macosx/macosx-text-to-speech.h
index 9ed418dafa..40ea8083dc 100644
--- a/backends/text-to-speech/macosx/macosx-text-to-speech.h
+++ b/backends/text-to-speech/macosx/macosx-text-to-speech.h
@@ -25,7 +25,7 @@
 
 #include "common/scummsys.h"
 
-#if defined(USE_MACOSX_TTS)
+#if defined(USE_TTS) && defined(MACOSX)
 
 #include "common/text-to-speech.h"
 #include "common/queue.h"
diff --git a/backends/text-to-speech/macosx/macosx-text-to-speech.mm b/backends/text-to-speech/macosx/macosx-text-to-speech.mm
index 1e8a10e45b..72f56f91be 100644
--- a/backends/text-to-speech/macosx/macosx-text-to-speech.mm
+++ b/backends/text-to-speech/macosx/macosx-text-to-speech.mm
@@ -25,7 +25,7 @@
 
 #include "backends/text-to-speech/macosx/macosx-text-to-speech.h"
 
-#if defined(USE_MACOSX_TTS)
+#if defined(USE_TTS) && defined(MACOSX)
 #include "common/translation.h"
 #include <AppKit/NSSpeechSynthesizer.h>
 #include <Foundation/NSString.h>
diff --git a/backends/text-to-speech/windows/windows-text-to-speech.cpp b/backends/text-to-speech/windows/windows-text-to-speech.cpp
index 3ef4b55b74..b7d39f0286 100644
--- a/backends/text-to-speech/windows/windows-text-to-speech.cpp
+++ b/backends/text-to-speech/windows/windows-text-to-speech.cpp
@@ -25,7 +25,7 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
-#if defined(USE_WINDOWS_TTS)
+#if defined(USE_TTS) && defined(WIN32)
 #include <basetyps.h>
 #include <windows.h>
 #include <Servprov.h>
diff --git a/backends/text-to-speech/windows/windows-text-to-speech.h b/backends/text-to-speech/windows/windows-text-to-speech.h
index cc94107291..3e7c29ba35 100644
--- a/backends/text-to-speech/windows/windows-text-to-speech.h
+++ b/backends/text-to-speech/windows/windows-text-to-speech.h
@@ -25,7 +25,7 @@
 
 #include "common/scummsys.h"
 
-#if defined(USE_WINDOWS_TTS)
+#if defined(USE_TTS) && defined(WIN32)
 
 #include "common/text-to-speech.h"
 #include "common/str.h"
diff --git a/configure b/configure
index c0ef73be7f..8328626c3e 100755
--- a/configure
+++ b/configure
@@ -167,9 +167,6 @@ _libunity=auto
 _dialogs=auto
 _iconv=auto
 _tts=auto
-_linux_tts=no
-_windows_tts=no
-_macosx_tts=no
 # Default option behavior yes/no
 _debug_build=auto
 _release_build=auto
@@ -5407,22 +5404,16 @@ else
 	linux*)
 		echo "linux"
 		_tts=yes
-		_linux_tts=yes
-		define_in_config_if_yes $_linux_tts 'USE_LINUX_TTS'
 		append_var LIBS '-lspeechd'
 		;;
 	mingw*)
 		echo "win32"
 		_tts=yes
-		_windows_tts=yes
-		define_in_config_if_yes $_windows_tts 'USE_WINDOWS_TTS'
 		append_var LIBS '-lsapi -lole32'
 		;;
 	darwin*)
 		echo "osx"
 		_tts=yes
-		_macosx_tts=yes
-		define_in_config_if_yes $_macosx_tts 'USE_MACOSX_TTS'
 		;;
 	*)
 		echo "no"
diff --git a/devtools/create_project/create_project.cpp b/devtools/create_project/create_project.cpp
index 9599aa04d4..30f4164f1f 100644
--- a/devtools/create_project/create_project.cpp
+++ b/devtools/create_project/create_project.cpp
@@ -428,7 +428,6 @@ int main(int argc, char *argv[]) {
 
 	if (ttsEnabled) {
 		setup.libraries.push_back("sapi");
-		setup.defines.push_back("USE_WINDOWS_TTS");
 	}
 
 	setup.defines.push_back("SDL_BACKEND");