From 85f384879fd6bfeccd7df00ec0d7e24bcbd03143 Mon Sep 17 00:00:00 2001 From: pixhawk Date: Wed, 7 Apr 2010 12:28:52 +0200 Subject: [PATCH] Minor changes --- mavground.pri | 9 ++++----- src/Core.cc | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/mavground.pri b/mavground.pri index 6deb73b..13a97bc 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 19fa3a2..4e45c64 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();