Browse Source

Get rid of $$qtlibrarytarget

This just mangles the library names for no good reason.
QGC4.4
Don Gagne 10 years ago
parent
commit
3a793264f5
  1. 22
      QGCApplication.pro
  2. 2
      QGCLocationPlugin.pro

22
QGCApplication.pro

@ -36,32 +36,14 @@ message(BASEDIR $$BASEDIR DESTDIR $$DESTDIR TARGET $$TARGET)
# QGC QtLocation plugin # QGC QtLocation plugin
LIBS += -L$${LOCATION_PLUGIN_DESTDIR} LIBS += -L$${LOCATION_PLUGIN_DESTDIR}
LIBS += -l$${LOCATION_PLUGIN_NAME}
LinuxBuild { LinuxBuild|MacBuild {
LIBS += -l$${LOCATION_PLUGIN_NAME}
PRE_TARGETDEPS += $${LOCATION_PLUGIN_DESTDIR}/lib$${LOCATION_PLUGIN_NAME}.a PRE_TARGETDEPS += $${LOCATION_PLUGIN_DESTDIR}/lib$${LOCATION_PLUGIN_NAME}.a
} }
WindowsBuild { WindowsBuild {
DebugBuild {
LIBS += -l$${LOCATION_PLUGIN_NAME}d
PRE_TARGETDEPS += $${LOCATION_PLUGIN_DESTDIR}/$${LOCATION_PLUGIN_NAME}d.lib
}
ReleaseBuild {
LIBS += -l$${LOCATION_PLUGIN_NAME}
PRE_TARGETDEPS += $${LOCATION_PLUGIN_DESTDIR}/$${LOCATION_PLUGIN_NAME}.lib PRE_TARGETDEPS += $${LOCATION_PLUGIN_DESTDIR}/$${LOCATION_PLUGIN_NAME}.lib
}
}
MacBuild {
DebugBuild {
LIBS += -l$${LOCATION_PLUGIN_NAME}_debug
PRE_TARGETDEPS += $${LOCATION_PLUGIN_DESTDIR}/lib$${LOCATION_PLUGIN_NAME}_debug.a
}
ReleaseBuild {
LIBS += -l$${LOCATION_PLUGIN_NAME}
PRE_TARGETDEPS += $${LOCATION_PLUGIN_DESTDIR}/lib$${LOCATION_PLUGIN_NAME}.a
}
} }
# Qt configuration # Qt configuration

2
QGCLocationPlugin.pro

@ -1,7 +1,7 @@
include(QGCCommon.pri) include(QGCCommon.pri)
TEMPLATE = lib TEMPLATE = lib
TARGET = $$qtLibraryTarget(QGeoServiceProviderFactoryQGC) TARGET = QGeoServiceProviderFactoryQGC
CONFIG += plugin static CONFIG += plugin static
QT += location-private positioning-private network QT += location-private positioning-private network
PLUGIN_TYPE = geoservices PLUGIN_TYPE = geoservices

Loading…
Cancel
Save