diff --git a/samples/blackcore/sample_blackcore.pro b/samples/blackcore/sample_blackcore.pro index c87c26b80..c5f85f50f 100644 --- a/samples/blackcore/sample_blackcore.pro +++ b/samples/blackcore/sample_blackcore.pro @@ -10,17 +10,21 @@ TEMPLATE = app CONFIG += console CONFIG -= app_bundle -CONFIG += blackmisc blacksound blackcore +CONFIG += blackmisc blacksound blackcore blacksim -DEPENDPATH += . ../../src/blackmisc ../../src/blacksound ../../src/blackcore +DEPENDPATH += . ../../src/blackmisc ../../src/blacksound ../../src/blackcore ../../src/blacksim INCLUDEPATH += . ../../src win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib \ ../../lib/blacksound.lib \ - ../../lib/blackcore.lib + ../../lib/blackcore.lib \ + ../../lib/blacksim.lib + else: PRE_TARGETDEPS += ../../lib/libblackmisc.a \ ../../lib/libblacksound.a \ - ../../lib/libblackcore.a + ../../lib/libblackcore.a \ + ../../lib/libblacksim.a + DESTDIR = ../../bin diff --git a/src/blackcore/blackcore.pro b/src/blackcore/blackcore.pro index c0efb418f..84c4a7a1f 100644 --- a/src/blackcore/blackcore.pro +++ b/src/blackcore/blackcore.pro @@ -8,7 +8,7 @@ QT += network dbus xml multimedia TARGET = blackcore TEMPLATE = lib CONFIG += staticlib -CONFIG += blackmisc +CONFIG += blackmisc blacksim INCLUDEPATH += .. DEPENDPATH += . .. @@ -30,8 +30,8 @@ win32 { SOURCES += $$PWD/win/*.cpp } -win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib ../../lib/blacksound.lib -else: PRE_TARGETDEPS += ../../lib/libblackmisc.a ../../lib/libblacksound.a +win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib ../../lib/blacksound.lib ../../lib/blacksim.lib +else: PRE_TARGETDEPS += ../../lib/libblackmisc.a ../../lib/libblacksound.a ../../lib/libblacksim.a DESTDIR = ../../lib diff --git a/src/blacksim/blacksim.pro b/src/blacksim/blacksim.pro index 831e34d4b..0b1ff3b58 100644 --- a/src/blacksim/blacksim.pro +++ b/src/blacksim/blacksim.pro @@ -25,17 +25,11 @@ else: PRE_TARGETDEPS += ../../lib/libblackmisc.a HEADERS += *.h SOURCES += *.cpp - HEADERS += $$PWD/fscommon/*.h SOURCES += $$PWD/fscommon/*.cpp -HEADERS += $$PWD/fsx/simconnectutilities.h -SOURCES += $$PWD/fsx/simconnectutilities.cpp - -contains(BLACK_CONFIG, FSX) { - HEADERS += $$PWD/fsx/*.h - SOURCES += $$PWD/fsx/*.cpp -} +HEADERS += $$PWD/fsx/*.h +SOURCES += $$PWD/fsx/*.cpp DESTDIR = ../../lib