Skip to content

Commit

Permalink
external/gheap: new submodule.
Browse files Browse the repository at this point in the history
It's actually entirely in the header file, so no linking needed.

Signed-off-by: Rusty Russell <[email protected]>
  • Loading branch information
rustyrussell committed Aug 28, 2020
1 parent daba3e7 commit 5d9d21d
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 1 deletion.
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,6 @@
path = external/libwally-core
url = https://github.com/ElementsProject/libwally-core.git
ignore = dirty
[submodule "external/gheap"]
path = external/gheap
url = https://github.com/valyala/gheap
5 changes: 4 additions & 1 deletion external/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
SUBMODULES = \
external/libsodium \
external/libwally-core \
external/gheap \
external/jsmn \
external/libbacktrace

Expand All @@ -19,15 +20,17 @@ LIBWALLY_HEADERS := external/libwally-core/include/wally_bip32.h \
LIBSECP_HEADERS := external/libwally-core/src/secp256k1/include/secp256k1_ecdh.h \
external/libwally-core/src/secp256k1/include/secp256k1.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_INCLUDE_FLAGS := \
-I external/libwally-core/include/ \
-I external/libwally-core/src/secp256k1/include/ \
-I external/jsmn/ \
-I external/libbacktrace/ \
-I external/gheap/ \
-I ${TARGET_DIR}/libbacktrace-build

ifneq ($(HAVE_GOOD_LIBSODIUM),1)
Expand Down
1 change: 1 addition & 0 deletions external/gheap
Submodule gheap added at 67fc83

0 comments on commit 5d9d21d

Please sign in to comment.