Skip to content

Commit b5aebea

Browse files
committed
Merge #340: docs: update readme
4ca013d docs: update readme (Byron Hambly) Pull request description: re: #338 Updated with inspiration from rust-simplicity to link to the simplicity website and rust-simplicity/simplicityhl repos ACKs for top commit: apoelstra: ACK 4ca013d; successfully ran local tests Tree-SHA512: 9707cf4f1713450778359c67a3ac59bdc3604c54ef21492863fb3bcc1cda6662bcb0c88ea61bcfaf6783ddb2a20016f2f83541e3d77d5aeef43f8d8e5aaaf4c7
2 parents ba440a0 + 4ca013d commit b5aebea

64 files changed

Lines changed: 10721 additions & 1102 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

C/Makefile

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
OBJS := bitstream.o dag.o deserialize.o eval.o frame.o jets.o jets-secp256k1.o rsort.o sha256.o type.o typeInference.o elements/env.o elements/exec.o elements/ops.o elements/elementsJets.o elements/primitive.o elements/cmr.o elements/txEnv.o
1+
CORE_OBJS := bitstream.o dag.o deserialize.o eval.o frame.o jets.o jets-secp256k1.o rsort.o sha256.o type.o typeInference.o
2+
BITCOIN_OBJS := bitcoin/env.o bitcoin/ops.o bitcoin/bitcoinJets.o bitcoin/primitive.o bitcoin/txEnv.o
3+
ELEMENTS_OBJS := elements/env.o elements/exec.o elements/ops.o elements/elementsJets.o elements/primitive.o elements/cmr.o elements/txEnv.o
24
TEST_OBJS := test.o ctx8Pruned.o ctx8Unpruned.o hashBlock.o regression4.o schnorr0.o schnorr6.o typeSkipTest.o elements/checkSigHashAllTx1.o
35

46
# From https://fastcompression.blogspot.com/2019/01/compiler-warnings.html
@@ -23,13 +25,16 @@ sha256.o: sha256.c
2325
%.o: %.c
2426
$(CC) -c $(CFLAGS) $(CWARN) $(CPPFLAGS) -o $@ $<
2527

26-
libElementsSimplicity.a: $(OBJS)
28+
libBitcoinSimplicity.a: $(CORE_OBJS) $(BITCOIN_OBJS)
29+
ar rcs $@ $^
30+
31+
libElementsSimplicity.a: $(CORE_OBJS) $(ELEMENTS_OBJS)
2732
ar rcs $@ $^
2833

2934
test: $(TEST_OBJS) libElementsSimplicity.a
3035
$(CC) $^ -o $@ $(LDFLAGS)
3136

32-
install: libElementsSimplicity.a
37+
install: libBitcoinSimplicity.a libElementsSimplicity.a
3338
mkdir -p $(out)/lib
3439
cp $^ $(out)/lib/
3540
cp -R include $(out)/include

0 commit comments

Comments
 (0)