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

mkspecs/features/common_pre.prf

@@ -194,6 +194,27 @@ isEmpty(PREFIX) {
 
 win32: CONFIG(debug, debug|release): DLL_DEBUG_SUFFIX = d
 
+################################
+# Inter-project dependencies
+################################
+defineTest(addStaticLibraryDependency) {
+    win32:msvc:     PRE_TARGETDEPS += $$DestRoot/lib/$${1}.lib
+    else:           PRE_TARGETDEPS += $$DestRoot/lib/lib$${1}.a
+    export(PRE_TARGETDEPS)
+}
+defineTest(addLibraryDependency) {
+    contains(BLACK_CONFIG, Static) {
+        addStaticLibraryDependency($$1)
+    }
+    else {
+        win32:msvc: PRE_TARGETDEPS += $$DestRoot/lib/$${1}.lib
+        win32-g++*: PRE_TARGETDEPS += $$DestRoot/lib/lib$${1}.a
+        linux-g++*: PRE_TARGETDEPS += $$DestRoot/lib/lib$${1}.so
+        macx-clang: PRE_TARGETDEPS += $$DestRoot/lib/lib$${1}.dylib
+        export(PRE_TARGETDEPS)
+    }
+}
+
 ################################
 # Experimental support for Clang on Windows
 ################################

mkspecs/features/libraries.pri

@@ -7,30 +7,12 @@ unix:!macx {
 }
 
 blackgui {
-    contains(BLACK_CONFIG, Static) {
+    addLibraryDependency(blackgui)
-        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
-    }
-
     LIBS *= -lblackgui
 }
 
 blackcore {
-    contains(BLACK_CONFIG, Static) {
+    addLibraryDependency(blackcore)
-        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
-    }
-
     LIBS *= -lblackcore -lvatlib
 }
 
@@ -39,16 +21,7 @@ blacksound {
 }
 
 blackinput {
-    contains(BLACK_CONFIG, Static) {
+    addLibraryDependency(blackinput)
-        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
-    }
-
     LIBS *= -lblackinput
 
     macx {
@@ -61,15 +34,7 @@ blackinput {
 }
 
 blackmisc {
-    contains(BLACK_CONFIG, Static) {
+    addLibraryDependency(blackmisc)
-        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
-    }
     LIBS *= -lblackmisc
 
     win32 {
@@ -78,7 +43,6 @@ blackmisc {
 }
 
 blackconfig {
-    win32:msvc:     PRE_TARGETDEPS += $$DestRoot/lib/blackconfig.lib
+    addStaticLibraryDependency(blackconfig)
-    else:           PRE_TARGETDEPS += $$DestRoot/lib/libblackconfig.a
     LIBS *= -lblackconfig
 }

src/plugins/simulator/fs9/fs9.pro

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

src/plugins/simulator/fsx/fsx.pro

@@ -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

src/plugins/simulator/fsxconfig/fsxconfig.pro

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

src/plugins/simulator/p3d/p3d.pro

@@ -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

src/plugins/simulator/p3dconfig/p3dconfig.pro

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