DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

resolve conflict

Browse Source
This commit is contained in:
ca333
2019-02-21 15:36:02 +01:00
committed by GitHub
parent 299a227fef
commit ccd1b51629
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Makefile.am
View File

@@ -572,16 +572,14 @@ komodod_LDADD += \
$(LIBVERUS_CRYPTO) \ $(LIBVERUS_CRYPTO) \
$(LIBVERUS_PORTABLE_CRYPTO) \ $(LIBVERUS_PORTABLE_CRYPTO) \
$(LIBZCASH_LIBS) $(LIBZCASH_LIBS)
if TARGET_DARWIN if TARGET_DARWIN
komodod_LDADD += libcc.dylib komodod_LDADD += libcc.dylib $(LIBSECP256K1)
endif
if TARGET_WINDOWS
komodod_LDADD += libcc.dll
else else
komodod_LDADD += libcc.so komodod_LDADD += libcc.so $(LIBSECP256K1)
endif endif
if ENABLE_PROTON if ENABLE_PROTON
komodod_LDADD += $(LIBBITCOIN_PROTON) $(PROTON_LIBS) komodod_LDADD += $(LIBBITCOIN_PROTON) $(PROTON_LIBS)
endif endif