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

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

Browse Source
This commit is contained in:
Mathew Sutcliffe
2013-04-29 23:14:42 +01:00
parent 92c9b81683
commit 3c2b894c93
13 changed files with 73 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/blackbox/blackbox.pro
View File

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

21
src/blackd/blackd.pro
View File

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