diff --git a/DESCRIPTION b/DESCRIPTION index 60eff87..d9bf867 100755 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: iBMQ Type: Package Title: integrated Bayesian Modeling of eQTL data -Version: 1.0.1 +Version: 1.1.3 Date: 2011-10-28 Author: Marie-Pier Scott-Boyer and Greg Imholte Maintainer: Marie-Pier Scott-Boyer diff --git a/data/PPA.liver.rda b/data/PPA.liver.rda index f0411ee..a2495b0 100644 Binary files a/data/PPA.liver.rda and b/data/PPA.liver.rda differ diff --git a/data/gene.rda b/data/gene.rda index 0858be4..73353aa 100644 Binary files a/data/gene.rda and b/data/gene.rda differ diff --git a/data/genepos.rda b/data/genepos.rda index f605e7f..d66f317 100644 Binary files a/data/genepos.rda and b/data/genepos.rda differ diff --git a/data/genotype.liver.rda b/data/genotype.liver.rda index c79932a..898dd59 100644 Binary files a/data/genotype.liver.rda and b/data/genotype.liver.rda differ diff --git a/data/map.liver.rda b/data/map.liver.rda index bc33612..25968a6 100644 Binary files a/data/map.liver.rda and b/data/map.liver.rda differ diff --git a/data/phenotype.liver.rda b/data/phenotype.liver.rda index 78c7d14..6014054 100644 Binary files a/data/phenotype.liver.rda and b/data/phenotype.liver.rda differ diff --git a/data/probe.liver.rda b/data/probe.liver.rda index 494d62e..2c116e1 100644 Binary files a/data/probe.liver.rda and b/data/probe.liver.rda differ diff --git a/data/snp.rda b/data/snp.rda index 93ca65a..e5ec259 100644 Binary files a/data/snp.rda and b/data/snp.rda differ diff --git a/data/snppos.rda b/data/snppos.rda index fbe356b..0c7ef0d 100644 Binary files a/data/snppos.rda and b/data/snppos.rda differ diff --git a/inst/README.txt b/inst/README.txt index e74eaae..2ef8f0a 100644 --- a/inst/README.txt +++ b/inst/README.txt @@ -32,24 +32,21 @@ C:\Windows\System32\Wbem; C:\Windows\System32\WindowsPowerShell\v1.0\; C:\Program Files\MiKTeX 2.9\miktex\bin\; C:\Program Files\R\R-3.0.1\bin\i386; -C:\Program Files\GnuWin32\bin +C:\gsl\i386\bin In a sample installation, the last line -"C:\Program Files\GnuWin32\bin" +"C:\gsl\i386\bin" contains the GSL binaries. # Compiling iBMQ from source in Windows Compiling iBMQ from source is only recommended for experienced users. In addition to setting the "Path" System variable, one must also -establish User variables "GSL_INC" and "GSL_LIB" leading to -GSL header and source files, respectively. +establish User variable "LIB_GSL" leading to GSL header and lib files. In a sample installation: - -GSL_INC: C:/Program\ Files/GnuWin32/include -GSL_LIB: C:/Program\ Files/GnuWin32/lib +LIB_GSL: C:/gsl Note the use of forward slashes separating directories. The character "\ " handles spaces in directory names. diff --git a/src/Makevars.win b/src/Makevars.win index 7d1ca57..e2db20f 100644 --- a/src/Makevars.win +++ b/src/Makevars.win @@ -1,2 +1,2 @@ -PKG_CFLAGS = -I$(GSL_INC) $(SHLIB_OPENMP_CFLAGS) -PKG_LIBS = -L$(GSL_LIB) -lgsl -lgslcblas -lm $(SHLIB_OPENMP_CFLAGS) \ No newline at end of file +PKG_CPPFLAGS += -I$(RHOME)/src/include -I$(LIB_GSL)$(R_ARCH)/include $(SHLIB_OPENMP_CFLAGS) +PKG_LIBS += -L$(LIB_GSL)$(R_ARCH)/lib -lgsl -lgslcblas -lm $(SHLIB_OPENMP_CFLAGS)