From b162acb85817489afacc2f0e32d132e7c71d13da Mon Sep 17 00:00:00 2001 From: "tqchen@graphlab.com" Date: Wed, 27 Aug 2014 19:30:09 -0700 Subject: [PATCH] adapt R package --- R-package/src/Makevars | 6 ++++-- R-package/src/Makevars.win | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/R-package/src/Makevars b/R-package/src/Makevars index 10b2661d0..17e236bf7 100644 --- a/R-package/src/Makevars +++ b/R-package/src/Makevars @@ -10,7 +10,7 @@ ifeq ($(no_omp),1) PKG_CPPFLAGS += -DDISABLE_OPENMP endif -CXXOBJ= xgboost_wrapper.o xgboost_io.o +CXXOBJ= xgboost_wrapper.o xgboost_io.o xgboost_gbm.o xgboost_updater.o OBJECTS= xgboost_R.o $(CXXOBJ) .PHONY: all clean @@ -18,7 +18,9 @@ all: $(SHLIB) $(SHLIB): $(OBJECTS) xgboost_wrapper.o: ../../wrapper/xgboost_wrapper.cpp -xgboost_io.o: ../../src/io/io.cpp +xgboost_io.o: ../../src/io/io.cpp +xgboost_gbm.o: ../../src/gbm/gbm.cpp +xgboost_updater.o: ../../src/tree/updater.cpp $(CXXOBJ) : $(CXX) -c $(PKG_CPPFLAGS) -o $@ $(firstword $(filter %.cpp %.c, $^) ) diff --git a/R-package/src/Makevars.win b/R-package/src/Makevars.win index 5d2261230..c3c97bc64 100644 --- a/R-package/src/Makevars.win +++ b/R-package/src/Makevars.win @@ -15,7 +15,7 @@ ifeq ($(no_omp),1) PKG_CPPFLAGS += -DDISABLE_OPENMP endif -CXXOBJ= xgboost_wrapper.o xgboost_io.o +CXXOBJ= xgboost_wrapper.o xgboost_io.o xgboost_gbm.o xgboost_updater.o OBJECTS= xgboost_R.o $(CXXOBJ) .PHONY: all clean @@ -24,6 +24,8 @@ $(SHLIB): $(OBJECTS) xgboost_wrapper.o: ../../wrapper/xgboost_wrapper.cpp xgboost_io.o: ../../src/io/io.cpp +xgboost_gbm.o: ../../src/gbm/gbm.cpp +xgboost_updater.o: ../../src/tree/updater.cpp $(CXXOBJ) : $(CXX) -c $(PKG_CPPFLAGS) -o $@ $(firstword $(filter %.cpp %.c, $^) )