From 748389f052a076372e4d23b736d4c0979e5072ff Mon Sep 17 00:00:00 2001 From: Tianqi Chen Date: Mon, 19 Jan 2015 00:29:03 -0800 Subject: [PATCH] fix win compile --- Makefile | 2 +- R-package/src/Makevars.win | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index bd4e77a61..6f5e6223f 100644 --- a/Makefile +++ b/Makefile @@ -89,7 +89,7 @@ Rpack: cp wrapper/xgboost_wrapper.cpp xgboost/src/wrapper cp ./LICENSE xgboost cat R-package/src/Makevars|sed '2s/.*/PKGROOT=./' > xgboost/src/Makevars - cat R-package/src/Makevars.win|sed '2s/.*/PKGROOT=./' > xgboost/src/Makevars.win + cp xgboost/src/Makevars xgboost/src/Makevars.win R CMD build xgboost rm -rf xgboost R CMD check --as-cran xgboost*.tar.gz diff --git a/R-package/src/Makevars.win b/R-package/src/Makevars.win index cc933f099..e9e4fe1f1 100644 --- a/R-package/src/Makevars.win +++ b/R-package/src/Makevars.win @@ -1,7 +1,16 @@ # package root -PKGROOT=../../ +PKGROOT=./ # _*_ mode: Makefile; _*_ -PKG_CPPFLAGS= -DXGBOOST_CUSTOMIZE_MSG_ -DXGBOOST_CUSTOMIZE_PRNG_ -DXGBOOST_STRICT_CXX98_ -DRABIT_CUSTOMIZE_MSG_ -DRABIT_STRICT_CXX98_ -I$(PKGROOT) +.PHONY: all xgblib +all: $(SHLIB) +$(SHLIB): xgblib +xgblib: + cp -r ../../src . + cp -r ../../wrapper . + cp -r ../../subtree . + +PKG_CPPFLAGS= -DXGBOOST_CUSTOMIZE_MSG_ -DXGBOOST_CUSTOMIZE_PRNG_ -DXGBOOST_STRICT_CXX98_ -DRABIT_CUSTOMIZE_MSG_ -DRABIT_STRICT_CXX98_ -I$(PKGROOT) -I../.. PKG_CXXFLAGS= $(SHLIB_OPENMP_CFLAGS) PKG_LIBS = $(SHLIB_OPENMP_CFLAGS) OBJECTS= xgboost_R.o xgboost_assert.o $(PKGROOT)/wrapper/xgboost_wrapper.o $(PKGROOT)/src/io/io.o $(PKGROOT)/src/gbm/gbm.o $(PKGROOT)/src/tree/updater.o $(PKGROOT)/subtree/rabit/src/engine_empty.o +$(OBJECTS) : xgblib