fixed dependencies between generated MSVC project files

samples/Geodetic2Ecef/sample_geodetic2ecef.pro

@@ -11,23 +11,14 @@ DEPENDPATH += . ../../src
 
 INCLUDEPATH += . ../../src
 
-SOURCES += main.cpp\
+SOURCES += main.cpp
 
-win32-msvc* {
+LIBS    += -L../../lib -lblackmisc -lblackcore
-    PRE_TARGETDEPS += ../../lib/blackmisc.lib \
-                      ../../lib/blackcore.lib
 
-    LIBS += ../../lib/blackmisc.lib \
+win32:  PRE_TARGETDEPS += ../../lib/blackmisc.lib \
-            ../../lib/blackcore.lib
+                          ../../lib/blackcore.lib
-}
+else:   PRE_TARGETDEPS += ../../lib/libblackmisc.a \
-
+                          ../../lib/libblackcore.a
-!win32-msvc* {
-    PRE_TARGETDEPS += ../../lib/libblackmisc.a \
-                      ../../lib/libblackcore.a
-
-    LIBS += ../../lib/libblackmisc.a \
-            ../../lib/libblackcore.a
-}
 
 DESTDIR = ../../bin
 

samples/Logging/sample_logging.pro

@@ -11,19 +11,12 @@ DEPENDPATH += . ../../src
 
 INCLUDEPATH += . ../../src
 
-SOURCES += main.cpp\
+SOURCES += main.cpp
 
-win32-msvc* {
+LIBS    += -L../../lib -lblackmisc
-    PRE_TARGETDEPS += ../../lib/blackmisc.lib \
 
-    LIBS += ../../lib/blackmisc.lib \
+win32:  PRE_TARGETDEPS += ../../lib/blackmisc.lib
-}
+else:   PRE_TARGETDEPS += ../../lib/libblackmisc.a
-
-!win32-msvc* {
-    PRE_TARGETDEPS += ../../lib/libblackmisc.a \
-
-    LIBS += ../../lib/libblackmisc.a \
-}
 
 DESTDIR = ../../bin
 

samples/com_client/sample_com_client.pro

@@ -13,21 +13,14 @@ DEPENDPATH += . ../../src
 INCLUDEPATH += . ../../src
 
 SOURCES += main.cpp\
-        client.cpp
+           client.cpp
 
-HEADERS  += client.h
+HEADERS += client.h
 
-win32-msvc* {
+LIBS    += -L../../lib -lblackmisc
-    PRE_TARGETDEPS += ../../lib/blackmisc.lib \
 
-    LIBS += ../../lib/blackmisc.lib \
+win32:  PRE_TARGETDEPS += ../../lib/blackmisc.lib
-}
+else:   PRE_TARGETDEPS += ../../lib/libblackmisc.a
-
-!win32-msvc* {
-    PRE_TARGETDEPS += ../../lib/libblackmisc.a \
-
-    LIBS += ../../lib/libblackmisc.a \
-}
 
 DESTDIR = ../../bin
 

samples/com_server/sample_com_server.pro

@@ -11,22 +11,15 @@ DEPENDPATH += . ../../src
 
 INCLUDEPATH += . ../../src
 
-SOURCES +=  main.cpp \
+SOURCES += main.cpp \
-            server.cpp
+           server.cpp
 
-HEADERS  += server.h
+HEADERS += server.h
 
-win32-msvc* {
+LIBS    += -L../../lib -lblackmisc
-    PRE_TARGETDEPS += ../../lib/blackmisc.lib \
 
-    LIBS += ../../lib/blackmisc.lib \
+win32:  PRE_TARGETDEPS += ../../lib/blackmisc.lib
-}
+else:   PRE_TARGETDEPS += ../../lib/libblackmisc.a
-
-!win32-msvc* {
-    PRE_TARGETDEPS += ../../lib/libblackmisc.a \
-
-    LIBS += ../../lib/libblackmisc.a \
-}
 
 DESTDIR = ../../bin
 

samples/config/sample_config.pro

@@ -10,17 +10,10 @@ INCLUDEPATH += . ../../src
 
 SOURCES += main.cpp\
 
-win32-msvc* {
+LIBS    += -L../../lib -lblackmisc
-    PRE_TARGETDEPS += ../../lib/blackmisc.lib \
 
-    LIBS += ../../lib/blackmisc.lib \
+win32:  PRE_TARGETDEPS += ../../lib/blackmisc.lib
-}
+else:   PRE_TARGETDEPS += ../../lib/libblackmisc.a
-
-!win32-msvc* {
-    PRE_TARGETDEPS += ../../lib/libblackmisc.a \
-
-    LIBS += ../../lib/libblackmisc.a \
-}
 
 DESTDIR = ../../bin
 

samples/interpolator/sample_interpolator.pro

@@ -11,23 +11,14 @@ DEPENDPATH += . ../../src
 
 INCLUDEPATH += . ../../src
 
-SOURCES += main.cpp\
+SOURCES += main.cpp
 
-win32-msvc* {
+LIBS    += -L../../lib -lblackmisc -lblackcore
-    PRE_TARGETDEPS += ../../lib/blackmisc.lib \
-                      ../../lib/blackcore.lib
 
-    LIBS += ../../lib/blackmisc.lib \
+win32:  PRE_TARGETDEPS += ../../lib/blackmisc.lib \
-            ../../lib/blackcore.lib
+                          ../../lib/blackcore.lib
-}
+else:   PRE_TARGETDEPS += ../../lib/libblackmisc.a \
-
+                          ../../lib/libblackcore.a
-!win32-msvc* {
-    PRE_TARGETDEPS += ../../lib/libblackmisc.a \
-                      ../../lib/libblackcore.a
-
-    LIBS += ../../lib/libblackmisc.a \
-            ../../lib/libblackcore.a
-}
 
 DESTDIR = ../../bin
 

src/blackbox/blackbox.pro

@@ -1,4 +1,4 @@
-QT       += core gui xml svg network
+QT      += core gui xml svg network
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
@@ -7,25 +7,20 @@ INCLUDEPATH += . ..
 TARGET = BlackBox
 TEMPLATE = app
 
-SOURCES += main.cpp\
+SOURCES += main.cpp \
         blackbox.cpp \
         dialog_chat.cpp \
         dialog_connect.cpp
 
-HEADERS  += blackbox.h \
+HEADERS += blackbox.h \
         dialog_chat.h \
         dialog_connect.h
 
-FORMS    += blackbox.ui dialog_connect.ui dialog_chat.ui
+FORMS   += blackbox.ui dialog_connect.ui dialog_chat.ui
 
-win32-msvc* {
+LIBS    += -L../../lib -lblackmisc
-    PRE_TARGETDEPS  += ../../lib/blackmisc.lib
-    LIBS            += ../../lib/blackmisc.lib
-}
 
-!win32-msvc* {
+win32:  PRE_TARGETDEPS += ../../lib/blackmisc.lib
-    PRE_TARGETDEPS  += ../../lib/libblackmisc.a
+else:   PRE_TARGETDEPS += ../../lib/libblackmisc.a
-    LIBS            += ../../lib/libblackmisc.a
-}
 
 DESTDIR = ../../bin

src/blackd/blackd.pro

@@ -3,9 +3,6 @@ QT       += core gui xml svg network
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
 
-PRE_TARGETDEPS += ../../lib/blackmisc.lib \
-                  ../../lib/blackcore.lib
-
 TARGET = blackd
 TEMPLATE = app
 
@@ -13,8 +10,8 @@ DEPENDPATH += . ..
 
 INCLUDEPATH += ..
 
-SOURCES += main.cpp\
+SOURCES += main.cpp \
-        blackd.cpp \
+    blackd.cpp \
     qt_displayer.cpp \
 
 HEADERS  += blackd.h \
@@ -22,24 +19,14 @@ HEADERS  += blackd.h \
 
 FORMS    += blackd.ui
 
-RESOURCES += \
+RESOURCES += blackd.qrc
-    blackd.qrc
 
-win32-msvc* {
+LIBS += -L../../lib -lblackmisc -lblackcore
-    PRE_TARGETDEPS += ../../lib/blackmisc.lib \
-                      ../../lib/blackcore.lib
 
-    LIBS += ../../lib/blackmisc.lib \
+win32:  PRE_TARGETDEPS += ../../lib/blackmisc.lib \
-            ../../lib/blackcore.lib
+                          ../../lib/blackcore.lib
-}
+else:   PRE_TARGETDEPS += ../../lib/libblackmisc.a \
-
+                          ../../lib/libblackcore.a
-!win32-msvc* {
-    PRE_TARGETDEPS += ../../lib/libblackmisc.a \
-                      ../../lib/libblackcore.a
-
-    LIBS += ../../lib/libblackmisc.a \
-            ../../lib/libblackcore.a
-}
 
 DESTDIR = ../../bin