Architecture specific library directories for Windows

jjallaire · jjallaire · commit 3ff4a3ae6582 · 2015-03-04T08:12:46.000-05:00
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,5 @@
 .Rhistory
 .RData
 .DS_Store
+src-i386/
+src-x64/
diff --git a/R/options.R b/R/options.R
@@ -10,7 +10,10 @@ dllInfo <- NULL
      "Darwin" = "libtbb.dylib", "Linux" = "libtbb.so.2", "Windows" = "tbb.dll"
    )
    if (sysname %in% names(tbbSupported)) {
-     dll <- system.file(paste("lib/", tbbSupported[[sysname]], sep = ""), package = "RcppParallel")
+     libDir <- "lib/"
+     if (sysname == "Windows")
+        libDir <- paste(libDir, .Platform$r_arch, "/", sep="")
+     dll <- system.file(paste(libDir, tbbSupported[[sysname]], sep = ""), package = "RcppParallel")
      if (!file.exists(dll)) {
        warning(paste("TBB library", dll, "not found."))
      } else {
diff --git a/src/Makevars b/src/Makevars
@@ -40,11 +40,14 @@ ifeq ($(USE_TBB),  Windows)
   ifeq ("$(WIN)", "64")
     # TBB defaults to ia32
     MAKE_ARGS += arch=intel64
+    ARCH_DIR="x64/"
+  else
+    ARCH_DIR="i386/"
   endif
 
   # Linker needs access to the tbb dll; otherwise you get errors such as:
   # "undefined reference to `tbb::task_scheduler_init::terminate()'"
-  PKG_LIBS += -L../inst/lib -ltbb
+  PKG_LIBS += -L../inst/lib/$(ARCH_DIR) -ltbb
 
 endif
 
@@ -54,9 +57,9 @@ endif
 all: tbb $(SHLIB)
 
 tbb:
-	mkdir -p ../inst/lib
+	mkdir -p ../inst/lib/$(ARCH_DIR)
 	( cd tbb/src; make $(MAKE_ARGS) )
-	cp tbb/build/lib_release/$(TBB_COPY_PATTERN) ../inst/lib
+	cp tbb/build/lib_release/$(TBB_COPY_PATTERN) ../inst/lib/$(ARCH_DIR)
 
 clean:
 	(cd tbb/src; make clean)
