Commit 85f38487 authored by pixhawk's avatar pixhawk

Minor changes

parent 6e80dbba
...@@ -45,8 +45,9 @@ UI_HEADERS_DIR = src/ui/generated ...@@ -45,8 +45,9 @@ UI_HEADERS_DIR = src/ui/generated
# Add external libraries # Add external libraries
INCLUDEPATH += $$BASEDIR/lib/flite/include \ INCLUDEPATH += $$BASEDIR/lib/SDL/include \
$$BASEDIR/lib/flite/lang $$BASEDIR/lib/flite/include \
$$BASEDIR/lib/flite/lang
#$$BASEDIR/lib/qextserialport/include #$$BASEDIR/lib/qextserialport/include
# $$BASEDIR/lib/openjaus/libjaus/include \ # $$BASEDIR/lib/openjaus/libjaus/include \
...@@ -64,8 +65,6 @@ macx { ...@@ -64,8 +65,6 @@ macx {
QT += phonon QT += phonon
DESTDIR = $$BASEDIR/bin/mac DESTDIR = $$BASEDIR/bin/mac
INCLUDEPATH += /opt/local/include/boost \
/opt/local/include/SDL
LIBS += -framework IOKit \ LIBS += -framework IOKit \
-L/opt/local/lib \ -L/opt/local/lib \
...@@ -77,7 +76,7 @@ macx { ...@@ -77,7 +76,7 @@ macx {
-lflite_usenglish \ -lflite_usenglish \
-lflite_cmulex \ -lflite_cmulex \
-lflite \ -lflite \
-L/opt/local/lib/SDL \ -L/lib/mac32/SDL \
-lSDL \ -lSDL \
-lSDLmain -lSDLmain
DEFINES += _TTY_POSIX_ DEFINES += _TTY_POSIX_
......
...@@ -87,7 +87,7 @@ Core::Core(int &argc, char* argv[]) : QApplication(argc, argv) ...@@ -87,7 +87,7 @@ Core::Core(int &argc, char* argv[]) : QApplication(argc, argv)
startUASManager(); startUASManager();
// Start audio output // Start audio output
GAudioOutput::instance()->say("Ground Control Station started", 1); //GAudioOutput::instance()->say("Ground Control Station started", 1);
//tarsus = new ViconTarsusProtocol(); //tarsus = new ViconTarsusProtocol();
//tarsus->start(); //tarsus->start();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment