From ce01b9a9abb307aa251b4cf62cb484784ffdfd1c Mon Sep 17 00:00:00 2001 From: Arin Alexander Date: Fri, 20 May 2016 19:13:14 +0400 Subject: [PATCH] MinGW build fixed --- 3rdparty/zint-2.4.4/backend_qt4/Zint.pro | 2 +- demo_r2/demo_r2.pro | 4 ++-- limereport/limereport.pro | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/3rdparty/zint-2.4.4/backend_qt4/Zint.pro b/3rdparty/zint-2.4.4/backend_qt4/Zint.pro index eab6525..b579cde 100644 --- a/3rdparty/zint-2.4.4/backend_qt4/Zint.pro +++ b/3rdparty/zint-2.4.4/backend_qt4/Zint.pro @@ -96,7 +96,7 @@ SOURCES += \ DESTDIR = $${DEST_LIBS} -DLLDESTDIR = $${DESTDIR} +#DLLDESTDIR = $${DESTDIR} unix { target.path = $${DESTDIR} INSTALLS = target diff --git a/demo_r2/demo_r2.pro b/demo_r2/demo_r2.pro index a0cef4d..cec1043 100644 --- a/demo_r2/demo_r2.pro +++ b/demo_r2/demo_r2.pro @@ -31,7 +31,6 @@ unix:{ LIBS += -L$${DEST_LIBS} -lQtZint } 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) linux{ #Link share lib to ../lib rpath @@ -52,10 +51,11 @@ win32 { DESTDIR = $$DEST_DIR 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){ LIBS += -L$${DEST_LIBS} -lQtZint } LIBS += -L$${DEST_LIBS} -llimereport + + QMAKE_POST_LINK += $$QMAKE_COPY_DIR \"$$EXTRA_DIR\" \"$$REPORTS_DIR\\demo_reports\" $$escape_expand(\\n\\t) } diff --git a/limereport/limereport.pro b/limereport/limereport.pro index c10dde9..f287154 100644 --- a/limereport/limereport.pro +++ b/limereport/limereport.pro @@ -51,9 +51,9 @@ win32 { DEST_INCLUDE_DIR ~= s,/,\\,g 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){