fixed qmake files to support GNU make _and_ MSVC (discussed in #34)

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
 

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

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
+
+
+

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
 

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
+
+
+

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

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
+
+
+

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
+
+
+

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
+
+
+

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

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
 

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

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