mirrors/Qt-Advanced-Docking-System
1
0
Fork 0
mirror of https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System.git synced 2024-11-15 21:25:44 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
AdvancedDockingSystem/AdvancedDockingSystem.pro
View File

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

11
AdvancedDockingSystemDemo/AdvancedDockingSystemDemo.pro
View File

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