Browse Source

resolve conflict

pull/4/head
ca333 5 years ago
committed by GitHub
parent
commit
ccd1b51629
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 10
      src/Makefile.am

10
src/Makefile.am

@ -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

Loading…
Cancel
Save