From 2679e0ec07cc8af99b4cee98e5520be6ddede189 Mon Sep 17 00:00:00 2001
From: Arin Alexander <arin_a@bk.ru>
Date: Thu, 24 Mar 2016 15:53:05 +0300
Subject: [PATCH] Fix build on Mac and "/" added to REPORTS_DIR

---
 demo_r1/demo_r1.pro       | 16 +++++++++-------
 limereport/limereport.pro |  7 ++++++-
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/demo_r1/demo_r1.pro b/demo_r1/demo_r1.pro
index 6ed3624..f721a9e 100644
--- a/demo_r1/demo_r1.pro
+++ b/demo_r1/demo_r1.pro
@@ -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,9 +38,7 @@ CONFIG(release, debug|release){
     BUILD_TYPE = debug
 }
 
-unix{
-    DEST_DIR       = $${BUILD_DIR}/demo/$${BUILD_TYPE}
-    REPORTS_DIR  = $${DEST_DIR}/demo_reports
+unix{    
     MOC_DIR        = $${OUT_PWD}/moc
     UI_DIR         = $${OUT_PWD}/ui
     UI_HEADERS_DIR = $${OUT_PWD}/ui
@@ -53,9 +57,7 @@ contains(CONFIG,zint){
 
 win32 {
     EXTRA_DIR ~= s,/,\\,g
-    DEST_DIR       = $${BUILD_DIR}/demo/$${BUILD_TYPE}
-    DEST_DIR      ~= s,/,\\,g
-    REPORTS_DIR  = $${DEST_DIR}/demo_reports
+    DEST_DIR ~= s,/,\\,g
     REPORTS_DIR ~= s,/,\\,g
 
     MOC_DIR        = $${OUT_PWD}/moc
diff --git a/limereport/limereport.pro b/limereport/limereport.pro
index 1b0181b..3730421 100644
--- a/limereport/limereport.pro
+++ b/limereport/limereport.pro
@@ -13,7 +13,11 @@ CONFIG += lib
 CONFIG += dll
 CONFIG += create_prl
 CONFIG += link_prl
-CONFIG  -= app_bundle
+
+macx{
+    CONFIG  -= dll
+    CONFIG  += lib_bundle
+}
 
 DEFINES += LIMEREPORT_EXPORTS
 
@@ -87,6 +91,7 @@ contains(CONFIG,build_translations){
     }
 
     TRANSLATIONS = $$prependAll(LANGUAGES, $$TRANSLATIONS_PATH/limereport_,.ts)
+
     qtPrepareTool(LUPDATE, lupdate)
     ts.commands = $$LUPDATE $$PWD -ts $$TRANSLATIONS