From 598f1afec062da85c5c15e001f39bbfcb61396c6 Mon Sep 17 00:00:00 2001 From: David Terry Date: Fri, 11 May 2018 17:06:29 +0200 Subject: [PATCH] update libsnark in dockerfile. use libsnark in dockerfile when building wrappers --- Dockerfile | 2 +- build.rs | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 529ef2d5..8b571eb3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:14.04 MAINTAINER JacobEberhardt , Dennis Kuhnert -ARG libsnarkcommit=deprecated-master +ARG libsnarkcommit=master WORKDIR /root diff --git a/build.rs b/build.rs index 62140584..c0b4dfd5 100644 --- a/build.rs +++ b/build.rs @@ -8,9 +8,8 @@ fn main() { .cpp(true) .debug(true) .warnings(false) - .include("./depends/libsnark") - .include("./depends/libsnark/depends/libff") - .include("./depends/libsnark/depends/libfqfft") + .include("/usr/local/include") + .include("/usr/local/include/libsnark") .flag("-std=c++11") .define("CURVE_ALT_BN128", None) .file("lib/wraplibsnark.cpp") @@ -20,11 +19,11 @@ fn main() { .cpp(true) .debug(true) .warnings(false) - .include("./depends/libsnark") - .include("./depends/libsnark/depends/libff") - .include("./depends/libsnark/depends/libfqfft") + .include("/usr/local/include") + .include("/usr/local/include/libsnark") .flag("-std=c++11") .define("CURVE_ALT_BN128", None) + .define("BN_SUPPORT_SNARK", None) .define("DEBUG", None) .file("lib/wraplibsnarkgadgets.cpp") .compile("libwraplibsnarkgadgets.a");