diff --git a/samples/blackcore/sample_blackcore.pro b/samples/blackcore/sample_blackcore.pro index cdeb0846f..92c88bad2 100644 --- a/samples/blackcore/sample_blackcore.pro +++ b/samples/blackcore/sample_blackcore.pro @@ -8,10 +8,10 @@ TEMPLATE = app CONFIG += console c++11 CONFIG -= app_bundle -DEPENDPATH += . ../../src/blackmisc ../../src/blackcore ../../src/blacksound +DEPENDPATH += . ../../src/blackmisc ../../src/blacksound ../../src/blackcore INCLUDEPATH += . ../../src -LIBS += -L../../lib -lblackcore -lblackmisc -lblacksound +LIBS += -L../../lib -lblackcore -lblacksound -lblackmisc LIBS += -lvatlib win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib \ diff --git a/samples/blackgui/sample_blackgui.pro b/samples/blackgui/sample_blackgui.pro index bc827d2cd..3d822429d 100644 --- a/samples/blackgui/sample_blackgui.pro +++ b/samples/blackgui/sample_blackgui.pro @@ -11,22 +11,22 @@ HEADERS += *.h FORMS += *.ui CONFIG += c++11 -DEPENDPATH += . ../../src/blackmisc ../../src/blackcore ../../src/blackgui ../../src/blacksound +DEPENDPATH += . ../../src/blackmisc ../../src/blackgui ../../src/blacksound ../../src/blackcore INCLUDEPATH += . ../../src DESTDIR = ../../bin -LIBS += -L../../lib -lblackcore -lblackmisc -lblackgui -lblacksound +LIBS += -L../../lib -lblackcore -lblackgui -lblacksound -lblackmisc LIBS += -lvatlib win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib \ - ../../lib/blackcore.lib \ ../../lib/blackgui.lib \ - ../../lib/blacksound.lib + ../../lib/blacksound.lib \ + ../../lib/blackcore.lib else: PRE_TARGETDEPS += ../../lib/libblackmisc.a \ - ../../lib/libblackcore.a \ ../../lib/libblackgui.a \ - ../../lib/libblacksound.a + ../../lib/libblacksound.a \ + ../../lib/libblackcore.a OTHER_FILES += *.qss diff --git a/samples/cli_client/sample_cli_client.pro b/samples/cli_client/sample_cli_client.pro index 451b723a0..c97e1762d 100644 --- a/samples/cli_client/sample_cli_client.pro +++ b/samples/cli_client/sample_cli_client.pro @@ -14,7 +14,7 @@ INCLUDEPATH += . ../../src SOURCES += *.cpp HEADERS += *.h -LIBS += -L../../lib -lblackcore -lblackmisc +LIBS += -L../../lib -lblackcore -lblacksound -lblackmisc LIBS += -lvatlib win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib \ diff --git a/samples/voiceclient/sample_voice_client.pro b/samples/voiceclient/sample_voice_client.pro index 6b3fa206b..1e73953e2 100644 --- a/samples/voiceclient/sample_voice_client.pro +++ b/samples/voiceclient/sample_voice_client.pro @@ -15,7 +15,7 @@ INCLUDEPATH += . ../../src SOURCES += *.cpp HEADERS += *.h -LIBS += -L../../lib -lblackcore -lblackmisc -lblacksound +LIBS += -L../../lib -lblackcore -lblacksound -lblackmisc LIBS += -lvatlib win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib \ diff --git a/src/blackcore/blackcore.pro b/src/blackcore/blackcore.pro index cdaf25e88..f58f4e443 100644 --- a/src/blackcore/blackcore.pro +++ b/src/blackcore/blackcore.pro @@ -11,7 +11,7 @@ CONFIG += staticlib c++11 INCLUDEPATH += .. DEPENDPATH += . .. -LIBS += -L../../lib -lblackmisc -lblacksound +LIBS += -L../../lib -lblacksound -lblackmisc # linux-g++* { QMAKE_CXXFLAGS += -std=c++0x } # PRECOMPILED_HEADER = stdpch.h diff --git a/src/blackgui/blackgui.pro b/src/blackgui/blackgui.pro index 92269d5e0..a5f8e1d5e 100644 --- a/src/blackgui/blackgui.pro +++ b/src/blackgui/blackgui.pro @@ -9,6 +9,8 @@ CONFIG += staticlib c++11 INCLUDEPATH += .. DEPENDPATH += . .. +LIBS += -L../../lib -lblackmisc + # PRECOMPILED_HEADER = stdpch.h precompile_header:!isEmpty(PRECOMPILED_HEADER) { DEFINES += USING_PCH diff --git a/src/blacksound/blacksound.pro b/src/blacksound/blacksound.pro index 4d82e43f7..45b57ee99 100644 --- a/src/blacksound/blacksound.pro +++ b/src/blacksound/blacksound.pro @@ -14,6 +14,8 @@ 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