flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-22 14:55:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed dependencies between generated MSVC project files

Browse Source
This commit is contained in:
Mathew Sutcliffe
2013-03-30 16:53:35 +00:00
parent eea8405e1c
commit ce55772f7a
8 changed files with 45 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
samples/Geodetic2Ecef/sample_geodetic2ecef.pro
View File

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

15
samples/Logging/sample_logging.pro
View File

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

17
samples/com_client/sample_com_client.pro
View File

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

19
samples/com_server/sample_com_server.pro
View File

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

13
samples/config/sample_config.pro
View File

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

21
samples/interpolator/sample_interpolator.pro
View File

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

19
src/blackbox/blackbox.pro
View File

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

29
src/blackd/blackd.pro
View File

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