From ce55772f7a015f1a40cd65dc0a41c962043f2d6c Mon Sep 17 00:00:00 2001 From: Mathew Sutcliffe Date: Sat, 30 Mar 2013 16:53:35 +0000 Subject: [PATCH] fixed dependencies between generated MSVC project files --- .../Geodetic2Ecef/sample_geodetic2ecef.pro | 21 ++++---------- samples/Logging/sample_logging.pro | 15 +++------- samples/com_client/sample_com_client.pro | 17 ++++------- samples/com_server/sample_com_server.pro | 19 ++++-------- samples/config/sample_config.pro | 13 ++------- samples/interpolator/sample_interpolator.pro | 21 ++++---------- src/blackbox/blackbox.pro | 19 +++++------- src/blackd/blackd.pro | 29 +++++-------------- 8 files changed, 45 insertions(+), 109 deletions(-) diff --git a/samples/Geodetic2Ecef/sample_geodetic2ecef.pro b/samples/Geodetic2Ecef/sample_geodetic2ecef.pro index c3dccb6aa..14e317f79 100644 --- a/samples/Geodetic2Ecef/sample_geodetic2ecef.pro +++ b/samples/Geodetic2Ecef/sample_geodetic2ecef.pro @@ -11,23 +11,14 @@ DEPENDPATH += . ../../src INCLUDEPATH += . ../../src -SOURCES += main.cpp\ +SOURCES += main.cpp -win32-msvc* { - PRE_TARGETDEPS += ../../lib/blackmisc.lib \ - ../../lib/blackcore.lib +LIBS += -L../../lib -lblackmisc -lblackcore - LIBS += ../../lib/blackmisc.lib \ - ../../lib/blackcore.lib -} - -!win32-msvc* { - PRE_TARGETDEPS += ../../lib/libblackmisc.a \ - ../../lib/libblackcore.a - - LIBS += ../../lib/libblackmisc.a \ - ../../lib/libblackcore.a -} +win32: 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 795f495c4..8a9aae37b 100644 --- a/samples/Logging/sample_logging.pro +++ b/samples/Logging/sample_logging.pro @@ -11,19 +11,12 @@ DEPENDPATH += . ../../src INCLUDEPATH += . ../../src -SOURCES += main.cpp\ +SOURCES += main.cpp -win32-msvc* { - PRE_TARGETDEPS += ../../lib/blackmisc.lib \ +LIBS += -L../../lib -lblackmisc - LIBS += ../../lib/blackmisc.lib \ -} - -!win32-msvc* { - PRE_TARGETDEPS += ../../lib/libblackmisc.a \ - - LIBS += ../../lib/libblackmisc.a \ -} +win32: PRE_TARGETDEPS += ../../lib/blackmisc.lib +else: PRE_TARGETDEPS += ../../lib/libblackmisc.a DESTDIR = ../../bin diff --git a/samples/com_client/sample_com_client.pro b/samples/com_client/sample_com_client.pro index e4e5fe1f4..dbd3fcae9 100644 --- a/samples/com_client/sample_com_client.pro +++ b/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* { - PRE_TARGETDEPS += ../../lib/blackmisc.lib \ +LIBS += -L../../lib -lblackmisc - LIBS += ../../lib/blackmisc.lib \ -} - -!win32-msvc* { - PRE_TARGETDEPS += ../../lib/libblackmisc.a \ - - LIBS += ../../lib/libblackmisc.a \ -} +win32: 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 c5d8117ff..ca86554fd 100644 --- a/samples/com_server/sample_com_server.pro +++ b/samples/com_server/sample_com_server.pro @@ -11,22 +11,15 @@ DEPENDPATH += . ../../src INCLUDEPATH += . ../../src -SOURCES += main.cpp \ - server.cpp +SOURCES += main.cpp \ + server.cpp -HEADERS += server.h +HEADERS += server.h -win32-msvc* { - PRE_TARGETDEPS += ../../lib/blackmisc.lib \ +LIBS += -L../../lib -lblackmisc - LIBS += ../../lib/blackmisc.lib \ -} - -!win32-msvc* { - PRE_TARGETDEPS += ../../lib/libblackmisc.a \ - - LIBS += ../../lib/libblackmisc.a \ -} +win32: 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 b3be69e9b..ac9d8c880 100644 --- a/samples/config/sample_config.pro +++ b/samples/config/sample_config.pro @@ -10,17 +10,10 @@ INCLUDEPATH += . ../../src SOURCES += main.cpp\ -win32-msvc* { - PRE_TARGETDEPS += ../../lib/blackmisc.lib \ +LIBS += -L../../lib -lblackmisc - LIBS += ../../lib/blackmisc.lib \ -} - -!win32-msvc* { - PRE_TARGETDEPS += ../../lib/libblackmisc.a \ - - LIBS += ../../lib/libblackmisc.a \ -} +win32: 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 371bdfd05..270978ab1 100644 --- a/samples/interpolator/sample_interpolator.pro +++ b/samples/interpolator/sample_interpolator.pro @@ -11,23 +11,14 @@ DEPENDPATH += . ../../src INCLUDEPATH += . ../../src -SOURCES += main.cpp\ +SOURCES += main.cpp -win32-msvc* { - PRE_TARGETDEPS += ../../lib/blackmisc.lib \ - ../../lib/blackcore.lib +LIBS += -L../../lib -lblackmisc -lblackcore - LIBS += ../../lib/blackmisc.lib \ - ../../lib/blackcore.lib -} - -!win32-msvc* { - PRE_TARGETDEPS += ../../lib/libblackmisc.a \ - ../../lib/libblackcore.a - - LIBS += ../../lib/libblackmisc.a \ - ../../lib/libblackcore.a -} +win32: 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 f3ec3e901..b26749626 100644 --- a/src/blackbox/blackbox.pro +++ b/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* { - 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: 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 be3079e58..74ccf1a20 100644 --- a/src/blackd/blackd.pro +++ b/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\ - blackd.cpp \ +SOURCES += main.cpp \ + blackd.cpp \ qt_displayer.cpp \ HEADERS += blackd.h \ @@ -22,24 +19,14 @@ HEADERS += blackd.h \ FORMS += blackd.ui -RESOURCES += \ - blackd.qrc +RESOURCES += blackd.qrc -win32-msvc* { - PRE_TARGETDEPS += ../../lib/blackmisc.lib \ - ../../lib/blackcore.lib +LIBS += -L../../lib -lblackmisc -lblackcore - LIBS += ../../lib/blackmisc.lib \ - ../../lib/blackcore.lib -} - -!win32-msvc* { - PRE_TARGETDEPS += ../../lib/libblackmisc.a \ - ../../lib/libblackcore.a - - LIBS += ../../lib/libblackmisc.a \ - ../../lib/libblackcore.a -} +win32: PRE_TARGETDEPS += ../../lib/blackmisc.lib \ + ../../lib/blackcore.lib +else: PRE_TARGETDEPS += ../../lib/libblackmisc.a \ + ../../lib/libblackcore.a DESTDIR = ../../bin