diff --git a/src/Makevars.win b/src/Makevars.win index 528a265..da8f47f 100644 --- a/src/Makevars.win +++ b/src/Makevars.win @@ -1,13 +1,13 @@ PWD := $(shell pwd) -export CONAN_HOME := "$(PWD)\conan-staging\.conan2" -export CC := "$(shell "$(R_HOME)/bin/Rscript" -e 'Sys.which("gcc")')" -export CXX := "$(shell "$(R_HOME)/bin/Rscript" -e 'Sys.which("g++")')" +export CONAN_HOME := $(PWD)\conan-staging\.conan2 +CC := "$(shell "$(R_HOME)\bin\Rscript" -e 'Sys.which("gcc")')" +CXX := "$(shell "$(R_HOME)\bin\Rscript" -e 'Sys.which("g++")')" CONANDEPS_MK := $(shell ..\run_conan.py) include $(CONANDEPS_MK) PKG_CPPFLAGS := -std=c++17 -PKG_CPPFLAGS := $(PKG_CPPFLAGS) $(shell "$(R_HOME)/bin/Rscript" -e 'Rcpp:::CxxFlags()' 2> /dev/null) +PKG_CPPFLAGS := $(PKG_CPPFLAGS) $(shell "$(R_HOME)\bin\Rscript" -e 'Rcpp:::CxxFlags()' 2> /dev/null) PKG_CPPFLAGS := $(PKG_CPPFLAGS) $(addprefix -isystem ,$(CONAN_INCLUDE_DIRS)) PKG_CPPFLAGS := $(PKG_CPPFLAGS) $(addprefix -isystem ,$(CONAN_INCLUDE_DIRS_HDF5_HDF5_C)) PKG_CPPFLAGS := $(PKG_CPPFLAGS) $(addprefix -D ,$(CONAN_DEFINES))