From 2075abda52fde0cd44ef5f9b59abe74e2b8aa0ab Mon Sep 17 00:00:00 2001 From: pixhawk Date: Mon, 12 Apr 2010 19:17:57 +0200 Subject: [PATCH] Working on windows audio --- mavground.pri | 3 ++- src/GAudioOutput.cc | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/mavground.pri b/mavground.pri index 0360d428c..5ee7c67e4 100644 --- a/mavground.pri +++ b/mavground.pri @@ -135,7 +135,8 @@ win32 { LIBS += -L$$BASEDIR\lib\sdl\win32 \ -lmingw32 -lSDLmain -lSDL -mwindows - INCLUDEPATH += $$BASEDIR/lib/sdl/include + INCLUDEPATH += $$BASEDIR/lib/sdl/include \ + C:\Program Files\Microsoft SDKs\Windows\v7.0\Include debug { DESTDIR = $$BASEDIR/bin diff --git a/src/GAudioOutput.cc b/src/GAudioOutput.cc index cac132a52..4fff01198 100644 --- a/src/GAudioOutput.cc +++ b/src/GAudioOutput.cc @@ -40,8 +40,9 @@ This file is part of the PIXHAWK project #include #endif -#ifdef Q_OS_WINDOWS -#include +#ifdef _WIN32 +//#include +#include using System; using System.Speech.Synthesis; #endif @@ -117,7 +118,7 @@ bool GAudioOutput::say(QString text, int severity) if (!emergency) { -#ifdef Q_OS_WINDOWS +#ifdef _WIN32 SpeechSynthesizer synth = new SpeechSynthesizer(); synth.SelectVoice("Microsoft Anna"); synth.SpeakText("Hello, world!"); -- 2.22.0