Merge

15 years ago · 6775f8f4cb
2 changed files with 2 additions and 1 deletions
--- a/qgroundcontrol.pri
+++ b/qgroundcontrol.pri
@ -113,6 +113,8 @@ linux-g++ {
				@@ -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) {
				@@ -76,7 +76,6 @@ contains(MAVLINK_CONF, ualberta) {
 LIBS += -losg \
    -losgViewer \
    -losgEarth
-QMAKE_CXXFLAGS += -Wl,-E

 # }
 # Include general settings for MAVGround