Skip to content

Commit

Permalink
fix gsLibPath. #14
Browse files Browse the repository at this point in the history
  • Loading branch information
mikejiang committed Jan 24, 2021
1 parent 29a60f9 commit cd6ec84
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: RProtoBufLib
Type: Package
Title: C++ headers and static libraries of Protocol buffers
Version: 2.3.2
Version: 2.3.3
Author: Mike Jiang
Maintainer: Mike Jiang <[email protected]>, Jake Wagner <[email protected]>
Description: This package provides the headers and static library of
Expand Down
4 changes: 2 additions & 2 deletions R/build.R
Original file line number Diff line number Diff line change
Expand Up @@ -77,15 +77,15 @@ gsLibPath <- function(suffix = "") {
pbSupported <- list(
"Darwin" = paste("libGatingSet.pb", suffix, ".dylib", sep = ""),
"Linux" = paste("libGatingSet.pb", suffix, ".so", sep = ""),
"Windows" = paste("libGatingSet.pb", suffix, ".dll", sep = ""),
"Windows" = paste("GatingSet.pb", suffix, ".o", sep = ""),
"SunOS" = paste("libGatingSet.pb", suffix, ".so", sep = "")
)
# browser()
if ((sysname %in% names(pbSupported)) && !isSparc()) {
libDir <- "lib/"
if (sysname == "Windows")
libDir <- paste(libDir, .Platform$r_arch, "/", sep="")
system.file(paste(libDir, "GatingSet.pb.o", sep = ""),
system.file(paste(libDir, pbSupported[[sysname]], sep = ""),
package = "RProtoBufLib")
} else {
NULL
Expand Down

0 comments on commit cd6ec84

Please sign in to comment.