Merge pull request #41 from JosiahParry/webr

Webr

Author: JosiahParry

src/Makevars.webr

@@ -0,0 +1,32 @@
+TARGET = wasm32-unknown-emscripten
+TARGET_DIR = $(CURDIR)/rust/target
+LIBDIR = $(TARGET_DIR)/$(TARGET)/release
+STATLIB = $(LIBDIR)/librsgeo.a
+PKG_LIBS = -L$(LIBDIR) -lrsgeo
+
+CARGO_BUILD_ARGS = --lib --release --manifest-path=./rust/Cargo.toml --target-dir $(TARGET_DIR)
+
+all: C_clean
+
+$(SHLIB): $(STATLIB)
+
+$(STATLIB):
+	# In some environments, ~/.cargo/bin might not be included in PATH, so we need
+	# to set it here to ensure cargo can be invoked. It is appended to PATH and
+	# therefore is only used if cargo is absent from the user's PATH.
+	export PATH="$(PATH):$(HOME)/.cargo/bin" && \
+	  if [ "$(TARGET)" != "wasm32-unknown-emscripten" ]; then \
+	    cargo build $(CARGO_BUILD_ARGS); \
+	  else \
+	    export CC="$(CC)" && \
+	    export CFLAGS="$(CFLAGS)" && \
+	    export CARGO_PROFILE_RELEASE_PANIC="abort" && \
+		export RAYON_NUM_THREADS=1 && \
+	    cargo +nightly build $(CARGO_BUILD_ARGS) --target $(TARGET) -Zbuild-std=panic_abort,std; \
+	  fi
+
+C_clean:
+	rm -Rf $(SHLIB) $(STATLIB) $(OBJECTS)
+
+clean:
+	rm -Rf $(SHLIB) $(STATLIB) $(OBJECTS) rust/target

src/rust/Cargo.lock

@@ -20,3 +20,4 @@ sfconversions = { git = "https://github.com/JosiahParry/sfconversions" }
 geo-types = { git = "https://github.com/georust/geo" }
 # geo = { path = "../../../geo/geo" }
 geo = { git = "https://github.com/georust/geo" }
+libR-sys = { git = "https://github.com/extendr/libR-sys", branch = "parry-wasm" }