Browse Source

Fixed windows compile error

QGC4.4
pixhawk 15 years ago
parent
commit
9ebf1449b5
  1. 8
      qgroundcontrol.pri
  2. 2
      src/GAudioOutput.cc

8
qgroundcontrol.pri

@ -40,6 +40,10 @@ OBJECTS_DIR = $$BUILDDIR/obj @@ -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 { @@ -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

2
src/GAudioOutput.cc

@ -119,7 +119,7 @@ bool GAudioOutput::say(QString text, int severity) @@ -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!");

Loading…
Cancel
Save