mirror of
https://github.com/PurpleI2P/i2pd.git
synced 2026-10-06 03:28:05 +00:00
link with boost_url
This commit is contained in:
+1
-1
@@ -8,7 +8,7 @@ INCFLAGS = -I/usr/include/ -I/usr/local/include/
|
||||
LDFLAGS = ${LD_DEBUG} -Wl,-rpath,/usr/local/lib -L/usr/local/lib
|
||||
LDLIBS = -lssl -lcrypto -lz -lpthread -lboost_program_options
|
||||
ifeq ($(TORRENTS),yes)
|
||||
LDLIBS += -lboost_json
|
||||
LDLIBS += -lboost_json -lboost_url
|
||||
endif
|
||||
|
||||
## NOTE: NEEDED_CXXFLAGS is here so that custom CXXFLAGS can be specified at build time
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@ endif
|
||||
CXXFLAGS := -Wall -std=c++23
|
||||
INCFLAGS = -I/system/develop/headers
|
||||
DEFINES = -D_DEFAULT_SOURCE -D_GNU_SOURCE
|
||||
LDLIBS = -lbe -lbsd -lnetwork -lz -lssl -lcrypto -lboost_program_options -lboost_json -lpthread
|
||||
LDLIBS = -lbe -lbsd -lnetwork -lz -lssl -lcrypto -lboost_program_options -lboost_json -lboost_url -lpthread
|
||||
|
||||
ifeq ($(USE_UPNP),yes)
|
||||
DEFINES += -DUSE_UPNP
|
||||
|
||||
+2
-2
@@ -22,14 +22,14 @@ ifeq ($(shell uname -m), x86_64)
|
||||
endif
|
||||
|
||||
ifeq ($(USE_STATIC),yes)
|
||||
LDLIBS = -lz ${SSLROOT}/lib/libcrypto.a ${SSLROOT}/lib/libssl.a ${BOOSTROOT}/lib/libboost_program_options.a ${BOOSTROOT}/lib/libboost_json.a
|
||||
LDLIBS = -lz ${SSLROOT}/lib/libcrypto.a ${SSLROOT}/lib/libssl.a ${BOOSTROOT}/lib/libboost_program_options.a ${BOOSTROOT}/lib/libboost_json.a ${BOOSTROOT}/lib/libboost_url.a
|
||||
ifeq ($(USE_UPNP),yes)
|
||||
LDLIBS += ${UPNPROOT}/lib/libminiupnpc.a
|
||||
endif
|
||||
LDLIBS += -lpthread -ldl
|
||||
else
|
||||
LDFLAGS += -L${SSLROOT}/lib -L${BOOSTROOT}/lib
|
||||
LDLIBS = -lz -lssl -lcrypto -lboost_program_options -lboost_json -lpthread
|
||||
LDLIBS = -lz -lssl -lcrypto -lboost_program_options -lboost_json -lboost_url -lpthread
|
||||
ifeq ($(USE_UPNP),yes)
|
||||
LDFLAGS += -L${UPNPROOT}/lib
|
||||
LDLIBS += -lminiupnpc
|
||||
|
||||
+3
-2
@@ -14,7 +14,7 @@ CXXVER := $(shell $(CXX) -dumpversion)
|
||||
ifneq ($(findstring clang,$(CXX)),)
|
||||
NEEDED_CXXFLAGS += -std=c++20
|
||||
ifeq ($(TORRENTS),yes)
|
||||
LDLIBS = -lboost_json
|
||||
LDLIBS = -lboost_json -lboost_url
|
||||
endif
|
||||
else ifeq ($(shell expr match ${CXXVER} "11"),2) # gcc 11
|
||||
NEEDED_CXXFLAGS += -std=c++20
|
||||
@@ -24,7 +24,7 @@ else ifeq ($(shell expr match ${CXXVER} "1[3-9]"),2) # gcc 13+
|
||||
NEEDED_CXXFLAGS += -std=c++23 -Wno-bidi-chars
|
||||
ifeq ($(TORRENTS),yes)
|
||||
# assume boost >= 1.81
|
||||
LDLIBS = -lboost_json
|
||||
LDLIBS = -lboost_json -lboost_url
|
||||
endif
|
||||
else # not supported
|
||||
$(error Compiler too old)
|
||||
@@ -40,6 +40,7 @@ ifeq ($(USE_STATIC),yes)
|
||||
LDLIBS += $(LIBDIR)/libboost_program_options.a
|
||||
ifeq ($(TORRENTS),yes)
|
||||
LDLIBS += $(LIBDIR)/libboost_json.a
|
||||
LDLIBS += $(LIBDIR)/libboost_url.a
|
||||
endif
|
||||
LDLIBS += $(LIBDIR)/libssl.a
|
||||
LDLIBS += $(LIBDIR)/libcrypto.a
|
||||
|
||||
@@ -25,6 +25,7 @@ LDLIBS += \
|
||||
$(MINGW_PREFIX)/lib/libboost_filesystem-mt.a \
|
||||
$(MINGW_PREFIX)/lib/libboost_program_options-mt.a \
|
||||
$(MINGW_PREFIX)/lib/libboost_json-mt.a \
|
||||
$(MINGW_PREFIX)/lib/libboost_url-mt.a \
|
||||
$(MINGW_PREFIX)/lib/libssl.a \
|
||||
$(MINGW_PREFIX)/lib/libcrypto.a \
|
||||
$(MINGW_PREFIX)/lib/libz.a \
|
||||
|
||||
+2
-2
@@ -7,9 +7,9 @@ LDFLAGS += -Wl,-dead_strip
|
||||
LDFLAGS += -Wl,-dead_strip_dylibs
|
||||
|
||||
ifeq ($(USE_STATIC),yes)
|
||||
LDLIBS = -lz /usr/local/lib/libssl.a /usr/local/lib/libcrypto.a /usr/local/lib/libboost_json.a /usr/local/lib/libboost_program_options.a -lpthread
|
||||
LDLIBS = -lz /usr/local/lib/libssl.a /usr/local/lib/libcrypto.a /usr/local/lib/libboost_json.a /usr/local/lib/libboost_url.a /usr/local/lib/libboost_program_options.a -lpthread
|
||||
else
|
||||
LDLIBS = -lz -lssl -lcrypto -lboost_program_options -lboost_json -lpthread
|
||||
LDLIBS = -lz -lssl -lcrypto -lboost_program_options -lboost_json -lboost_url -lpthread
|
||||
endif
|
||||
|
||||
ifeq ($(USE_UPNP),yes)
|
||||
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
CXX = g++
|
||||
INCFLAGS = -I/usr/openssl/3/include
|
||||
CXXFLAGS := -Wall -std=c++23
|
||||
LDLIBS = -L/usr/openssl/3/lib/64 -lssl -lcrypto -lboost_program_options -lboost_json -lz -lpthread -lsocket
|
||||
LDLIBS = -L/usr/openssl/3/lib/64 -lssl -lcrypto -lboost_program_options -lz -lpthread -lsocket
|
||||
|
||||
ifeq ($(USE_UPNP),yes)
|
||||
DEFINES += -DUSE_UPNP
|
||||
|
||||
@@ -294,7 +294,7 @@ else()
|
||||
endif()
|
||||
endif()
|
||||
|
||||
find_package(Boost REQUIRED COMPONENTS atomic filesystem program_options OPTIONAL_COMPONENTS json)
|
||||
find_package(Boost REQUIRED COMPONENTS atomic filesystem program_options OPTIONAL_COMPONENTS json url)
|
||||
|
||||
if(NOT DEFINED Boost_FOUND)
|
||||
message(SEND_ERROR "Boost is not found, or your boost version was below 1.46. Please download Boost!")
|
||||
@@ -304,6 +304,10 @@ if(Boost_json_FOUND AND NOT WITH_STATIC)
|
||||
add_definitions(-DBOOST_JSON_DYN_LINK)
|
||||
endif()
|
||||
|
||||
if(Boost_url_FOUND AND NOT WITH_STATIC)
|
||||
add_definitions(-DBOOST_URL_DYN_LINK)
|
||||
endif()
|
||||
|
||||
find_package(OpenSSL REQUIRED)
|
||||
if(NOT DEFINED OPENSSL_FOUND)
|
||||
message(SEND_ERROR "Could not find OpenSSL. Please download and install it first!")
|
||||
|
||||
Reference in New Issue
Block a user