From b8d87038a16f19245a557575a45d814ad92854b0 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Sun, 2 Feb 2014 19:15:08 +0100 Subject: [PATCH] Fixed .pro files, typos in libblacksound (non win) --- samples/blackcore/sample_blackcore.pro | 9 +++++---- samples/blackgui/sample_blackgui.pro | 2 +- src/blackcore/blackcore.pro | 4 +++- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/samples/blackcore/sample_blackcore.pro b/samples/blackcore/sample_blackcore.pro index ed151fc61..cdeb0846f 100644 --- a/samples/blackcore/sample_blackcore.pro +++ b/samples/blackcore/sample_blackcore.pro @@ -15,11 +15,12 @@ LIBS += -L../../lib -lblackcore -lblackmisc -lblacksound LIBS += -lvatlib win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib \ - ../../lib/blackcore.lib \ - ../../lib/blacksound.lib + ../../lib/blacksound.lib \ + ../../lib/blackcore.lib else: PRE_TARGETDEPS += ../../lib/libblackmisc.a \ - ../../lib/libblackcore.a \ - ../../lib/libblacksound.a + ../../lib/libblacksound.a \ + ../../lib/libblackcore.a + DESTDIR = ../../bin HEADERS += *.h diff --git a/samples/blackgui/sample_blackgui.pro b/samples/blackgui/sample_blackgui.pro index 7c8e8406b..bc827d2cd 100644 --- a/samples/blackgui/sample_blackgui.pro +++ b/samples/blackgui/sample_blackgui.pro @@ -27,6 +27,6 @@ win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib \ else: PRE_TARGETDEPS += ../../lib/libblackmisc.a \ ../../lib/libblackcore.a \ ../../lib/libblackgui.a \ - ../../lib/blacksound.lib + ../../lib/libblacksound.a OTHER_FILES += *.qss diff --git a/src/blackcore/blackcore.pro b/src/blackcore/blackcore.pro index 9bae03b18..cdaf25e88 100644 --- a/src/blackcore/blackcore.pro +++ b/src/blackcore/blackcore.pro @@ -11,6 +11,8 @@ CONFIG += staticlib c++11 INCLUDEPATH += .. DEPENDPATH += . .. +LIBS += -L../../lib -lblackmisc -lblacksound + # linux-g++* { QMAKE_CXXFLAGS += -std=c++0x } # PRECOMPILED_HEADER = stdpch.h @@ -36,7 +38,7 @@ HEADERS += *.h SOURCES += *.cpp win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib ../../lib/blacksound.lib -else: PRE_TARGETDEPS += ../../lib/libblackmisc.a ../../libblacksound.a +else: PRE_TARGETDEPS += ../../lib/libblackmisc.a ../../lib/libblacksound.a DESTDIR = ../../lib