mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2024-12-24 00:33:02 +03:00
Code

Fix build on Windows

Browse Source
This commit is contained in:
Arin Alexander 2016-04-02 06:05:41 +04:00
parent 2b0e211bc9
commit d3038816ca
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

@ -24,3 +24,4 @@ script:
notifications: notifications:
email: false email: false

6
demo_r1/demo_r1.pro
View File

@ -27,8 +27,8 @@ RESOURCES += \
r1.qrc r1.qrc
EXTRA_DIR += $$PWD/demo_reports EXTRA_DIR += $$PWD/demo_reports
DEST_DIR = $${BUILD_DIR}/$${BUILD_TYPE}/demo DEST_DIR = $${BUILD_DIR}/$${BUILD_TYPE}/demo_r1
REPORTS_DIR = $${DEST_DIR} REPORTS_DIR = $${DEST_DIR}/demo_reports
unix:{ unix:{
LIBS += -L$${BUILD_DIR}/$${BUILD_TYPE}/lib -llimereport LIBS += -L$${BUILD_DIR}/$${BUILD_TYPE}/lib -llimereport
@ -56,7 +56,7 @@ win32 {
DESTDIR = $$DEST_DIR DESTDIR = $$DEST_DIR
RC_FILE += mainicon.rc RC_FILE += mainicon.rc
QMAKE_POST_LINK += $$QMAKE_COPY_DIR $$quote($$EXTRA_DIR) $$quote($$REPORTS_DIR) $$escape_expand(\\n\\t) QMAKE_POST_LINK += $$QMAKE_COPY_DIR $$quote($$EXTRA_DIR\\*) $$quote($$REPORTS_DIR) $$escape_expand(\\n\\t)
contains(CONFIG,zint){ contains(CONFIG,zint){
LIBS += -L$${BUILD_DIR}/$${BUILD_TYPE}/lib -lQtZint LIBS += -L$${BUILD_DIR}/$${BUILD_TYPE}/lib -lQtZint
} }

6
demo_r2/demo_r2.pro
View File

@ -25,8 +25,8 @@ RESOURCES += \
demo_r2.qrc demo_r2.qrc
EXTRA_DIR += $$PWD/demo_reports EXTRA_DIR += $$PWD/demo_reports
DEST_DIR = $${BUILD_DIR}/$${BUILD_TYPE}/demo DEST_DIR = $${BUILD_DIR}/$${BUILD_TYPE}/demo_r2
REPORTS_DIR = $${DEST_DIR} REPORTS_DIR = $${DEST_DIR}/demo_reports
unix:{ unix:{
LIBS += -L$${BUILD_DIR}/$${BUILD_TYPE}/lib -llimereport LIBS += -L$${BUILD_DIR}/$${BUILD_TYPE}/lib -llimereport
@ -54,7 +54,7 @@ win32 {
DESTDIR = $$DEST_DIR DESTDIR = $$DEST_DIR
RC_FILE += mainicon.rc RC_FILE += mainicon.rc
QMAKE_POST_LINK += $$QMAKE_COPY_DIR $$quote($$EXTRA_DIR) $$quote($$REPORTS_DIR) $$escape_expand(\\n\\t) QMAKE_POST_LINK += $$QMAKE_COPY_DIR $$quote($$EXTRA_DIR\\*) $$quote($$REPORTS_DIR) $$escape_expand(\\n\\t)
contains(CONFIG,zint){ contains(CONFIG,zint){
LIBS += -L$${BUILD_DIR}/$${BUILD_TYPE}/lib -lQtZint LIBS += -L$${BUILD_DIR}/$${BUILD_TYPE}/lib -lQtZint
} }

4
limereport/limereport.pro
View File

@ -46,14 +46,14 @@ win32 {
EXTRA_FILES ~= s,/,\\,g EXTRA_FILES ~= s,/,\\,g
BUILD_DIR ~= s,/,\\,g BUILD_DIR ~= s,/,\\,g
DESTDIR = $${BUILD_DIR}/$${BUILD_TYPE}/lib DESTDIR = $${BUILD_DIR}/$${BUILD_TYPE}/lib
DEST_DIR = $$DESTDIR/include/ DEST_DIR = $$DESTDIR/include
DEST_DIR ~= s,/,\\,g DEST_DIR ~= s,/,\\,g
DEST_INCLUDE_DIR ~= s,/,\\,g DEST_INCLUDE_DIR ~= s,/,\\,g
for(FILE,EXTRA_FILES){ for(FILE,EXTRA_FILES){
QMAKE_POST_LINK += $$QMAKE_COPY $$quote($$FILE) $$quote($${DEST_INCLUDE_DIR}) $$escape_expand(\\n\\t) QMAKE_POST_LINK += $$QMAKE_COPY $$quote($$FILE) $$quote($${DEST_INCLUDE_DIR}) $$escape_expand(\\n\\t)
} }
QMAKE_POST_LINK += $(COPY_DIR) $$quote($${DEST_INCLUDE_DIR}) $$quote($${DEST_DIR}) QMAKE_POST_LINK += $$QMAKE_COPY_DIR $$quote($${DEST_INCLUDE_DIR}\\*) $$quote($${DEST_DIR})
} }
contains(CONFIG,zint){ contains(CONFIG,zint){