Merge pull request #14 from thirdwing/master

built on 32bit WinXP
sneumann · Jan 5, 2015 · c2d3d05 · c2d3d05
2 parents 08a3a38 + f3ff0b5
commit c2d3d05
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -18,7 +18,7 @@ Description: mzR provides a unified API to the common file formats and
 License: Artistic-2.0
 LazyLoad: yes
 Depends: Rcpp (>= 0.10.1), methods, utils
-Imports: Biobase
+Imports: Biobase, zlibbioc
 Suggests: msdata (>= 0.3.5), RUnit, mzID, BiocStyle, knitr, BiocGenerics
 VignetteBuilder: knitr
 LinkingTo: Rcpp, zlibbioc

diff --git a/NAMESPACE b/NAMESPACE
@@ -1,7 +1,7 @@
 useDynLib(mzR)
 
 import(methods)
-
+import(zlibbioc)
 importClassesFrom(Biobase, "Versioned")
 importFrom(Biobase, validMsg)
 ##importFrom(Rcpp, "loadRcppModules")

diff --git a/src/Makevars.win b/src/Makevars.win
@@ -106,8 +106,20 @@ PKG_CFLAGS=-D_LARGEFILE_SOURCE -I./win/$(R_ARCH) -D_MSC_VER  -fgnu89-inline
 
 PKG_LIBS = $(shell $(R_HOME)/bin/Rscript -e "Rcpp:::LdFlags()" ) $(PWIZ_LDFLAGS) -L./win/$(R_ARCH) -lws2_32 -lnetcdf
 
+ZLIB_CFLAGS =$(shell echo 'zlibbioc::pkgconfig("PKG_CFLAGS")'|\
+	"${R_HOME}/bin/R" --vanilla --slave)
+
+PKG_LIBS+=$(shell echo 'zlibbioc::pkgconfig("PKG_LIBS_shared")' |\
+	"${R_HOME}/bin/R" --vanilla --slave)
+
 all: clean $(SHLIB)
 
+%.o: %.c
+	$(CC) $(ZLIB_CFLAGS) $(ALL_CPPFLAGS) $(ALL_CFLAGS) -c $< -o $@
+
+%.o: %.cpp
+	$(CXX) $(ZLIB_CFLAGS) $(ALL_CPPFLAGS) -c $< -o $@
+
 clean:
 	rm -f $(OBJECTS)