mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2024-12-01 09:24:10 +01:00
Merge remote-tracking branch 'dev/OP-1681_rvonlehe_GCS_windows_debug_build' into next
This commit is contained in:
commit
1d2b28202e
@ -19,8 +19,6 @@ include( $${QWT_ROOT}/qwtconfig.pri )
|
||||
# include( $${QWT_ROOT}/qwtbuild.pri )
|
||||
# include( $${QWT_ROOT}/qwtfunctions.pri )
|
||||
|
||||
include(../../../openpilotgcslibrary.pri)
|
||||
|
||||
# QWT_OUT_ROOT = $${OUT_PWD}/..
|
||||
|
||||
TEMPLATE = lib
|
||||
@ -31,6 +29,12 @@ DEFINES += QWT_LIBRARY
|
||||
|
||||
# DESTDIR = $${QWT_OUT_ROOT}/lib
|
||||
|
||||
# NOTE: The include below must come AFTER the TARGET is
|
||||
# defined. Otherwise the debug version of the library
|
||||
# will not have the 'd' suffix it needs.
|
||||
#
|
||||
include(../../../openpilotgcslibrary.pri)
|
||||
|
||||
contains(QWT_CONFIG, QwtDll) {
|
||||
|
||||
CONFIG += dll
|
||||
|
Loading…
Reference in New Issue
Block a user