X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Fmakefile.linux-mingw;h=3f64b4bf9f01ac6c46591eed0bf3482b80fa2730;hb=ef17ac0211ddd486127e1f94756fbb3fd704a9b4;hp=284670afd562edebd3c9c9cb1d64c4c2ab44651a;hpb=fb24309e8e08fb4ce6d97b2e17dccfee06689836;p=novacoin.git

diff --git a/src/makefile.linux-mingw b/src/makefile.linux-mingw
index 284670a..3f64b4b 100644
--- a/src/makefile.linux-mingw
+++ b/src/makefile.linux-mingw
@@ -13,15 +13,12 @@ DEPSDIR:=/usr/$(TARGET_PLATFORM)-w64-mingw32
 
 BOOST_LIB_PATH:=$(DEPSDIR)/boost_1_57_0/stage/lib
 BDB_LIB_PATH:=$(DEPSDIR)/db-6.0.20.NC/build_unix
-MINIUPNPC_LIB_PATH:=$(DEPSDIR)/miniupnpc-1.9
-OPENSSL_LIB_PATH:=$(DEPSDIR)/openssl-1.0.1h
+OPENSSL_LIB_PATH:=$(DEPSDIR)/openssl-3.0.0
 
 BOOST_INCLUDE_PATH:=$(DEPSDIR)/boost_1_57_0
 BDB_INCLUDE_PATH:=$(DEPSDIR)/db-6.0.20.NC/build_unix
-MINIUPNPC_INCLUDE_PATH:=$(DEPSDIR)
-OPENSSL_INCLUDE_PATH:=$(DEPSDIR)/openssl-1.0.1h/include
+OPENSSL_INCLUDE_PATH:=$(DEPSDIR)/openssl-3.0.0/include
 
-USE_UPNP:=0
 USE_LEVELDB:=0
 USE_IPV6:=1
 
@@ -31,13 +28,13 @@ INCLUDEPATHS= \
  -I"$(BOOST_INCLUDE_PATH)" \
  -I"$(BDB_INCLUDE_PATH)" \
  -I"$(OPENSSL_INCLUDE_PATH)" \
- -I"$(MINIUPNPC_INCLUDE_PATH)"
+ -I"$(CURDIR)/additional/stage/usr/include"
 
 LIBPATHS= \
  -L"$(BOOST_LIB_PATH)" \
  -L"$(BDB_LIB_PATH)" \
  -L"$(OPENSSL_LIB_PATH)" \
- -L"$(MINIUPNPC_LIB_PATH)"
+ -L"$(CURDIR)/additional/stage/usr/lib"
 
 LIBS= \
  -l boost_system-mt \
@@ -48,6 +45,7 @@ LIBS= \
  -l db_cxx \
  -l ssl \
  -l crypto \
+ -l ixwebsocket
  -Wl,-Bstatic -lpthread -Wl,-Bdynamic
 
 xOPT_LEVEL=-O2
@@ -57,25 +55,10 @@ endif
 
 DEFS=-D_MT -DWIN32 -D_WINDOWS -DBOOST_THREAD_USE_LIB -DBOOST_SPIRIT_THREADSAFE -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS
 
-ifeq  (${USE_SSSE3}, 1)
-# Intrinsic implementation of block copy
-DEFS += -DUSE_SSSE3
-xOPT_LEVEL += -mssse3
-endif
-
 DEBUGFLAGS=-g
-CFLAGS=$(xOPT_LEVEL) -msse2 -w -Wall -Wextra -Wno-ignored-qualifiers -Wformat -Wformat-security -Wno-unused-parameter $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS)
+CFLAGS=$(xOPT_LEVEL) -msse2 -w -Wall -Wno-deprecated -Wextra -Wno-ignored-qualifiers -Wformat -Wformat-security -Wno-unused-parameter $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS)
 LDFLAGS=-Wl,--dynamicbase -Wl,--nxcompat -static-libgcc -static-libstdc++
 
-ifndef USE_UPNP
-	override USE_UPNP = -
-endif
-ifneq (${USE_UPNP}, -)
-	LIBPATHS += -L"$(DEPSDIR)/miniupnpc"
-	LIBS += -l miniupnpc -l iphlpapi
-	DEFS += -DSTATICLIB -DUSE_UPNP=$(USE_UPNP)
-endif
-
 ifneq (${USE_IPV6}, -)
 	DEFS += -DUSE_IPV6=$(USE_IPV6)
 endif
@@ -92,6 +75,7 @@ OBJS= \
     obj/netbase.o \
     obj/addrman.o \
     obj/crypter.o \
+    obj/base58.o \
     obj/key.o \
     obj/db.o \
     obj/init.o \
@@ -116,7 +100,9 @@ OBJS= \
     obj/wallet.o \
     obj/walletdb.o \
     obj/noui.o \
-    obj/kernel.o
+    obj/kernel.o \
+    obj/kernel_worker.o \
+    obj/ipcollector.o
 
 all: novacoind.exe
 
@@ -138,7 +124,6 @@ endif
 ifeq (${USE_ASM}, 1)
 # Assembler implementation
 OBJS += crypto/scrypt/asm/obj/scrypt-arm.o crypto/scrypt/asm/obj/scrypt-x86.o crypto/scrypt/asm/obj/scrypt-x86_64.o crypto/scrypt/asm/obj/asm-wrapper.o
-OBJS += crypto/sha2/asm/obj/sha2-arm.o crypto/sha2/asm/obj/sha2-x86.o crypto/sha2/asm/obj/sha2-x86_64.o crypto/sha2/asm/obj/copy_swap.o
 
 crypto/scrypt/asm/obj/scrypt-x86.o: crypto/scrypt/asm/scrypt-x86.S
 	$(CXX) -c $(CFLAGS) -MMD -o $@ $<
@@ -152,18 +137,6 @@ crypto/scrypt/asm/obj/scrypt-arm.o: crypto/scrypt/asm/scrypt-arm.S
 crypto/scrypt/asm/obj/asm-wrapper.o: crypto/scrypt/asm/asm-wrapper.cpp
 	$(CXX) -c $(CFLAGS) -MMD -o $@ $<
 
-crypto/sha2/asm/obj/sha2-x86.o: crypto/sha2/asm/sha2-x86.S
-	$(CXX) -c $(CFLAGS) -MMD -o $@ $<
-
-crypto/sha2/asm/obj/sha2-x86_64.o: crypto/sha2/asm/sha2-x86_64.S
-	$(CXX) -c $(CFLAGS) -MMD -o $@ $<
-
-crypto/sha2/asm/obj/sha2-arm.o: crypto/sha2/asm/sha2-arm.S
-	$(CXX) -c $(CFLAGS) -MMD -o $@ $<
-
-crypto/sha2/asm/obj/copy_swap.o: crypto/sha2/asm/copy_swap.c
-	$(CC)  -c $(CFLAGS) -MMD -o $@ $<
-
 DEFS += -DUSE_ASM
 else
 ifeq  (${USE_SSE2}, 1)