From ca1a700b61b503edd89e808e0dda78ed16d33020 Mon Sep 17 00:00:00 2001 From: Arin Alexander Date: Fri, 1 Apr 2016 19:46:42 +0400 Subject: [PATCH] Fix build on Windows --- demo_r1/demo_r1.pro | 3 +++ limereport/limereport.pro | 5 ++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/demo_r1/demo_r1.pro b/demo_r1/demo_r1.pro index 5591daf..0854a1a 100644 --- a/demo_r1/demo_r1.pro +++ b/demo_r1/demo_r1.pro @@ -57,5 +57,8 @@ win32 { RC_FILE += mainicon.rc QMAKE_POST_LINK += $$QMAKE_COPY_DIR $$quote($$EXTRA_DIR) $$quote($$REPORTS_DIR) $$escape_expand(\\n\\t) + contains(CONFIG,zint){ + LIBS += -L$${BUILD_DIR}/$${BUILD_TYPE}/lib -lQtZint + } LIBS += -L$${BUILD_DIR}/$${BUILD_TYPE}/lib -llimereport } diff --git a/limereport/limereport.pro b/limereport/limereport.pro index 309a17a..9cff1f5 100644 --- a/limereport/limereport.pro +++ b/limereport/limereport.pro @@ -32,7 +32,6 @@ unix:{ for(FILE,EXTRA_FILES){ QMAKE_POST_LINK += $$QMAKE_COPY $$quote($$FILE) $$quote($${DEST_INCLUDE_DIR}) $$escape_expand(\\n\\t) # inside of libs make /include/files } - } macx{ for(FILE,EXTRA_FILES){ @@ -40,7 +39,7 @@ unix:{ } QMAKE_POST_LINK += mkdir -p $$quote($${DESTDIR}/include) $$escape_expand(\\n\\t) } - QMAKE_POST_LINK += $(COPY_DIR) $$quote($${DEST_INCLUDE_DIR}*) $$quote($${DESTDIR}/include) + QMAKE_POST_LINK += $(COPY_DIR) $$quote($${DEST_INCLUDE_DIR}) $$quote($${DESTDIR}/include) } win32 { @@ -54,7 +53,7 @@ win32 { for(FILE,EXTRA_FILES){ 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 += $(COPY_DIR) $$quote($${DEST_INCLUDE_DIR}) $$quote($${DEST_DIR}) } contains(CONFIG,zint){