updates build scripts: adds version number and removes no longer needed include paths.

This commit is contained in:
mfreiholz 2016-10-23 10:35:09 +02:00
parent 70e614b561
commit 5dc8c616e9
2 changed files with 7 additions and 13 deletions

View File

@ -1,13 +1,13 @@
TARGET = AdvancedDockingSystem
#VERSION = 0.1.0
TEMPLATE = lib
VERSION = 1.0.0
CONFIG += adsBuildShared
QT += core gui
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
greaterThan(QT_MAJOR_VERSION, 4): DEFINES += ADS_NAMESPACE_ENABLED
TEMPLATE = lib
adsBuildShared {
CONFIG += shared
DEFINES += ADS_EXPORT
@ -16,7 +16,6 @@ adsBuildShared {
CONFIG += staticlib
}
INCLUDEPATH += $$PWD/src
INCLUDEPATH += $$PWD/include
windows {
@ -33,4 +32,4 @@ windows {
RESOURCES += \
res/ads.qrc
include(AdvancedDockingSystem.pri)
include(AdvancedDockingSystem.pri)

View File

@ -2,11 +2,6 @@ TARGET = AdvancedDockingSystemDemo
QT += core gui
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
TEMPLATE = app
INCLUDEPATH += $$PWD/src
greaterThan(QT_MAJOR_VERSION, 4): DEFINES += ADS_NAMESPACE_ENABLED
windows {
@ -52,9 +47,9 @@ FORMS += \
#else:unix: PRE_TARGETDEPS += $$OUT_PWD/../AdvancedDockingSystem/libAdvancedDockingSystem.a
# Dependency: AdvancedDockingSystem (shared)
win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../AdvancedDockingSystem/release/ -lAdvancedDockingSystem
else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../AdvancedDockingSystem/debug/ -lAdvancedDockingSystem
else:unix: LIBS += -L$$OUT_PWD/../AdvancedDockingSystem/ -lAdvancedDockingSystem
win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../AdvancedDockingSystem/release/ -lAdvancedDockingSystem1
else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../AdvancedDockingSystem/debug/ -lAdvancedDockingSystem1
else:unix: LIBS += -L$$OUT_PWD/../AdvancedDockingSystem/ -lAdvancedDockingSystem1
INCLUDEPATH += $$PWD/../AdvancedDockingSystem/include
DEPENDPATH += $$PWD/../AdvancedDockingSystem/include