From: CryptoManiac Date: Sat, 27 Nov 2021 13:21:10 +0000 (+0300) Subject: Add ixwebsocket library to makefiles X-Git-Tag: nvc-v0.5.9~123 X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=commitdiff_plain;h=30fcfd496b5863d8fab0c7967fb0cdf59daaaf66 Add ixwebsocket library to makefiles --- diff --git a/src/makefile.bsd b/src/makefile.bsd index 62f8f07..b7920d7 100644 --- a/src/makefile.bsd +++ b/src/makefile.bsd @@ -13,8 +13,8 @@ LINK:=$(CXX) DEFS=-DBOOST_SPIRIT_THREADSAFE -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -DEFS += $(addprefix -I,$(CURDIR) $(CURDIR)/obj $(BOOST_INCLUDE_PATH) $(BDB_INCLUDE_PATH) $(OPENSSL_INCLUDE_PATH)) -LIBS = $(addprefix -L,$(BOOST_LIB_PATH) $(BDB_LIB_PATH) $(OPENSSL_LIB_PATH)) +DEFS += $(addprefix -I,$(CURDIR) $(CURDIR)/obj $(BOOST_INCLUDE_PATH) $(BDB_INCLUDE_PATH) $(OPENSSL_INCLUDE_PATH) $(CURDIR)/additional/stage/usr/include) +LIBS = $(addprefix -L,$(BOOST_LIB_PATH) $(BDB_LIB_PATH) $(OPENSSL_LIB_PATH) $(CURDIR)/additional/stage/usr/lib) LMODE = dynamic LMODE2 = dynamic @@ -35,7 +35,8 @@ LIBS += \ -l db_cxx$(BDB_LIB_SUFFIX) \ -l ssl \ -l crypto \ - -l execinfo + -l execinfo \ + -l lixwebsocket ifneq (${USE_IPV6}, -) DEFS += -DUSE_IPV6=$(USE_IPV6) @@ -94,7 +95,7 @@ endif # CXXFLAGS can be specified on the make command line, so we use xCXXFLAGS that only # adds some defaults in front. Unfortunately, CXXFLAGS=... $(CXXFLAGS) does not work. -xCXXFLAGS=$(xOPT_LEVEL) $(EXT_OPTIONS) -pthread -Wall -Wextra -Wno-ignored-qualifiers -Wformat -Wformat-security -Wno-unused-parameter \ +xCXXFLAGS=$(xOPT_LEVEL) $(EXT_OPTIONS) -pthread -Wall -Wno-deprecated -Wextra -Wno-ignored-qualifiers -Wformat -Wformat-security -Wno-unused-parameter \ $(DEBUGFLAGS) $(DEFS) $(HARDENING) $(CXXFLAGS) # LDFLAGS can be specified on the make command line, so we use xLDFLAGS that only diff --git a/src/makefile.linux-mingw b/src/makefile.linux-mingw index ba544fd..3f64b4b 100644 --- a/src/makefile.linux-mingw +++ b/src/makefile.linux-mingw @@ -13,11 +13,11 @@ 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 -OPENSSL_LIB_PATH:=$(DEPSDIR)/openssl-1.0.2g +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 -OPENSSL_INCLUDE_PATH:=$(DEPSDIR)/openssl-1.0.2g/include +OPENSSL_INCLUDE_PATH:=$(DEPSDIR)/openssl-3.0.0/include USE_LEVELDB:=0 USE_IPV6:=1 @@ -27,12 +27,14 @@ INCLUDEPATHS= \ -I"$(CURDIR)"/obj \ -I"$(BOOST_INCLUDE_PATH)" \ -I"$(BDB_INCLUDE_PATH)" \ - -I"$(OPENSSL_INCLUDE_PATH)" + -I"$(OPENSSL_INCLUDE_PATH)" \ + -I"$(CURDIR)/additional/stage/usr/include" LIBPATHS= \ -L"$(BOOST_LIB_PATH)" \ -L"$(BDB_LIB_PATH)" \ - -L"$(OPENSSL_LIB_PATH)" + -L"$(OPENSSL_LIB_PATH)" \ + -L"$(CURDIR)/additional/stage/usr/lib" LIBS= \ -l boost_system-mt \ @@ -43,6 +45,7 @@ LIBS= \ -l db_cxx \ -l ssl \ -l crypto \ + -l ixwebsocket -Wl,-Bstatic -lpthread -Wl,-Bdynamic xOPT_LEVEL=-O2 @@ -53,7 +56,7 @@ endif DEFS=-D_MT -DWIN32 -D_WINDOWS -DBOOST_THREAD_USE_LIB -DBOOST_SPIRIT_THREADSAFE -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS 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++ ifneq (${USE_IPV6}, -) diff --git a/src/makefile.mingw b/src/makefile.mingw index ccd3995..dc3c476 100644 --- a/src/makefile.mingw +++ b/src/makefile.mingw @@ -17,12 +17,14 @@ INCLUDEPATHS= \ -I"/c/deps" \ -I"/c/deps/db-6.0.20/build_unix" \ -I"/c/deps/openssl-1.0.2/include" - + -I"c/deps/ixwebsocket/usr/include" \ + LIBPATHS= \ -L"$(CURDIR)/leveldb" \ -L"/c/deps/boost_1_57_0/stage/lib" \ -L"/c/deps/db-6.0.20/build_unix" \ - -L"/c/deps/openssl-1.0.2" + -L"/c/deps/openssl-3.0.0" \ + -I"c/deps/ixwebsocket/usr/include" LIBS= \ -l leveldb \ @@ -43,7 +45,7 @@ endif DEFS=-DWIN32 -D_WINDOWS -DBOOST_THREAD_USE_LIB -DBOOST_SPIRIT_THREADSAFE -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS DEBUGFLAGS=-g -CFLAGS=-mthreads $(xOPT_LEVEL) -msse2 -w -Wall -Wextra -Wno-ignored-qualifiers -Wformat -Wformat-security -Wno-unused-parameter $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS) +CFLAGS=-mthreads $(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 -Wl,--large-address-aware -static ifneq (${USE_IPV6}, -) diff --git a/src/makefile.osx b/src/makefile.osx index 0381ddd..394e157 100644 --- a/src/makefile.osx +++ b/src/makefile.osx @@ -64,7 +64,7 @@ CFLAGS = -g -msse2 endif # ppc doesn't work because we don't support big-endian -CFLAGS += -std=c++17 -Wall -Wextra -Wformat -Wno-ignored-qualifiers -Wformat-security -Wno-unused-parameter \ +CFLAGS += -std=c++17 -Wall -Wno-deprecated -Wextra -Wformat -Wno-ignored-qualifiers -Wformat-security -Wno-unused-parameter \ $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS) OBJS= \ diff --git a/src/makefile.unix b/src/makefile.unix index 69749c2..e8ede02 100644 --- a/src/makefile.unix +++ b/src/makefile.unix @@ -13,8 +13,8 @@ ARCH:=$(shell uname -m) DEFS=-DBOOST_SPIRIT_THREADSAFE -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -DEFS += $(addprefix -I,$(CURDIR) $(CURDIR)/obj $(BOOST_INCLUDE_PATH) $(BDB_INCLUDE_PATH) $(OPENSSL_INCLUDE_PATH)) -LIBS = $(addprefix -L,$(BOOST_LIB_PATH) $(BDB_LIB_PATH) $(OPENSSL_LIB_PATH)) +DEFS += $(addprefix -I,$(CURDIR) $(CURDIR)/obj $(BOOST_INCLUDE_PATH) $(BDB_INCLUDE_PATH) $(OPENSSL_INCLUDE_PATH) $(CURDIR)/additional/stage/usr/include) +LIBS = $(addprefix -L,$(BOOST_LIB_PATH) $(BDB_LIB_PATH) $(OPENSSL_LIB_PATH) $(CURDIR)/additional/stage/usr/lib) LMODE = dynamic LMODE2 = dynamic @@ -34,7 +34,8 @@ LIBS += \ -l boost_thread$(BOOST_LIB_SUFFIX) \ -l db_cxx$(BDB_LIB_SUFFIX) \ -l ssl \ - -l crypto + -l crypto \ + -l ixwebsocket ifneq (${USE_IPV6}, -) DEFS += -DUSE_IPV6=$(USE_IPV6)