Add missing PRE_TARGETDEPS in simulator plugin projects

Summary:
This fixes issue reported by Klaus in Slack:
> when I change something in the plugin driver, I always have to rebuild the plugins before I can debug again.

Also refactored `libraries.pri` to remove duplication.

Reviewers: #swift_pilot_client, rwinklmeier

Reviewed By: #swift_pilot_client, rwinklmeier

Subscribers: kbasan, jenkins

Tags: #swift_pilot_client

Differential Revision: https://dev.swift-project.org/D31
This commit is contained in:
Mathew Sutcliffe
2017-06-30 18:31:26 +01:00
parent 574d4056ce
commit 1400f38aa9
7 changed files with 38 additions and 41 deletions

View File

@@ -13,6 +13,8 @@ INCLUDEPATH += . $$SourceRoot/src
LIBS += -lsimulatorfscommon -lfsuipc -luuid
LIBS += -ldxguid -lole32
addStaticLibraryDependency(simulatorfscommon)
addStaticLibraryDependency(fsuipc)
SOURCES += *.cpp
HEADERS += *.h

View File

@@ -17,6 +17,9 @@ INCLUDEPATH *= $$EXTERNALSROOT/common/include/simconnect/FSX-XPack
LIBS *= -L$$EXTERNALS_LIB_DIR/FSX-XPack
LIBS *= -lsimulatorfscommon -lsimulatorfsxcommon -lfsuipc -lSimConnect
LIBS += -ldxguid -lole32
addStaticLibraryDependency(simulatorfscommon)
addStaticLibraryDependency(simulatorfsxcommon)
addStaticLibraryDependency(fsuipc)
SOURCES += *.cpp
HEADERS += *.h

View File

@@ -14,6 +14,8 @@ SOURCES += *.cpp
HEADERS += *.h
DISTFILES += simulatorfsxconfig.json
LIBS += -lsimulatorfsxcommon
addStaticLibraryDependency(simulatorfsxcommon)
DESTDIR = $$DestRoot/bin/plugins/simulator
win32 {

View File

@@ -34,6 +34,9 @@ equals(WORD_SIZE,32) {
LIBS *= -lSimConnect
}
LIBS += -ldxguid -lole32
addStaticLibraryDependency(simulatorfscommon)
addStaticLibraryDependency(simulatorfsxcommon)
addStaticLibraryDependency(fsuipc)
# Ignore linker warning about missing pdb files from Simconnect
msvc: QMAKE_LFLAGS *= /ignore:4099

View File

@@ -14,6 +14,8 @@ SOURCES += *.cpp
HEADERS += *.h
DISTFILES += simulatorp3dconfig.json
LIBS += -lsimulatorfsxcommon
addStaticLibraryDependency(simulatorfsxcommon)
DESTDIR = $$DestRoot/bin/plugins/simulator
win32 {