diff --git a/samples/blackmiscquantities/sample_quantities_avionics.pro b/samples/blackmiscquantities/sample_quantities_avionics.pro
index 59cf6ab98..2e9e95d87 100644
--- a/samples/blackmiscquantities/sample_quantities_avionics.pro
+++ b/samples/blackmiscquantities/sample_quantities_avionics.pro
@@ -7,18 +7,13 @@ TEMPLATE = app
 CONFIG   += console
 CONFIG   -= app_bundle
 
-DEPENDPATH += . ../../src/blackmisc
+DEPENDPATH += . ../../src
 INCLUDEPATH += . ../../src
 
-win32-msvc* {
-    PRE_TARGETDEPS += ../../lib/blackmisc.lib
-    LIBS += ../../lib/blackmisc.lib
-}
+LIBS += -L../../lib -lblackmisc
 
-!win32-msvc* {
-    PRE_TARGETDEPS += ../../lib/libblackmisc.a
-    LIBS += ../../lib/libblackmisc.a
-}
+win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib
+else:              PRE_TARGETDEPS += ../../lib/libblackmisc.a
 
 DESTDIR = ../../bin
 
diff --git a/samples/blackmiscvectorgeo/sample_vector_geo.pro b/samples/blackmiscvectorgeo/sample_vector_geo.pro
index 94e455f70..a44bebc4a 100644
--- a/samples/blackmiscvectorgeo/sample_vector_geo.pro
+++ b/samples/blackmiscvectorgeo/sample_vector_geo.pro
@@ -9,24 +9,12 @@ TEMPLATE = app
 DEPENDPATH += . ../../src
 INCLUDEPATH += . ../../src
 
-win32-msvc* {
-    PRE_TARGETDEPS += ../../lib/blackmisc.lib
-    LIBS += ../../lib/blackmisc.lib
-}
+LIBS += -L../../lib -lblackmisc
 
-!win32-msvc* {
-    PRE_TARGETDEPS += ../../lib/libblackmisc.a
-    LIBS += ../../lib/libblackmisc.a
-}
+win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib
+else:              PRE_TARGETDEPS += ../../lib/libblackmisc.a
 
 DESTDIR = ../../bin
 
-SOURCES += main.cpp \
-    samplesvectormatrix.cpp \
-    samplesgeo.cpp \
-    samplesgeodetictoecef.cpp
-
-HEADERS += \
-    samplesvectormatrix.h \
-    samplesgeo.h \
-    samplesgeodetictoecef.h
+SOURCES += *.cpp
+HEADERS += *.h
diff --git a/samples/com_client/sample_com_client.pro b/samples/com_client/sample_com_client.pro
index 4b9007501..61b68e378 100644
--- a/samples/com_client/sample_com_client.pro
+++ b/samples/com_client/sample_com_client.pro
@@ -14,14 +14,12 @@ INCLUDEPATH += . ../../src
 SOURCES += *.cpp
 HEADERS += *.h
 
-win32-msvc* {
-    PRE_TARGETDEPS +=  ../../lib/blackmisc.lib
-    LIBS += ../../lib/blackmisc.lib
-}
+LIBS    += -L../../lib -lblackmisc
 
-!win32-msvc* {
-    PRE_TARGETDEPS += ../../lib/libblackmisc.a
-    LIBS += ../../lib/libblackmisc.a
-}
+win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib
+else:              PRE_TARGETDEPS += ../../lib/libblackmisc.a
 
 DESTDIR = ../../bin
+
+
+
diff --git a/samples/com_server/sample_com_server.pro b/samples/com_server/sample_com_server.pro
index 21da67c03..e6d61c03d 100644
--- a/samples/com_server/sample_com_server.pro
+++ b/samples/com_server/sample_com_server.pro
@@ -13,15 +13,10 @@ INCLUDEPATH += . ../../src
 SOURCES += *.cpp
 HEADERS += *.h
 
-win32-msvc* {
-    PRE_TARGETDEPS +=  ../../lib/blackmisc.lib
-    LIBS += ../../lib/blackmisc.lib
-}
+LIBS    += -L../../lib -lblackmisc
 
-!win32-msvc* {
-    PRE_TARGETDEPS += ../../lib/libblackmisc.a
-    LIBS += ../../lib/libblackmisc.a
-}
+win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib
+else:              PRE_TARGETDEPS += ../../lib/libblackmisc.a
 
 DESTDIR = ../../bin
 
diff --git a/samples/config/sample_config.pro b/samples/config/sample_config.pro
index 18906e263..801d9f071 100644
--- a/samples/config/sample_config.pro
+++ b/samples/config/sample_config.pro
@@ -9,14 +9,12 @@ INCLUDEPATH += . ../../src
 
 SOURCES += *.cpp
 
-win32-msvc* {
-    PRE_TARGETDEPS +=  ../../lib/blackmisc.lib
-    LIBS += ../../lib/blackmisc.lib
-}
+LIBS    += -L../../lib -lblackmisc
 
-!win32-msvc* {
-    PRE_TARGETDEPS += ../../lib/libblackmisc.a
-    LIBS += ../../lib/libblackmisc.a
-}
+win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib
+else:              PRE_TARGETDEPS += ../../lib/libblackmisc.a
 
 DESTDIR = ../../bin
+
+
+
diff --git a/samples/interpolator/sample_interpolator.pro b/samples/interpolator/sample_interpolator.pro
index 13a77d8cc..aa2fea407 100644
--- a/samples/interpolator/sample_interpolator.pro
+++ b/samples/interpolator/sample_interpolator.pro
@@ -6,22 +6,19 @@ CONFIG   -= app_bundle
 
 TEMPLATE = app
 
+CONFIG   += console
+CONFIG   -= app_bundle
+
 DEPENDPATH += . ../../src
 INCLUDEPATH += . ../../src
+
 SOURCES += *.cpp
 
-win32-msvc* {
-    PRE_TARGETDEPS +=  ../../lib/blackmisc.lib
-    PRE_TARGETDEPS +=  ../../lib/blackcore.lib
-    LIBS += ../../lib/blackmisc.lib
-    LIBS += ../../lib/blackcore.lib
-}
+LIBS    += -L../../lib -lblackcore -lblackmisc
 
-!win32-msvc* {
-    PRE_TARGETDEPS += ../../lib/libblackmisc.a
-    PRE_TARGETDEPS += ../../lib/libblackcore.a
-    LIBS += ../../lib/libblackmisc.a
-    LIBS += ../../lib/libblackcore.a
-}
+win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib \
+                                     ../../lib/blackcore.lib
+else:              PRE_TARGETDEPS += ../../lib/libblackmisc.a \
+                                     ../../lib/libblackcore.a
 
 DESTDIR = ../../bin
diff --git a/samples/logging/sample_logging.pro b/samples/logging/sample_logging.pro
index d22de1cdf..b262a6322 100644
--- a/samples/logging/sample_logging.pro
+++ b/samples/logging/sample_logging.pro
@@ -12,14 +12,12 @@ INCLUDEPATH += . ../../src
 
 SOURCES += *.cpp
 
-win32-msvc* {
-    PRE_TARGETDEPS +=  ../../lib/blackmisc.lib
-    LIBS += ../../lib/blackmisc.lib
-}
+LIBS    += -L../../lib -lblackmisc
 
-!win32-msvc* {
-    PRE_TARGETDEPS += ../../lib/libblackmisc.a
-    LIBS += ../../lib/libblackmisc.a
-}
+win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib
+else:              PRE_TARGETDEPS += ../../lib/libblackmisc.a
 
 DESTDIR = ../../bin
+
+
+
diff --git a/samples/plugin/sample_plugin.pro b/samples/plugin/sample_plugin.pro
index 354f9b794..c01de703c 100644
--- a/samples/plugin/sample_plugin.pro
+++ b/samples/plugin/sample_plugin.pro
@@ -10,14 +10,12 @@ INCLUDEPATH += . ../../src
 
 SOURCES += *.cpp
 
-win32-msvc* {
-    PRE_TARGETDEPS +=  ../../lib/blackmisc.lib
-    LIBS += ../../lib/blackmisc.lib
-}
+LIBS    += -L../../lib -lblackmisc
 
-!win32-msvc* {
-    PRE_TARGETDEPS += ../../lib/libblackmisc.a
-    LIBS += ../../lib/libblackmisc.a
-}
+win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib
+else:              PRE_TARGETDEPS += ../../lib/libblackmisc.a
 
 DESTDIR = ../../bin
+
+
+
diff --git a/samples/pluginmgr/sample_pluginmgr.pro b/samples/pluginmgr/sample_pluginmgr.pro
index 2a8c326fe..11700db9a 100644
--- a/samples/pluginmgr/sample_pluginmgr.pro
+++ b/samples/pluginmgr/sample_pluginmgr.pro
@@ -12,18 +12,14 @@ INCLUDEPATH += . ../../src
 
 SOURCES += *.cpp
 
-win32-msvc* {
-    PRE_TARGETDEPS +=  ../../lib/blackmisc.lib
-    PRE_TARGETDEPS +=  ../../lib/blackcore.lib
-    LIBS += ../../lib/blackmisc.lib
-    LIBS += ../../lib/blackcore.lib
-}
+LIBS    += -L../../lib -lblackcore -lblackmisc
 
-!win32-msvc* {
-    PRE_TARGETDEPS += ../../lib/libblackmisc.a
-    PRE_TARGETDEPS += ../../lib/libblackcore.a
-    LIBS += ../../lib/libblackmisc.a
-    LIBS += ../../lib/libblackcore.a
-}
+win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib \
+                                     ../../lib/blackcore.lib
+else:              PRE_TARGETDEPS += ../../lib/libblackmisc.a \
+                                     ../../lib/libblackcore.a
 
 DESTDIR = ../../bin
+
+
+
diff --git a/src/blackbox/blackbox.pro b/src/blackbox/blackbox.pro
index 58b6c3b3e..79dad5973 100644
--- a/src/blackbox/blackbox.pro
+++ b/src/blackbox/blackbox.pro
@@ -12,14 +12,9 @@ HEADERS += *.h
 
 FORMS   += blackbox.ui dialog_connect.ui dialog_chat.ui
 
-win32-msvc* {
-    PRE_TARGETDEPS +=  ../../lib/blackmisc.lib
-    LIBS += ../../lib/blackmisc.lib
-}
+LIBS    += -L../../lib -lblackmisc
 
-!win32-msvc* {
-    PRE_TARGETDEPS += ../../lib/libblackmisc.a
-    LIBS += ../../lib/libblackmisc.a
-}
+win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib
+else:              PRE_TARGETDEPS += ../../lib/libblackmisc.a
 
 DESTDIR = ../../bin
diff --git a/src/blackd/blackd.pro b/src/blackd/blackd.pro
index 640c71ede..7ac44a843 100644
--- a/src/blackd/blackd.pro
+++ b/src/blackd/blackd.pro
@@ -2,11 +2,11 @@ QT       += core gui xml svg network
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
+
 TARGET = blackd
 TEMPLATE = app
 
-DEPENDPATH += ../blackmisc ../blackcore
-
+DEPENDPATH += . ..
 INCLUDEPATH += ..
 
 SOURCES  += *.cpp
@@ -15,19 +15,12 @@ HEADERS  += *.h
 FORMS    += blackd.ui
 RESOURCES += blackd.qrc
 
-win32-msvc* {
-    PRE_TARGETDEPS +=  ../../lib/blackmisc.lib
-    PRE_TARGETDEPS +=  ../../lib/blackcore.lib
-    LIBS += ../../lib/blackmisc.lib
-    LIBS += ../../lib/blackcore.lib
-}
+LIBS += -L../../lib -lblackcore -lblackmisc
 
-!win32-msvc* {
-    PRE_TARGETDEPS += ../../lib/libblackmisc.a
-    PRE_TARGETDEPS += ../../lib/libblackcore.a
-    LIBS += ../../lib/libblackmisc.a
-    LIBS += ../../lib/libblackcore.a
-}
+win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib \
+                                     ../../lib/blackcore.lib
+else:              PRE_TARGETDEPS += ../../lib/libblackmisc.a \
+                                     ../../lib/libblackcore.a
 
 DESTDIR = ../../bin
 
diff --git a/tests/blackcore/test_blackcore.pro b/tests/blackcore/test_blackcore.pro
index aaf0bfcff..d4076c16a 100644
--- a/tests/blackcore/test_blackcore.pro
+++ b/tests/blackcore/test_blackcore.pro
@@ -6,24 +6,17 @@ TEMPLATE = app
 CONFIG   += console
 CONFIG   -= app_bundle
 
-DEPENDPATH += . ../../src/blackmisc
+DEPENDPATH += . ../../src
 INCLUDEPATH += . ../../src
 
 HEADERS += *.h
 SOURCES += *.cpp
 
-win32-msvc* {
-    PRE_TARGETDEPS +=  ../../lib/blackmisc.lib
-    PRE_TARGETDEPS +=  ../../lib/blackcore.lib
-    LIBS += ../../lib/blackmisc.lib
-    LIBS += ../../lib/blackcore.lib
-}
+LIBS += -L../../lib -lblackcore -lblackmisc
 
-!win32-msvc* {
-    PRE_TARGETDEPS += ../../lib/libblackmisc.a
-    PRE_TARGETDEPS += ../../lib/libblackcore.a
-    LIBS += ../../lib/libblackmisc.a
-    LIBS += ../../lib/libblackcore.a
-}
+win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib \
+                                     ../../lib/blackcore.lib
+else:              PRE_TARGETDEPS += ../../lib/libblackmisc.a \
+                                     ../../lib/libblackcore.a
 
 DESTDIR = ../../bin
diff --git a/tests/blackmisc/test_blackmisc.pro b/tests/blackmisc/test_blackmisc.pro
index 68427a185..dbbab21ba 100644
--- a/tests/blackmisc/test_blackmisc.pro
+++ b/tests/blackmisc/test_blackmisc.pro
@@ -6,20 +6,15 @@ TEMPLATE = app
 CONFIG   += console
 CONFIG   -= app_bundle
 
-DEPENDPATH += . ../../src/blackmisc
+DEPENDPATH += . ../../src
 INCLUDEPATH += . ../../src
 
 HEADERS += *.h
 SOURCES += *.cpp
 
-win32-msvc* {
-    PRE_TARGETDEPS +=  ../../lib/blackmisc.lib
-    LIBS += ../../lib/blackmisc.lib
-}
+LIBS += -L../../lib -lblackmisc
 
-!win32-msvc* {
-    PRE_TARGETDEPS += ../../lib/libblackmisc.a
-    LIBS += ../../lib/libblackmisc.a
-}
+win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib
+else:              PRE_TARGETDEPS += ../../lib/libblackmisc.a
 
 DESTDIR = ../../bin