TTS: Add TTS support when compiling with msvc.

4 files changed, 17 insertions, 9 deletions

diff --git a/backends/platform/sdl/win32/win32_wrapper.cpp b/backends/platform/sdl/win32/win32_wrapper.cpp
index 7efcb00aa1..844c6bad52 100644
--- a/backends/platform/sdl/win32/win32_wrapper.cpp
+++ b/backends/platform/sdl/win32/win32_wrapper.cpp
@@ -81,7 +81,7 @@ bool confirmWindowsVersion(int majorVersion, int minorVersion) {
 	return VerifyVersionInfoFunc(&versionInfo, VER_MAJORVERSION | VER_MINORVERSION, conditionMask);
 }
 
-wchar_t *ansiToUnicode(const char *s, uint codePage) {
+wchar_t *ansiToUnicode(const char *s, unsigned int codePage) {
 	DWORD size = MultiByteToWideChar(codePage, 0, s, -1, NULL, 0);
 
 	if (size > 0) {
@@ -93,7 +93,7 @@ wchar_t *ansiToUnicode(const char *s, uint codePage) {
 	return NULL;
 }
 
-char *unicodeToAnsi(const wchar_t *s, uint codePage) {
+char *unicodeToAnsi(const wchar_t *s, unsigned int codePage) {
 	DWORD size = WideCharToMultiByte(codePage, 0, s, -1, NULL, 0, 0, 0);
 
 	if (size > 0) {
@@ -105,7 +105,7 @@ char *unicodeToAnsi(const wchar_t *s, uint codePage) {
 	return NULL;
 }
 
-uint getCurrentCharset() {
+unsigned int getCurrentCharset() {
 #ifdef USE_TRANSLATION
 	Common::String charset = TransMan.getCurrentCharset();
 	if (charset == "iso-8859-2")
diff --git a/backends/platform/sdl/win32/win32_wrapper.h b/backends/platform/sdl/win32/win32_wrapper.h
index 8bd60239df..f2e16faeb2 100644
--- a/backends/platform/sdl/win32/win32_wrapper.h
+++ b/backends/platform/sdl/win32/win32_wrapper.h
@@ -45,7 +45,7 @@ bool confirmWindowsVersion(int majorVersion, int minorVersion);
  *
  * @note Return value must be freed by the caller.
  */
-wchar_t *ansiToUnicode(const char *s, uint codePage = CP_ACP);
+wchar_t *ansiToUnicode(const char *s, unsigned int codePage = CP_ACP);
 /**
  * Converts a Windows wide-character string into a C string.
  * Used to interact with Win32 Unicode APIs with no ANSI fallback.
@@ -55,9 +55,9 @@ wchar_t *ansiToUnicode(const char *s, uint codePage = CP_ACP);
  *
  * @note Return value must be freed by the caller.
  */
-char *unicodeToAnsi(const wchar_t *s, uint codePage = CP_ACP);
+char *unicodeToAnsi(const wchar_t *s, unsigned int codePage = CP_ACP);
 
-uint getCurrentCharset();
+unsigned int getCurrentCharset();
 
 }
 
diff --git a/backends/text-to-speech/windows/sphelper-scummvm.h b/backends/text-to-speech/windows/sphelper-scummvm.h
index d910a65f67..d622fda593 100644
--- a/backends/text-to-speech/windows/sphelper-scummvm.h
+++ b/backends/text-to-speech/windows/sphelper-scummvm.h
@@ -1371,7 +1371,7 @@ public:
     WAVEFORMATEX  * m_pCoMemWaveFormatEx; 
 
 
-    static CoMemCopyWFEX(const WAVEFORMATEX * pSrc, WAVEFORMATEX ** ppCoMemWFEX)
+    static HRESULT CoMemCopyWFEX(const WAVEFORMATEX * pSrc, WAVEFORMATEX ** ppCoMemWFEX)
     {
         ULONG cb = sizeof(WAVEFORMATEX) + pSrc->cbSize;
         *ppCoMemWFEX = (WAVEFORMATEX *)::CoTaskMemAlloc(cb);
diff --git a/devtools/create_project/create_project.cpp b/devtools/create_project/create_project.cpp
index 4f178c9cdd..9599aa04d4 100644
--- a/devtools/create_project/create_project.cpp
+++ b/devtools/create_project/create_project.cpp
@@ -390,7 +390,7 @@ int main(int argc, char *argv[]) {
 #endif
 	}
 
-	bool updatesEnabled = false, curlEnabled = false, sdlnetEnabled = false;
+	bool updatesEnabled = false, curlEnabled = false, sdlnetEnabled = false, ttsEnabled = false;
 	for (FeatureList::const_iterator i = setup.features.begin(); i != setup.features.end(); ++i) {
 		if (i->enable) {
 			if (!strcmp(i->name, "updates"))
@@ -399,6 +399,8 @@ int main(int argc, char *argv[]) {
 				curlEnabled = true;
 			else if (!strcmp(i->name, "sdlnet"))
 				sdlnetEnabled = true;
+			else if (!strcmp(i->name, "tts"))
+				ttsEnabled = true;
 		}
 	}
 
@@ -424,6 +426,11 @@ int main(int argc, char *argv[]) {
 		setup.libraries.push_back("winmm");
 	}
 
+	if (ttsEnabled) {
+		setup.libraries.push_back("sapi");
+		setup.defines.push_back("USE_WINDOWS_TTS");
+	}
+
 	setup.defines.push_back("SDL_BACKEND");
 	if (!setup.useSDL2) {
 		cout << "\nBuilding against SDL 1.2\n\n";
@@ -1088,7 +1095,8 @@ const Feature s_features[] = {
 	{         "dialogs",                "USE_SYSDIALOGS",  "", true,  "System dialogs support"},
 	{      "langdetect",                "USE_DETECTLANG",  "", true,  "System language detection support" }, // This feature actually depends on "translation", there
 	                                                                                                         // is just no current way of properly detecting this...
-	{    "text-console", "USE_TEXT_CONSOLE_FOR_DEBUGGER",  "", false, "Text console debugger" } // This feature is always applied in xcode projects
+	{    "text-console", "USE_TEXT_CONSOLE_FOR_DEBUGGER",  "", false, "Text console debugger" }, // This feature is always applied in xcode projects
+	{             "tts",                       "USE_TTS",  "", false, "Text to speech support"}
 };
 
 const Tool s_tools[] = {