flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-08-14 09:25:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add missing PRE_TARGETDEPS in simulator plugin projects

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

46
mkspecs/features/libraries.pri
View File

@@ -7,30 +7,12 @@ unix:!macx {
}
blackgui {
contains(BLACK_CONFIG, Static) {
win32:msvc: PRE_TARGETDEPS += $$DestRoot/lib/blackgui.lib
else: PRE_TARGETDEPS += $$DestRoot/lib/libblackgui.a
} else {
win32:msvc: PRE_TARGETDEPS += $$DestRoot/lib/blackgui.lib
win32-g++*: PRE_TARGETDEPS += $$DestRoot/lib/libblackgui.a
linux-g++*: PRE_TARGETDEPS += $$DestRoot/lib/libblackgui.so
macx-clang: PRE_TARGETDEPS += $$DestRoot/lib/libblackgui.dylib
}
addLibraryDependency(blackgui)
LIBS *= -lblackgui
}
blackcore {
contains(BLACK_CONFIG, Static) {
win32:msvc: PRE_TARGETDEPS += $$DestRoot/lib/blackcore.lib
else: PRE_TARGETDEPS += $$DestRoot/lib/libblackcore.a
} else {
win32:msvc: PRE_TARGETDEPS += $$DestRoot/lib/blackcore.lib
win32-g++*: PRE_TARGETDEPS += $$DestRoot/lib/libblackcore.a
linux-g++*: PRE_TARGETDEPS += $$DestRoot/lib/libblackcore.so
macx-clang: PRE_TARGETDEPS += $$DestRoot/lib/libblackcore.dylib
}
addLibraryDependency(blackcore)
LIBS *= -lblackcore -lvatlib
}
@@ -39,16 +21,7 @@ blacksound {
}
blackinput {
contains(BLACK_CONFIG, Static) {
win32:msvc: PRE_TARGETDEPS += $$DestRoot/lib/blackinput.lib
else: PRE_TARGETDEPS += $$DestRoot/lib/libblackinput.a
} else {
win32:msvc: PRE_TARGETDEPS += $$DestRoot/lib/blackinput.lib
win32-g++*: PRE_TARGETDEPS += $$DestRoot/lib/libblackinput.a
linux-g++*: PRE_TARGETDEPS += $$DestRoot/lib/libblackinput.so
macx-clang: PRE_TARGETDEPS += $$DestRoot/lib/libblackinput.dylib
}
addLibraryDependency(blackinput)
LIBS *= -lblackinput
macx {
@@ -61,15 +34,7 @@ blackinput {
}
blackmisc {
contains(BLACK_CONFIG, Static) {
win32:msvc: PRE_TARGETDEPS += $$DestRoot/lib/blackmisc.lib
else: PRE_TARGETDEPS += $$DestRoot/lib/libblackmisc.a
} else {
win32:msvc: PRE_TARGETDEPS += $$DestRoot/lib/blackmisc.lib
win32-g++*: PRE_TARGETDEPS += $$DestRoot/lib/libblackmisc.a
linux-g++*: PRE_TARGETDEPS += $$DestRoot/lib/libblackmisc.so
macx-clang: PRE_TARGETDEPS += $$DestRoot/lib/libblackmisc.dylib
}
addLibraryDependency(blackmisc)
LIBS *= -lblackmisc
win32 {
@@ -78,7 +43,6 @@ blackmisc {
}
blackconfig {
win32:msvc: PRE_TARGETDEPS += $$DestRoot/lib/blackconfig.lib
else: PRE_TARGETDEPS += $$DestRoot/lib/libblackconfig.a
addStaticLibraryDependency(blackconfig)
LIBS *= -lblackconfig
}