Browse Source

external/gheap: new submodule.

It's actually entirely in the header file, so no linking needed.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
bump-pyln-proto
Rusty Russell 4 years ago
parent
commit
5d9d21d64d
  1. 3
      .gitmodules
  2. 5
      external/Makefile
  3. 1
      external/gheap

3
.gitmodules

@ -11,3 +11,6 @@
path = external/libwally-core path = external/libwally-core
url = https://github.com/ElementsProject/libwally-core.git url = https://github.com/ElementsProject/libwally-core.git
ignore = dirty ignore = dirty
[submodule "external/gheap"]
path = external/gheap
url = https://github.com/valyala/gheap

5
external/Makefile

@ -1,6 +1,7 @@
SUBMODULES = \ SUBMODULES = \
external/libsodium \ external/libsodium \
external/libwally-core \ external/libwally-core \
external/gheap \
external/jsmn \ external/jsmn \
external/libbacktrace external/libbacktrace
@ -19,8 +20,9 @@ LIBWALLY_HEADERS := external/libwally-core/include/wally_bip32.h \
LIBSECP_HEADERS := external/libwally-core/src/secp256k1/include/secp256k1_ecdh.h \ LIBSECP_HEADERS := external/libwally-core/src/secp256k1/include/secp256k1_ecdh.h \
external/libwally-core/src/secp256k1/include/secp256k1.h external/libwally-core/src/secp256k1/include/secp256k1.h
JSMN_HEADERS := external/jsmn/jsmn.h JSMN_HEADERS := external/jsmn/jsmn.h
GHEAP_HEADERS := external/gheap/gheap.h external/gheap/galgorithm.h
EXTERNAL_HEADERS := $(LIBSODIUM_HEADERS) $(LIBWALLY_HEADERS) $(LIBSECP_HEADERS) $(JSMN_HEADERS) EXTERNAL_HEADERS := $(LIBSODIUM_HEADERS) $(LIBWALLY_HEADERS) $(LIBSECP_HEADERS) $(JSMN_HEADERS) $(GHEAP_HEADERS)
EXTERNAL_LIBS := ${TARGET_DIR}/libwallycore.a ${TARGET_DIR}/libsecp256k1.a ${TARGET_DIR}/libjsmn.a ${TARGET_DIR}/libbacktrace.a EXTERNAL_LIBS := ${TARGET_DIR}/libwallycore.a ${TARGET_DIR}/libsecp256k1.a ${TARGET_DIR}/libjsmn.a ${TARGET_DIR}/libbacktrace.a
EXTERNAL_INCLUDE_FLAGS := \ EXTERNAL_INCLUDE_FLAGS := \
@ -28,6 +30,7 @@ EXTERNAL_INCLUDE_FLAGS := \
-I external/libwally-core/src/secp256k1/include/ \ -I external/libwally-core/src/secp256k1/include/ \
-I external/jsmn/ \ -I external/jsmn/ \
-I external/libbacktrace/ \ -I external/libbacktrace/ \
-I external/gheap/ \
-I ${TARGET_DIR}/libbacktrace-build -I ${TARGET_DIR}/libbacktrace-build
ifneq ($(HAVE_GOOD_LIBSODIUM),1) ifneq ($(HAVE_GOOD_LIBSODIUM),1)

1
external/gheap

@ -0,0 +1 @@
Subproject commit 67fc83bc953324f4759e52951921d730d7e65099
Loading…
Cancel
Save