From b455dc01e4110f3a43134f4df1ed4028ba2086f4 2012-02-07 08:29:36
From: Jani Honkonen <jani.honkonen@digia.com>
Date: 2012-02-07 08:29:36
Subject: [PATCH] Bubblegum fix for vs2010 integrated build

---

diff --git a/integrated.pri b/integrated.pri
index 8eb4658..6cbd370 100644
--- a/integrated.pri
+++ b/integrated.pri
@@ -1,8 +1,16 @@
 integrated_build:{
     message('Internal build within charts core source tree')
     INCLUDEPATH += $$CHART_BUILD_HEADER_DIR
-    LIBS += -L $$CHART_BUILD_LIB_DIR -Wl,-rpath,$$CHART_BUILD_LIB_DIR
+
+    !win32: {
+        # What is the purpose of this? We are already adding our lib depending on the release type below.
+        # Plus this causes an error in vs2010 build:
+        #    LINK : fatal error LNK1146: no argument specified with option '/LIBPATH:'
+        LIBS += -L $$CHART_BUILD_LIB_DIR -Wl,-rpath,$$CHART_BUILD_LIB_DIR
+    }
+
     DESTDIR = $$CHART_BUILD_BIN_DIR
+
     CONFIG(debug, debug|release) {
         LIBS += -lQtCommercialChartd
         #this is ugly hack to work around missing rpath, it simply copies lib