diff --git a/libraries.pri b/libraries.pri index e04010cbc..47dc4d968 100644 --- a/libraries.pri +++ b/libraries.pri @@ -23,3 +23,7 @@ blacksound { blackmisc { LIBS += -lblackmisc } + +blacksim { + LIBS += -lblacksim +} diff --git a/samples/blacksim/sample_blacksim.pro b/samples/blacksim/sample_blacksim.pro index a05009aee..470fe8754 100644 --- a/samples/blacksim/sample_blacksim.pro +++ b/samples/blacksim/sample_blacksim.pro @@ -1,3 +1,6 @@ +include (../../config.pri) +include (../../build.pri) + QT += core dbus network TARGET = sample_blacksim @@ -5,12 +8,11 @@ TEMPLATE = app CONFIG += console c++11 CONFIG -= app_bundle +CONFIG += blackmisc blackcore blacksim DEPENDPATH += . ../../src/blackmisc ../../src/blacksim INCLUDEPATH += . ../../src -LIBS += -L../../lib -lblacksim -lblackmisc - win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib ../../lib/blacksim.lib else: PRE_TARGETDEPS += ../../lib/libblackmisc.a ../../lib/libblacksim.a @@ -20,3 +22,5 @@ HEADERS += *.h SOURCES += *.cpp OTHER_FILES += + +include (../../libraries.pri) diff --git a/src/blackcore/blackcore.pro b/src/blackcore/blackcore.pro index 37776b0cc..223256cf8 100644 --- a/src/blackcore/blackcore.pro +++ b/src/blackcore/blackcore.pro @@ -20,18 +20,6 @@ precompile_header:!isEmpty(PRECOMPILED_HEADER) { DEFINES += USING_PCH } -# Causes nmake to run qdbusxml2cpp to automatically generate the dbus adaptor and interface classes, -# then automatically adds them to the sources to compile -# !! Make sure the plugin is available as release build and known QT_PLUGIN_PATH -# QDBUSXML2CPP_ADAPTOR_HEADER_FLAGS = -i blackmisc/blackmiscfreefunctions.h -i blackmisc/blackmiscallvalueclasses.h -# DBUS_ADAPTORS += blackcore.contextnetwork.xml -# DBUS_ADAPTORS += blackcore.contextvoice.xml -# DBUS_ADAPTORS += blackcore.contextsettings.xml -# DBUS_ADAPTORS += blackcore.contextapplication.xml - -# QDBUSXML2CPP_INTERFACE_HEADER_FLAGS = -i blackmisc/blackmiscfreefunctions.h -i blackmisc/blackmiscallvalueclasses.h -# DBUS_INTERFACES += blackcore.contextnetwork.xml - DEFINES += LOG_IN_FILE HEADERS += *.h diff --git a/src/blackcore/readme.txt b/src/blackcore/readme.txt index 506dd3829..fc6d88e77 100644 --- a/src/blackcore/readme.txt +++ b/src/blackcore/readme.txt @@ -24,3 +24,18 @@ qdbusxml2cpp -i context_adaptor.h -a :contextnetwork_adaptor.cpp blackcore.conte Manually: + +Removed generation: + +# Causes nmake to run qdbusxml2cpp to automatically generate the dbus adaptor and interface classes, +# then automatically adds them to the sources to compile +# !! Make sure the plugin is available as release build and known QT_PLUGIN_PATH +# QDBUSXML2CPP_ADAPTOR_HEADER_FLAGS = -i blackmisc/blackmiscfreefunctions.h -i blackmisc/blackmiscallvalueclasses.h +# DBUS_ADAPTORS += blackcore.contextnetwork.xml +# DBUS_ADAPTORS += blackcore.contextvoice.xml +# DBUS_ADAPTORS += blackcore.contextsettings.xml +# DBUS_ADAPTORS += blackcore.contextapplication.xml + +# QDBUSXML2CPP_INTERFACE_HEADER_FLAGS = -i blackmisc/blackmiscfreefunctions.h -i blackmisc/blackmiscallvalueclasses.h +# DBUS_INTERFACES += blackcore.contextnetwork.xml + diff --git a/src/blacksim/blacksim.pro b/src/blacksim/blacksim.pro index 55e6f0339..5fbe0ed73 100644 --- a/src/blacksim/blacksim.pro +++ b/src/blacksim/blacksim.pro @@ -1,14 +1,17 @@ +include (../../config.pri) +include (../../build.pri) + QT += network dbus xml TARGET = blacksim TEMPLATE = lib + CONFIG += staticlib c++11 +CONFIG += blackmisc INCLUDEPATH += .. DEPENDPATH += . .. -LIBS += -L../../lib -lblackmisc - # PRECOMPILED_HEADER = stdpch.h precompile_header:!isEmpty(PRECOMPILED_HEADER) { DEFINES += USING_PCH @@ -26,3 +29,4 @@ SOURCES += $$PWD/fscommon/*.cpp DESTDIR = ../../lib +include (../../libraries.pri) diff --git a/src/blacksound/blacksound.pro b/src/blacksound/blacksound.pro index 2a502c899..d3908894e 100644 --- a/src/blacksound/blacksound.pro +++ b/src/blacksound/blacksound.pro @@ -6,6 +6,7 @@ QT += network dbus gui multimedia TARGET = blacksound TEMPLATE = lib CONFIG += staticlib +CONFIG += blackmisc INCLUDEPATH += .. DEPENDPATH += . .. @@ -17,8 +18,6 @@ precompile_header:!isEmpty(PRECOMPILED_HEADER) { DEFINES += LOG_IN_FILE -LIBS += -L../../lib -lblackmisc - win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib else: PRE_TARGETDEPS += ../../lib/libblackmisc.a