From d61f8845da5c6131925d48d68643e748ef34eb16 Mon Sep 17 00:00:00 2001 From: Roland Winklmeier Date: Sun, 31 Mar 2013 14:46:08 +0200 Subject: [PATCH] #12 Fixed linker error and Mac build --- samples/interpolator/sample_interpolator.pro | 5 +++-- src/blackmisc/blackmisc.pro | 1 - src/blackmisc/display.cpp | 4 +--- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/samples/interpolator/sample_interpolator.pro b/samples/interpolator/sample_interpolator.pro index 371bdfd05..b669712e9 100644 --- a/samples/interpolator/sample_interpolator.pro +++ b/samples/interpolator/sample_interpolator.pro @@ -25,8 +25,9 @@ win32-msvc* { PRE_TARGETDEPS += ../../lib/libblackmisc.a \ ../../lib/libblackcore.a - LIBS += ../../lib/libblackmisc.a \ - ../../lib/libblackcore.a + LIBS += ../../lib/libblackcore.a \ + ../../lib/libblackmisc.a + } DESTDIR = ../../bin diff --git a/src/blackmisc/blackmisc.pro b/src/blackmisc/blackmisc.pro index 263247b94..5fa9106eb 100644 --- a/src/blackmisc/blackmisc.pro +++ b/src/blackmisc/blackmisc.pro @@ -15,7 +15,6 @@ precompile_header:!isEmpty(PRECOMPILED_HEADER) { } DEFINES += LOG_IN_FILE -DEFINES += Q_OS_LINUX HEADERS += \ logmessage.h \ diff --git a/src/blackmisc/display.cpp b/src/blackmisc/display.cpp index ab1612b52..5dbc285e3 100644 --- a/src/blackmisc/display.cpp +++ b/src/blackmisc/display.cpp @@ -9,9 +9,7 @@ #include "blackmisc/context.h" #include "blackmisc/display.h" -#ifdef Q_OS_LINUX - #include -#endif +#include namespace BlackMisc {