From 1cae0cd167a6e62b395be56a17999f29b4938aaa Mon Sep 17 00:00:00 2001 From: Oleg Semyonov Date: Mon, 9 May 2011 20:09:00 +0300 Subject: [PATCH] OP-179: final fix (builds on Linux and Windows) --- .../src/libs/opmapcontrol/src/mapwidget/mapwidget.pro | 5 +++-- ground/openpilotgcs/src/libs/utils/utils.pri | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/mapwidget.pro b/ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/mapwidget.pro index 496d3b556..b2098fb78 100644 --- a/ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/mapwidget.pro +++ b/ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/mapwidget.pro @@ -3,8 +3,6 @@ TARGET = opmapwidget DEFINES += OPMAPWIDGET_LIBRARY include(../../../../openpilotgcslibrary.pri) -include(../../../utils/utils.pri) - # DESTDIR = ../build SOURCES += mapgraphicitem.cpp \ opmapwidget.cpp \ @@ -23,6 +21,9 @@ LIBS += -L../build \ -linternals \ -lcore +# order of linking matters +include(../../../utils/utils.pri) + POST_TARGETDEPS += ../build/libcore.a POST_TARGETDEPS += ../build/libinternals.a diff --git a/ground/openpilotgcs/src/libs/utils/utils.pri b/ground/openpilotgcs/src/libs/utils/utils.pri index dec80010f..572895636 100644 --- a/ground/openpilotgcs/src/libs/utils/utils.pri +++ b/ground/openpilotgcs/src/libs/utils/utils.pri @@ -1 +1 @@ -LIBS += -lcore -l$$qtLibraryTarget(Utils) +LIBS += -l$$qtLibraryTarget(Utils)