Commit 8f6561af authored by pixhawk's avatar pixhawk

Merge branch 'master' of pixhawk.ethz.ch:groundcontrol

parents 49c71137 9e707210
...@@ -132,7 +132,8 @@ win32 { ...@@ -132,7 +132,8 @@ win32 {
LIBS += -L$$BASEDIR\lib\sdl\win32 \ LIBS += -L$$BASEDIR\lib\sdl\win32 \
-lmingw32 -lSDLmain -lSDL -mwindows -lmingw32 -lSDLmain -lSDL -mwindows
INCLUDEPATH += $$BASEDIR/lib/sdl/include INCLUDEPATH += $$BASEDIR/lib/sdl/include \
"C:\Program Files\Microsoft SDKs\Windows\v7.0\Include"
debug { debug {
DESTDIR = $$BASEDIR/bin DESTDIR = $$BASEDIR/bin
......
...@@ -40,8 +40,9 @@ This file is part of the PIXHAWK project ...@@ -40,8 +40,9 @@ This file is part of the PIXHAWK project
#include <ApplicationServices/ApplicationServices.h> #include <ApplicationServices/ApplicationServices.h>
#endif #endif
#ifdef Q_OS_WINDOWS // Speech synthesis is only supported with MSVC compiler
#include <windows.h> #if _MSC_VER
#include <sapi.h>
using System; using System;
using System.Speech.Synthesis; using System.Speech.Synthesis;
#endif #endif
...@@ -117,7 +118,8 @@ bool GAudioOutput::say(QString text, int severity) ...@@ -117,7 +118,8 @@ bool GAudioOutput::say(QString text, int severity)
if (!emergency) if (!emergency)
{ {
#ifdef Q_OS_WINDOWS // Speech synthesis is only supported with MSVC compiler
#if _MSC_VER
SpeechSynthesizer synth = new SpeechSynthesizer(); SpeechSynthesizer synth = new SpeechSynthesizer();
synth.SelectVoice("Microsoft Anna"); synth.SelectVoice("Microsoft Anna");
synth.SpeakText("Hello, world!"); synth.SpeakText("Hello, world!");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment