From b3b64213d0eebc7fb7d8fe24a0fd9bbb2ff286fa Mon Sep 17 00:00:00 2001 From: Tino Breddin Date: Tue, 20 Aug 2019 14:37:55 +0200 Subject: [PATCH] Fix win32 nif compilation --- .gitignore | 2 ++ Makefile | 25 +++++++++++++++++-------- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 23d3f5e..ac0d49e 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,5 @@ Cargo.lock /parity-ethereum /_build /ebin +/priv/ecrecover.dll +/priv/ecrecover.so diff --git a/Makefile b/Makefile index 6f282aa..72aff5f 100644 --- a/Makefile +++ b/Makefile @@ -1,22 +1,31 @@ - UNAME := $(shell uname) +ifeq ($(OS),Windows_NT) + nif_lib_src = ecrecover.dll + nif_lib = ecrecover.dll +else ifeq ($(UNAME), Linux) - artefact = libecrecover.so + nif_lib_src = libecrecover.so + nif_lib = ecrecover.so endif ifeq ($(UNAME), Darwin) - artefact = libecrecover.dylib + nif_lib_src = libecrecover.dylib + nif_lib = ecrecover.so +endif endif +all: priv/$(nif_lib) compile -all: priv/ecrecover.so +compile: + ./rebar3 compile -priv/ecrecover.so: src/lib.rs parity-ethereum/ +priv/$(nif_lib): src/lib.rs parity-ethereum/ cargo build --release - cp target/release/$(artefact) priv/ecrecover.so + cp target/release/$(nif_lib_src) $@ clean: - rm -f priv/ecrecover.so target/release/$(artefact) + rm -f priv/$(nif_lib) target/release/$(nif_lib_src) + ./rebar3 clean parity-ethereum/: - git clone https://github.com/johnsnewby/parity-ethereum.git + git clone https://github.com/aeternity/parity-ethereum.git