github/darkfi
1
1
Fork 0
mirror of https://github.com/darkrenaissance/darkfi.git synced 2026-01-08 22:28:12 -05:00
Code Issues Packages Projects Releases Wiki Activity

resolve conflicts merging dao_demo

Browse Source
This commit is contained in:
Dastan-glitch
2022-10-16 02:50:59 +03:00
parent b37bd5e17f 488f915bf7
commit c0c97337d7
96 changed files with 7336 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@@ -10,8 +10,7 @@ CARGO = cargo
#RUSTFLAGS = -C target-cpu=native
# Binaries to be built
BINS = drk darkfid tau taud ircd dnetview darkotc darkwikid darkwiki
BINS = drk darkfid tau taud ircd dnetview darkotc darkwikid darkwiki dao
# Common dependencies which should force the binaries to be rebuilt
BINDEPS = \
@@ -24,7 +23,7 @@ BINDEPS = \
# ZK proofs to compile with zkas
PROOFS = \
$(shell find bin/daod/proof -type f -name '*.zk') \
$(shell find bin/dao/daod/proof -type f -name '*.zk') \
$(shell find proof -type f -name '*.zk') \
example/simple.zk