From 585d9215c6fceef3341e83a214eef3ebab7c58e9 Mon Sep 17 00:00:00 2001 From: Duke Leto Date: Sun, 22 Dec 2019 11:01:31 -0500 Subject: [PATCH] Do not anger the Elder Gods of The Build System --- src/Makefile.am | 2 -- src/cc/makecclib | 30 +++++++++++++++--------------- 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index e56abf846..0e873dcb5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -719,8 +719,6 @@ clean-local: -$(MAKE) -C secp256k1 clean -$(MAKE) -C snark clean -$(MAKE) -C univalue clean - # this breaks things - #-rm -f libcc.so rm -f leveldb/*/*.gcno leveldb/helpers/memenv/*.gcno -rm -f config.h diff --git a/src/cc/makecclib b/src/cc/makecclib index 9690f86e0..52936734a 100755 --- a/src/cc/makecclib +++ b/src/cc/makecclib @@ -1,22 +1,22 @@ #!/bin/bash # Copyright (c) 2019 The Hush developers -rm *.so #rogue/rogue games/tetris games/prices +rm *.so rogue/rogue games/tetris games/prices -#echo rogue -#make -f Makefile_rogue -#./makerogue -#rm ../libcc.so -#cp librogue.so ../libcc.so -# -#echo sudoku/musig/dilithium -#gcc -O3 -std=c++11 -I../secp256k1/include -I../univalue/include -I../cryptoconditions/include -I../cryptoconditions/src -I../cryptoconditions/src/asn -I.. -I. -fPIC -shared -c -o sudokucc.so cclib.cpp -# -#echo games tetris -#./maketetris -# -#echo games prices -#./makeprices +echo rogue +make -f Makefile_rogue +./makerogue +rm ../libcc.so +cp librogue.so ../libcc.so + +echo sudoku/musig/dilithium +gcc -O3 -std=c++11 -I../secp256k1/include -I../univalue/include -I../cryptoconditions/include -I../cryptoconditions/src -I../cryptoconditions/src/asn -I.. -I. -fPIC -shared -c -o sudokucc.so cclib.cpp + +echo games tetris +./maketetris + +echo games prices +./makeprices echo customcc stub gcc -O3 -DBUILD_CUSTOMCC -std=c++11 -I../secp256k1/include -I../univalue/include -I../cryptoconditions/include -I../cryptoconditions/src -I../cryptoconditions/src/asn -I.. -I. -fPIC -shared -c -o customcc.so cclib.cpp