From b97333d4b715013f37700c200fb1619da9225de8 Mon Sep 17 00:00:00 2001 From: Jaromir Wysoglad Date: Thu, 15 Aug 2019 15:30:30 +0200 Subject: TTS: Remove USE_PLATFORM_TTS defines Use defined(USE_TTS) && defined(PLATFORM) instead --- backends/text-to-speech/linux/linux-text-to-speech.cpp | 2 +- backends/text-to-speech/linux/linux-text-to-speech.h | 2 +- backends/text-to-speech/macosx/macosx-text-to-speech.h | 2 +- backends/text-to-speech/macosx/macosx-text-to-speech.mm | 2 +- backends/text-to-speech/windows/windows-text-to-speech.cpp | 2 +- backends/text-to-speech/windows/windows-text-to-speech.h | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'backends/text-to-speech') 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 #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 #include 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 #include #include 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" -- cgit v1.2.3