Merge

6775f8f4 · pixhawk · 68bad099 · 6775f8f4 · 6775f8f4
Commit 6775f8f4 authored Nov 20, 2010 by pixhawk
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

qgroundcontrol.pri qgroundcontrol.pri +2 -0

qgroundcontrol.pro qgroundcontrol.pro +0 -1

No files found.
--- a/qgroundcontrol.pri
+++ b/qgroundcontrol.pri
@@ -113,6 +113,8 @@ linux-g++ {
        -lSDL \
        -lSDLmain

+QMAKE_CXXFLAGS += -Wl,-E
+
        #-lflite_cmu_us_rms \
        #-lflite_cmu_us_slt \
 }

--- a/qgroundcontrol.pro
+++ b/qgroundcontrol.pro
@@ -76,7 +76,6 @@ contains(MAVLINK_CONF, ualberta) {
 LIBS += -losg \
    -losgViewer \
    -losgEarth
-QMAKE_CXXFLAGS += -Wl,-E

 # }
 # Include general settings for MAVGround