refs #403 refactor project files

* Use source path and build path instead of relative ones
* Unify pre target dependencies in libraries.pri
This commit is contained in:
Roland Winklmeier
2015-04-10 21:33:46 +02:00
parent b042fa068b
commit 793fcbfd15
25 changed files with 195 additions and 238 deletions

View File

@@ -1,5 +1,5 @@
include (../../../../config.pri)
include (../../../../build.pri)
include ($$SourceRoot/config.pri)
include ($$SourceRoot/build.pri)
QT += core dbus gui network concurrent xml
@@ -14,18 +14,13 @@ LIBS += -lsimulator_fscommon -lFSUIPC_User -luuid
# required for FSUIPC
win32:!win32-g++*: QMAKE_LFLAGS += /NODEFAULTLIB:LIBC.lib
DEPENDPATH += . ../../../../src
INCLUDEPATH += . ../../../../src
DEPENDPATH += . $$SourceRoot/src
INCLUDEPATH += . $$SourceRoot/src
LIBS += -ldxguid -lole32
SOURCES += *.cpp
HEADERS += *.h
win32:!win32-g++*: PRE_TARGETDEPS += ../../../../lib/blackmisc.lib \
../../../../lib/blackcore.lib
else: PRE_TARGETDEPS += ../../../../lib/libblackmisc.a \
../../../../lib/libblackcore.a
DESTDIR = ../../../../bin/plugins/simulator
include (../../../../libraries.pri)
DESTDIR = $$BuildRoot/bin/plugins/simulator
include ($$SourceRoot/libraries.pri)

View File

@@ -1,5 +1,5 @@
include (../../../../config.pri)
include (../../../../build.pri)
include ($$SourceRoot/config.pri)
include ($$SourceRoot/build.pri)
QT += core dbus concurrent xml
@@ -14,17 +14,11 @@ LIBS += -lFSUIPC_User
# required for FSUIPC
win32:!win32-g++*: QMAKE_LFLAGS += /NODEFAULTLIB:LIBC.lib
DEPENDPATH += . ../../../../src
INCLUDEPATH += . ../../../../src
DEPENDPATH += . $$SourceRoot/src
INCLUDEPATH += . $$SourceRoot/src
SOURCES += *.cpp
HEADERS += *.h
win32:!win32-g++*: PRE_TARGETDEPS += ../../../../lib/blackmisc.lib \
../../../../lib/blackcore.lib
else: PRE_TARGETDEPS += ../../../../lib/libblackmisc.a \
../../../../lib/libblackcore.a
DESTDIR = ../../lib
DESTDIR = ../../../../lib
include (../../../../libraries.pri)
DESTDIR = $$BuildRoot/lib
include ($$SourceRoot/libraries.pri)

View File

@@ -1,5 +1,5 @@
include (../../../../config.pri)
include (../../../../build.pri)
include ($$SourceRoot/config.pri)
include ($$SourceRoot/build.pri)
QT += core dbus gui network concurrent xml
@@ -14,18 +14,13 @@ LIBS += -lsimulator_fscommon -lSimConnect -lFSUIPC_User
# required for FSUIPC
win32:!win32-g++*: QMAKE_LFLAGS += /NODEFAULTLIB:LIBC.lib
DEPENDPATH += . ../../../../src
INCLUDEPATH += . ../../../../src
DEPENDPATH += . $$SourceRoot/src
INCLUDEPATH += . $$SourceRoot/src
LIBS += -ldxguid -lole32
SOURCES += *.cpp
HEADERS += *.h
win32:!win32-g++*: PRE_TARGETDEPS += ../../../../lib/blackmisc.lib \
../../../../lib/blackcore.lib
else: PRE_TARGETDEPS += ../../../../lib/libblackmisc.a \
../../../../lib/libblackcore.a
DESTDIR = ../../../../bin/plugins/simulator
include (../../../../libraries.pri)
DESTDIR = $$BuildRoot/bin/plugins/simulator
include ($$SourceRoot/libraries.pri)

View File

@@ -1,5 +1,5 @@
include (../../../../config.pri)
include (../../../../build.pri)
include ($$SourceRoot/config.pri)
include ($$SourceRoot/build.pri)
QT += core dbus network
@@ -9,15 +9,11 @@ TEMPLATE = lib
CONFIG += plugin shared
CONFIG += blackmisc blackcore
DEPENDPATH += . ../../../../src
INCLUDEPATH += . ../../../../src
DEPENDPATH += . $$SourceRoot/src
INCLUDEPATH += . $$SourceRoot/src
SOURCES += *.cpp
HEADERS += *.h
#win32:!win32-g++*: PRE_TARGETDEPS += ../../../../lib/blackmisc.lib
#win32:!win32-g++*: PRE_TARGETDEPS += ../../../../lib/blackcore.lib
DESTDIR = ../../../../bin/plugins/simulator
include (../../../../libraries.pri)
DESTDIR = $$BuildRoot/bin/plugins/simulator
include ($$SourceRoot/libraries.pri)