Blunde1 · Blunde1 · Oct 1, 2019 · Oct 2, 2019 · Oct 2, 2019 · Oct 2, 2019
diff --git a/.travis.yml b/.travis.yml
@@ -3,6 +3,7 @@
 language: R
 cache: packages
 before_install:
+ - cp -r inst/include R-package/include
  - cd R-package
 
 warnings_are_errors: false
diff --git a/R-package/src/Makevars b/R-package/src/Makevars
@@ -6,5 +6,11 @@
 ## enable compilation with C++11 (or even C++14) where available
 #CXX_STD = CXX11
 
-PKG_CPPFLAGS = -I../inst/include
+# old, works locally
+PKG_CPPFLAGS = -I../inst/include -I../include
+
+#PKGROOT=../../
+
+#PKG_CPPFLAGS=  -I$(PKGROOT)/inst/include## -I../../inst/include
+
 PKG_CXXFLAGS = -std=c++11
diff --git a/R-package/src/Makevars.win b/R-package/src/Makevars.win
@@ -5,5 +5,18 @@
 ## With R 3.1.0 or later, you can uncomment the following line to tell R to 
 ## enable compilation with C++11 (or even C++14) where available
 #CXX_STD = CXX11
-PKG_CPPFLAGS = -I../inst/include
-PKG_CXXFLAGS = -std=c++11
+
+#PKGROOT=./
+
+#.PHONY: all gbtlib
+#all: $(SHLIB)
+#$(SHLIB): gbtlib
+#gbtlib:
+#	cp -r ../../inst/include .
+
+#PKG_CPPFLAGS = -I$(PKGROOT)/inst/include 
+PKG_CPPFLAGS = -I../../inst/include -I../inst/include -I../include
+
+PKG_CXXFLAGS = -std=c++11
+
+#$(OBJECTS) : gbtlib
diff --git a/R-package/src/gbtorch.cpp b/R-package/src/gbtorch.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "gbtorch.hpp"
-
+ 
 
 
 //' @export ENSEMBLE

diff --git a/R-package/inst/include/ensemble.hpp → inst/include/ensemble.hpp b/R-package/inst/include/ensemble.hpp → inst/include/ensemble.hpp
diff --git a/R-package/inst/include/external_rcpp.hpp → inst/include/external_rcpp.hpp b/R-package/inst/include/external_rcpp.hpp → inst/include/external_rcpp.hpp
diff --git a/R-package/inst/include/gbtorch.hpp → inst/include/gbtorch.hpp b/R-package/inst/include/gbtorch.hpp → inst/include/gbtorch.hpp
diff --git a/R-package/inst/include/gtbic.hpp → inst/include/gtbic.hpp b/R-package/inst/include/gtbic.hpp → inst/include/gtbic.hpp
diff --git a/R-package/inst/include/loss_functions.hpp → inst/include/loss_functions.hpp b/R-package/inst/include/loss_functions.hpp → inst/include/loss_functions.hpp
diff --git a/R-package/inst/include/node.hpp → inst/include/node.hpp b/R-package/inst/include/node.hpp → inst/include/node.hpp
diff --git a/R-package/inst/include/order_gamma.hpp → inst/include/order_gamma.hpp b/R-package/inst/include/order_gamma.hpp → inst/include/order_gamma.hpp
diff --git a/R-package/inst/include/parameters.hpp → inst/include/parameters.hpp b/R-package/inst/include/parameters.hpp → inst/include/parameters.hpp
diff --git a/R-package/inst/include/sorting.hpp → inst/include/sorting.hpp b/R-package/inst/include/sorting.hpp → inst/include/sorting.hpp
diff --git a/R-package/inst/include/tree.hpp → inst/include/tree.hpp b/R-package/inst/include/tree.hpp → inst/include/tree.hpp
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,7 +6,7 @@
		*/

		#include "gbtorch.hpp"




		//' @export ENSEMBLE
Expand Down