@@ -11,7 +11,7 @@ License: file LICENSE

 License_restricts_use: yes

 LazyData: TRUE

 Imports:

-    cytolib(>= 2.1.18),

+    cytolib(>= 2.3.4),

     flowCore (>= 1.99.10),

     flowWorkspace (>= 4.1.8),

     openCyto (>= 1.99.2),

@@ -40,7 +40,7 @@ Imports:

     RcppParallel,

     xml2

 biocViews: ImmunoOncology, FlowCytometry, DataImport, DataRepresentation

-LinkingTo: Rcpp, BH(>= 1.62.0-1), RProtoBufLib, cytolib ( >= 1.99.26),Rhdf5lib, RcppArmadillo, RcppParallel(>= 4.4.2-1), flowWorkspace

+LinkingTo: Rcpp, BH(>= 1.62.0-1), RProtoBufLib, cytolib, Rhdf5lib, RcppArmadillo, RcppParallel(>= 4.4.2-1), flowWorkspace

 Suggests:

     testthat,

     flowWorkspaceData ,

@@ -7,21 +7,12 @@ This makefile requires GNU Make.

 endif

 CXX_STD = CXX11

-#somehow the implicit $CC isn't available/accurate, so we have to re-fetch it

-compilerinfo = ${shell R CMD config CXX}

-compiler = $(findstring clang++, $(compilerinfo))

-#$(info "$(compiler)")

-ifneq (,$(compiler))

-	fslib = c++fs

-else

-	fslib = stdc++fs

-endif

-	

-h5lib = $(shell echo 'Rhdf5lib::pkgconfig("PKG_C_LIBS")'|\

-    "${R_HOME}/bin/R" --vanilla --slave)

-    

 PKG_CPPFLAGS =-DROUT -I../inst/include/ @PKG_CPPFLAGS@ -DBOOST_NO_AUTO_PTR 

+RHDF5_LIBS= $(shell echo 'Rhdf5lib::pkgconfig("PKG_CXX_LIBS")'|\

+    "${R_HOME}/bin/R" --vanilla --slave)

+

+PKG_LIBS = `${R_HOME}/bin/Rscript -e "cytolib:::cytolib_LdFlags()"` $(RHDF5_LIBS) $(LAPACK_LIBS) $(BLAS_LIBS) @PKG_LIBS@   

-PKG_LIBS = $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS) @PKG_LIBS@ ${h5lib} 

+