phoenixcoin

phoenixcoin-qt.pro

@@ -299,9 +299,8 @@ SOURCES += src/qt/phoenixcoin.cpp \
     src/noui.cpp \
     src/neoscrypt.c \
     src/neoscrypt_asm.S \
-    src/ecies/secure.c \
-    src/ecies/ecies.c \
-    src/ecies/kdf.c \
+    src/ecies/secure.cpp \
+    src/ecies/ecies.cpp \
     src/ntp.cpp \
     src/qt/walletmodeltransaction.cpp \
     src/qt/coincontrol.cpp
@@ -384,9 +383,8 @@ macx:QMAKE_CXXFLAGS_THREAD += -pthread
 # Set libraries and includes at end, to use platform-defined defaults if not overridden
 INCLUDEPATH += $$BOOST_INCLUDE_PATH $$BDB_INCLUDE_PATH $$OPENSSL_INCLUDE_PATH $$QRENCODE_INCLUDE_PATH
 LIBS += $$join(BOOST_LIB_PATH,,-L,) $$join(BDB_LIB_PATH,,-L,) $$join(OPENSSL_LIB_PATH,,-L,) $$join(QRENCODE_LIB_PATH,,-L,)
-LIBS += -lssl -lcrypto -ldb_cxx$$BDB_LIB_SUFFIX
+LIBS += -lssl -lcrypto -ldb_cxx$$BDB_LIB_SUFFIX -lsecp256k1
 # -lgdi32 has to happen after -lcrypto (see  #681)
 win32:LIBS += -lws2_32 -lmswsock -lshlwapi -lole32 -loleaut32 -luuid -lgdi32
-LIBS += -lboost_system$$BOOST_LIB_SUFFIX -lboost_filesystem$$BOOST_LIB_SUFFIX -lboost_program_options$$BOOST_LIB_SUFFIX -lboost_thread$$BOOST_LIB_SUFFIX
-
+LIBS += -lboost_filesystem$$BOOST_LIB_SUFFIX -lboost_program_options$$BOOST_LIB_SUFFIX -lboost_thread$$BOOST_LIB_SUFFIX
 system($$QMAKE_LRELEASE -silent $$_PRO_FILE_)

src/Makefile.linux

@@ -49,7 +49,6 @@ $(addprefix -L,$(BOOST_LIB_PATH) $(BDB_LIB_PATH) $(OPENSSL_LIB_PATH))
 
 ifdef DYNAMIC
 LIBS += \
-    -l:libboost_system.so$(BOOST_LIB_SUFFIX) \
     -l:libboost_filesystem.so$(BOOST_LIB_SUFFIX) \
     -l:libboost_program_options.so$(BOOST_LIB_SUFFIX) \
     -l:libboost_thread.so$(BOOST_LIB_SUFFIX) \
@@ -61,7 +60,6 @@ TESTDEFS += -DBOOST_TEST_DYN_LINK
 TESTLIBS += -l:libboost_unit_test_framework.so$(BOOST_LIB_SUFFIX)
 else ifdef STATIC
 LIBS += \
-    -l:libboost_system$(BOOST_LIB_SUFFIX).a \
     -l:libboost_filesystem$(BOOST_LIB_SUFFIX).a \
     -l:libboost_program_options$(BOOST_LIB_SUFFIX).a \
     -l:libboost_thread$(BOOST_LIB_SUFFIX).a \
@@ -72,7 +70,6 @@ LIBS += \
 TESTLIBS += -l:libboost_unit_test_framework$(BOOST_LIB_SUFFIX).a
 else
 LIBS += \
-    -lboost_system$(BOOST_LIB_SUFFIX) \
     -lboost_filesystem$(BOOST_LIB_SUFFIX) \
     -lboost_program_options$(BOOST_LIB_SUFFIX) \
     -lboost_thread$(BOOST_LIB_SUFFIX) \
@@ -98,7 +95,7 @@ ifeq (${STATIC}, all)
  LIBS += -Wl,-Bstatic
 endif
 
-LIBS += -lz -ldl -lpthread -lrt
+LIBS += -lz -ldl -lpthread -lrt -lsecp256k1
 
 OBJS = \
     obj/addrman.o \
@@ -119,6 +116,7 @@ OBJS = \
     obj/rpcblockchain.o \
     obj/rpccrypto.o \
     obj/rpcdump.o \
+    obj/rpccrypto.o \
     obj/rpcmain.o \
     obj/rpcmining.o \
     obj/rpcnet.o \
@@ -133,7 +131,6 @@ OBJS = \
     obj/neoscrypt.o \
     obj/neoscrypt_asm.o \
     obj/ecies.o \
-    obj/kdf.o \
     obj/secure.o
 
 all: phoenixcoind
@@ -161,14 +158,11 @@ obj/neoscrypt.o: neoscrypt.c
 obj/neoscrypt_asm.o: neoscrypt_asm.S
 	$(CC) -c -DNEOSCRYPT_SHA256 -DNEOSCRYPT_ASM -DNEOSCRYPT_OPT -o $@ $^
 
-obj/ecies.o: ecies/ecies.c
-	$(CC) $(CFLAGS) $(addprefix -I,$(CURDIR)/ecies $(DEPSDIR)/include $(OPENSSL_INCLUDE_PATH)) -c -o $@ $^
-
-obj/secure.o: ecies/secure.c
-	$(CC) $(CFLAGS) $(addprefix -I,$(CURDIR)/ecies $(DEPSDIR)/include $(OPENSSL_INCLUDE_PATH)) -c -o $@ $^
+obj/ecies.o: ecies/ecies.cpp
+	$(CXX) $(CXXFLAGS) $(DEFS) $(INCS) -c $< -o $@
 
-obj/kdf.o: ecies/kdf.c
-	$(CC) $(CFLAGS) $(addprefix -I,$(CURDIR)/ecies $(DEPSDIR)/include $(OPENSSL_INCLUDE_PATH)) -c -o $@ $^
+obj/secure.o: ecies/secure.cpp
+	$(CXX) $(CXXFLAGS) $(DEFS) $(INCS) -c $< -o $@
 
 phoenixcoind: $(OBJS:obj/%=obj/%)
 	$(LD) $(LDFLAGS) -o $@ $^ $(LIBS)