resolve conflict

2019-02-21 15:36:02 +01:00
parent 299a227fef
commit ccd1b51629
1 changed files with 4 additions and 6 deletions
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -572,16 +572,14 @@ komodod_LDADD += \
  $(LIBVERUS_CRYPTO) \
  $(LIBVERUS_PORTABLE_CRYPTO) \
  $(LIBZCASH_LIBS)
-  
+
 if TARGET_DARWIN
-komodod_LDADD += libcc.dylib
-endif
-if TARGET_WINDOWS
-komodod_LDADD += libcc.dll
+komodod_LDADD += libcc.dylib $(LIBSECP256K1)
 else
-komodod_LDADD += libcc.so
+komodod_LDADD += libcc.so $(LIBSECP256K1)
 endif

+
 if ENABLE_PROTON
 komodod_LDADD += $(LIBBITCOIN_PROTON) $(PROTON_LIBS)
 endif