mirror of
https://github.com/python-LimeReport/LimeReport.git
synced 2024-12-24 12:34:39 +03:00
MinGW build fixed
This commit is contained in:
parent
fdc03900ea
commit
ce01b9a9ab
2
3rdparty/zint-2.4.4/backend_qt4/Zint.pro
vendored
2
3rdparty/zint-2.4.4/backend_qt4/Zint.pro
vendored
@ -96,7 +96,7 @@ SOURCES += \
|
|||||||
|
|
||||||
|
|
||||||
DESTDIR = $${DEST_LIBS}
|
DESTDIR = $${DEST_LIBS}
|
||||||
DLLDESTDIR = $${DESTDIR}
|
#DLLDESTDIR = $${DESTDIR}
|
||||||
unix {
|
unix {
|
||||||
target.path = $${DESTDIR}
|
target.path = $${DESTDIR}
|
||||||
INSTALLS = target
|
INSTALLS = target
|
||||||
|
@ -31,7 +31,6 @@ unix:{
|
|||||||
LIBS += -L$${DEST_LIBS} -lQtZint
|
LIBS += -L$${DEST_LIBS} -lQtZint
|
||||||
}
|
}
|
||||||
DESTDIR = $$DEST_DIR
|
DESTDIR = $$DEST_DIR
|
||||||
# QMAKE_POST_LINK += mkdir -p $$quote($$REPORTS_DIR) |
|
|
||||||
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)
|
||||||
linux{
|
linux{
|
||||||
#Link share lib to ../lib rpath
|
#Link share lib to ../lib rpath
|
||||||
@ -52,10 +51,11 @@ 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\\demo_reports) $$escape_expand(\\n\\t)
|
|
||||||
contains(CONFIG,zint){
|
contains(CONFIG,zint){
|
||||||
LIBS += -L$${DEST_LIBS} -lQtZint
|
LIBS += -L$${DEST_LIBS} -lQtZint
|
||||||
}
|
}
|
||||||
LIBS += -L$${DEST_LIBS} -llimereport
|
LIBS += -L$${DEST_LIBS} -llimereport
|
||||||
|
|
||||||
|
QMAKE_POST_LINK += $$QMAKE_COPY_DIR \"$$EXTRA_DIR\" \"$$REPORTS_DIR\\demo_reports\" $$escape_expand(\\n\\t)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -51,9 +51,9 @@ win32 {
|
|||||||
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 \"$$FILE\" \"$${DEST_INCLUDE_DIR}\" $$escape_expand(\\n\\t)
|
||||||
}
|
}
|
||||||
QMAKE_POST_LINK += $$QMAKE_COPY_DIR $$quote($${DEST_INCLUDE_DIR}\\*) $$quote($${DEST_DIR})
|
QMAKE_POST_LINK += $$QMAKE_COPY_DIR \"$${DEST_INCLUDE_DIR}\" \"$${DEST_DIR}\"
|
||||||
}
|
}
|
||||||
|
|
||||||
contains(CONFIG,zint){
|
contains(CONFIG,zint){
|
||||||
|
Loading…
Reference in New Issue
Block a user