diff --git a/mavground.pri b/mavground.pri index 6deb73b1ca4a9ba762bea069e143270e205bcaaf..13a97bc9cf2fce316903833e2de64f75cdc4541d 100644 --- a/mavground.pri +++ b/mavground.pri @@ -45,8 +45,9 @@ UI_HEADERS_DIR = src/ui/generated # Add external libraries -INCLUDEPATH += $$BASEDIR/lib/flite/include \ - $$BASEDIR/lib/flite/lang +INCLUDEPATH += $$BASEDIR/lib/SDL/include \ + $$BASEDIR/lib/flite/include \ + $$BASEDIR/lib/flite/lang #$$BASEDIR/lib/qextserialport/include # $$BASEDIR/lib/openjaus/libjaus/include \ @@ -64,8 +65,6 @@ macx { QT += phonon DESTDIR = $$BASEDIR/bin/mac - INCLUDEPATH += /opt/local/include/boost \ - /opt/local/include/SDL LIBS += -framework IOKit \ -L/opt/local/lib \ @@ -77,7 +76,7 @@ macx { -lflite_usenglish \ -lflite_cmulex \ -lflite \ - -L/opt/local/lib/SDL \ + -L/lib/mac32/SDL \ -lSDL \ -lSDLmain DEFINES += _TTY_POSIX_ diff --git a/src/Core.cc b/src/Core.cc index 19fa3a2533d42685dd517c342595dc2cfe17e0cb..4e45c6464400c4cf9e51005f2b10775fc798ba81 100644 --- a/src/Core.cc +++ b/src/Core.cc @@ -87,7 +87,7 @@ Core::Core(int &argc, char* argv[]) : QApplication(argc, argv) startUASManager(); // Start audio output - GAudioOutput::instance()->say("Ground Control Station started", 1); + //GAudioOutput::instance()->say("Ground Control Station started", 1); //tarsus = new ViconTarsusProtocol(); //tarsus->start();