From ccd1b516294fedc391e29b763aa640e72f58fdb0 Mon Sep 17 00:00:00 2001
From: ca333 <ca333@users.noreply.github.com>
Date: Thu, 21 Feb 2019 15:36:02 +0100
Subject: [PATCH] resolve conflict

---
 src/Makefile.am | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index e9d41a510..22668c91f 100644
--- 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