From 081320d43dc51f075d2e9bd4a1cd7c8e384c3c83 Mon Sep 17 00:00:00 2001
From: Mark Liversedge <liversedge@gmail.com>
Date: Tue, 26 Apr 2016 12:23:13 +0100
Subject: [PATCH] R Restructure src

.. and fix Linux build of R shared library
---
 src/{Charts => R}/RGraphicsDevice.cpp |  0
 src/{Charts => R}/RGraphicsDevice.h   |  0
 src/{Charts => R}/RTool.cpp           |  0
 src/{Charts => R}/RTool.h             |  0
 src/src.pro                           | 14 +++++++++-----
 5 files changed, 9 insertions(+), 5 deletions(-)
 rename src/{Charts => R}/RGraphicsDevice.cpp (100%)
 rename src/{Charts => R}/RGraphicsDevice.h (100%)
 rename src/{Charts => R}/RTool.cpp (100%)
 rename src/{Charts => R}/RTool.h (100%)

diff --git a/src/Charts/RGraphicsDevice.cpp b/src/R/RGraphicsDevice.cpp
similarity index 100%
rename from src/Charts/RGraphicsDevice.cpp
rename to src/R/RGraphicsDevice.cpp
diff --git a/src/Charts/RGraphicsDevice.h b/src/R/RGraphicsDevice.h
similarity index 100%
rename from src/Charts/RGraphicsDevice.h
rename to src/R/RGraphicsDevice.h
diff --git a/src/Charts/RTool.cpp b/src/R/RTool.cpp
similarity index 100%
rename from src/Charts/RTool.cpp
rename to src/R/RTool.cpp
diff --git a/src/Charts/RTool.h b/src/R/RTool.h
similarity index 100%
rename from src/Charts/RTool.h
rename to src/R/RTool.h
diff --git a/src/src.pro b/src/src.pro
index 265cb110f..4ea156bd0 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -79,7 +79,7 @@ lessThan(QT_MAJOR_VERSION, 5) {
 ###=======================================================================
 ### Directory Structure - Split into subdirs to be more manageable
 ###=======================================================================
-INCLUDEPATH += ./ANT ./Train ./FileIO ./Cloud ./Charts ./Metrics ./Gui ./Core
+INCLUDEPATH += ./ANT ./Train ./FileIO ./Cloud ./Charts ./Metrics ./Gui ./Core ./R
 
 
 ###=======================================================================
@@ -270,9 +270,13 @@ contains(DEFINES, "GC_WANT_R") {
     QMAKE_CXXFLAGS +=       $$RCPPWARNING $$RCPPFLAGS $$RCPPINCL $$RINSIDEINCL
     LIBS +=         		$$RLDFLAGS $$RBLAS $$RLAPACK $$RCPPLIBS $$RINSIDELIBS
 
-    ## Chart, Tool (R api), Grahics (R GraphicDevice and Qt canvas widget)
-    HEADERS += Charts/RChart.h Charts/RTool.h Charts/RGraphicsDevice.h Charts/RCanvas.h
-    SOURCES += Charts/RChart.cpp Charts/RTool.cpp Charts/RGraphicsDevice.cpp Charts/RCanvas.cpp
+    ## R integration
+    HEADERS += R/RTool.h R/RGraphicsDevice.h
+    SOURCES += R/RTool.cpp R/RGraphicsDevice.cpp
+
+    ## R based charts
+    HEADERS += Charts/RChart.h Charts/RCanvas.h
+    SOURCES += Charts/RChart.cpp Charts/RCanvas.cpp
 
     # how to build an R shlib from source, listed in SOURCE_RSHLIBS below
     # we only have one for now, but could possibly add more. This is to
@@ -280,7 +284,7 @@ contains(DEFINES, "GC_WANT_R") {
     rshlib.name = rshlib
     rshlib.input = SOURCE_RSHLIBS
     rshlib.dependency_type = TYPE_C
-    rshlib.CONFIG += no_link
+    macx { rshlib.CONFIG += no_link }
     unix { rshlib.output = $${OUT_PWD}/${QMAKE_FILE_BASE}.so }
     win32 { rshlib.output = $${OUT_PWD}/${QMAKE_FILE_BASE}.dll }
     rshlib.commands = $$R_HOME/bin/R CMD SHLIB ${QMAKE_FILE_IN} && $${QMAKE_COPY} ${QMAKE_FILE_PATH}/${QMAKE_FILE_OUT} $${OUT_PWD}