Revert "Revert change for opmaplib, causes linking problems on Windows."

This reverts commit 822017953e35fd4af656fd8f3ce8bff92c309dad
and fixes it to work on Windows too.

ground/openpilotgcs/src/libs/opmapcontrol/src/common.pri

@@ -7,3 +7,4 @@ TEMPLATE = lib
 UI_DIR = uics
 MOC_DIR = mocs
 OBJECTS_DIR = objs
+INCLUDEPATH +=../../../../libs/

ground/openpilotgcs/src/libs/opmapcontrol/src/core/cache.cpp

@@ -25,6 +25,7 @@
 * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 #include "cache.h"
+#include "utils/pathutils.h"
 #include <QSettings>
 
 namespace core {
@@ -53,11 +54,7 @@ namespace core {
     {
         if(cache.isNull()|cache.isEmpty())
         {
-            QSettings set(QSettings::IniFormat, QSettings::UserScope,QLatin1String("OpenPilot"), QLatin1String("OpenPilotGCS"));
-            QDir dir(set.fileName());
-            QFileInfo f(dir.absolutePath());
-            f.dir().absolutePath();
-            cache=f.dir().absolutePath()+QDir::separator()+"mapscache"+QDir::separator();
+            cache= Utils::PathUtils().GetStoragePath()+"mapscache"+QDir::separator();
             setCacheLocation(cache);
         }
     }

ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/mapwidget.pro

@@ -3,6 +3,8 @@ TARGET = opmapwidget
 DEFINES += OPMAPWIDGET_LIBRARY
 include(../../../../openpilotgcslibrary.pri)
 
+include(../../../utils/utils.pri)
+
 # DESTDIR = ../build
 SOURCES += mapgraphicitem.cpp \
     opmapwidget.cpp \
@@ -15,6 +17,7 @@ SOURCES += mapgraphicitem.cpp \
     mapripform.cpp \
     mapripper.cpp \
     traillineitem.cpp
+
 LIBS += -L../build \
     -lcore \
     -linternals \

ground/openpilotgcs/src/libs/utils/utils.pri

@@ -1 +1 @@
-LIBS *= -l$$qtLibraryTarget(Utils)
+LIBS += -lcore -l$$qtLibraryTarget(Utils)