diff --git a/qgroundcontrol.pri b/qgroundcontrol.pri index 4a2a17eed40ea8876ae83dd86cff311d1a8d1667..aa26f00d487a29a883f6b66d1767c4883bd13ba3 100644 --- a/qgroundcontrol.pri +++ b/qgroundcontrol.pri @@ -40,6 +40,10 @@ OBJECTS_DIR = $$BUILDDIR/obj MOC_DIR = $$BUILDDIR/moc UI_HEADERS_DIR = src/ui/generated +#$$BASEDIR/lib/qextserialport/include +# $$BASEDIR/lib/openjaus/libjaus/include \ +# $$BASEDIR/lib/openjaus/libopenJaus/include + message(Qt version $$[QT_VERSION]) @@ -128,8 +132,8 @@ win32 { LIBS += -L$$BASEDIR\lib\sdl\win32 \ -lmingw32 -lSDLmain -lSDL -mwindows - INCLUDEPATH += $$BASEDIR/lib/sdl/include \ - "C:\Program Files\Microsoft SDKs\Windows\v7.0\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 0eec50a055aa7e0095a0c3a38b29320d70b8081f..7be36f7f3773145bb7ea1762c05967599394e285 100644 --- a/src/GAudioOutput.cc +++ b/src/GAudioOutput.cc @@ -119,7 +119,7 @@ bool GAudioOutput::say(QString text, int severity) { // Speech synthesis is only supported with MSVC compiler -#if _MSC_VER +#ifdef _MSC_VER SpeechSynthesizer synth = new SpeechSynthesizer(); synth.SelectVoice("Microsoft Anna"); synth.SpeakText("Hello, world!");