Update Fork

This commit is contained in:
newsages
2016-03-24 15:10:44 +01:00
parent d80eb334ff
commit 7ed8d40785
7 changed files with 66 additions and 59 deletions

View File

@@ -5,7 +5,11 @@ greaterThan(QT_MAJOR_VERSION, 4){
QT += widgets printsupport
DEFINES += HAVE_QT5
}
CONFIG += app_bundle
macx{
CONFIG += app_bundle
}
TARGET = LRDemo
TEMPLATE = app
@@ -23,6 +27,8 @@ RESOURCES += \
r1.qrc
EXTRA_DIR += $$PWD/demo_reports/*
DEST_DIR = $${BUILD_DIR}/demo/$${BUILD_TYPE}
REPORTS_DIR = $${DEST_DIR}/demo_reports/
CONFIG(release, debug|release){
message(Release)
@@ -32,10 +38,7 @@ CONFIG(release, debug|release){
BUILD_TYPE = debug
}
unix{
UNIX_DIR = $$PWD/../build/unix
DEST_DIR = $${UNIX_DIR}/$${BUILD_TYPE}/demo
REPORTS_DIR = $${DEST_DIR}/demo_reports/
unix{
MOC_DIR = $${OUT_PWD}/moc
UI_DIR = $${OUT_PWD}/ui
UI_HEADERS_DIR = $${OUT_PWD}/ui
@@ -43,25 +46,18 @@ unix{
OBJECTS_DIR = $${OUT_PWD}/obj
RCC_DIR = $${OUT_PWD}/rcc
LIBS += -L$$PWD/../build/unix/$${BUILD_TYPE}/lib -llimereport
LIBS += -L$${BUILD_DIR}/lib/$${BUILD_TYPE} -llimereport
contains(CONFIG,zint){
LIBS += -L$$PWD/../build/unix/$${BUILD_TYPE}/lib -lQtZint
LIBS += -L$${BUILD_DIR}/lib/$${BUILD_TYPE} -lQtZint
}
DESTDIR = $$DEST_DIR
QMAKE_POST_LINK += mkdir -p $$quote($$REPORTS_DIR) | $$QMAKE_COPY_DIR $$quote($$EXTRA_DIR) $$quote($$REPORTS_DIR) $$escape_expand(\n\t)
QMAKE_LFLAGS += -Wl,--rpath=\\\$\$ORIGIN
QMAKE_LFLAGS += -Wl,--rpath=\\\$\$ORIGIN/lib
QMAKE_LFLAGS += -Wl,--rpath=\\\$\$ORIGIN/../lib
QMAKE_LFLAGS_RPATH += #. .. ./libs
target.path = $${DEST_DIR}
}
win32 {
WIN32_DIR = $$PWD/../build/win32
EXTRA_DIR ~= s,/,\\,g
DEST_DIR = $${WIN32_DIR}/$${BUILD_TYPE}/demo
DEST_DIR ~= s,/,\\,g
REPORTS_DIR = $${DEST_DIR}/demo_reports/
DEST_DIR ~= s,/,\\,g
REPORTS_DIR ~= s,/,\\,g
MOC_DIR = $${OUT_PWD}/moc
@@ -75,7 +71,7 @@ win32 {
RC_FILE += mainicon.rc
QMAKE_POST_LINK += $$QMAKE_COPY_DIR $$quote($$EXTRA_DIR) $$quote($$REPORTS_DIR) $$escape_expand(\\n\\t)
LIBS += -L$$PWD/../build/win32/$${BUILD_TYPE}/lib -llimereport
LIBS += -L$${BUILD_DIR}/lib/$${BUILD_TYPE} -llimereport
}
unix{