Commit 6775f8f4 authored by pixhawk's avatar pixhawk

Merge

parent 68bad099
...@@ -113,6 +113,8 @@ linux-g++ { ...@@ -113,6 +113,8 @@ linux-g++ {
-lSDL \ -lSDL \
-lSDLmain -lSDLmain
QMAKE_CXXFLAGS += -Wl,-E
#-lflite_cmu_us_rms \ #-lflite_cmu_us_rms \
#-lflite_cmu_us_slt \ #-lflite_cmu_us_slt \
} }
......
...@@ -76,7 +76,6 @@ contains(MAVLINK_CONF, ualberta) { ...@@ -76,7 +76,6 @@ contains(MAVLINK_CONF, ualberta) {
LIBS += -losg \ LIBS += -losg \
-losgViewer \ -losgViewer \
-losgEarth -losgEarth
QMAKE_CXXFLAGS += -Wl,-E
# } # }
# Include general settings for MAVGround # Include general settings for MAVGround
......
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