mirror of
https://github.com/PurpleI2P/i2pd.git
synced 2025-10-17 09:10:21 +01:00
Merge pull request #2242 from wipedlifepotato/VadinPatchForDarwin
patch: patch by vade for macos/darwin
This commit is contained in:
commit
dd029793e1
2 changed files with 9 additions and 4 deletions
|
@ -1,15 +1,20 @@
|
||||||
# root directory holding homebrew
|
# root directory holding homebrew
|
||||||
|
# brew install boost openssl@3 cmake make
|
||||||
BREWROOT = /opt/homebrew
|
BREWROOT = /opt/homebrew
|
||||||
BOOSTROOT = ${BREWROOT}/opt/boost
|
BOOSTROOT = ${BREWROOT}/opt/boost
|
||||||
SSLROOT = ${BREWROOT}/opt/openssl@1.1
|
SSLROOT = ${BREWROOT}/opt/openssl@3
|
||||||
UPNPROOT = ${BREWROOT}/opt/miniupnpc
|
UPNPROOT = ${BREWROOT}/opt/miniupnpc
|
||||||
|
|
||||||
CXXFLAGS ?= ${CXX_DEBUG} -Wall -Wno-overloaded-virtual
|
CXXFLAGS ?= ${CXX_DEBUG} -Wall -Wno-overloaded-virtual
|
||||||
NEEDED_CXXFLAGS ?= -std=c++17
|
NEEDED_CXXFLAGS += -std=c++20
|
||||||
INCFLAGS ?= -I${SSLROOT}/include -I${BOOSTROOT}/include
|
INCFLAGS ?= -I${SSLROOT}/include -I${BOOSTROOT}/include
|
||||||
LDFLAGS ?= ${LD_DEBUG}
|
LDFLAGS ?= ${LD_DEBUG}
|
||||||
DEFINES += -DMAC_OSX
|
DEFINES += -DMAC_OSX
|
||||||
|
|
||||||
|
ifeq ($(shell uname -m), x86_64)
|
||||||
|
CXXFLAGS += -msse
|
||||||
|
endif
|
||||||
|
|
||||||
ifeq ($(USE_STATIC),yes)
|
ifeq ($(USE_STATIC),yes)
|
||||||
LDLIBS = -lz ${SSLROOT}/lib/libcrypto.a ${SSLROOT}/lib/libssl.a ${BOOSTROOT}/lib/libboost_system.a ${BOOSTROOT}/lib/libboost_filesystem.a ${BOOSTROOT}/lib/libboost_program_options.a
|
LDLIBS = -lz ${SSLROOT}/lib/libcrypto.a ${SSLROOT}/lib/libssl.a ${BOOSTROOT}/lib/libboost_system.a ${BOOSTROOT}/lib/libboost_filesystem.a ${BOOSTROOT}/lib/libboost_program_options.a
|
||||||
ifeq ($(USE_UPNP),yes)
|
ifeq ($(USE_UPNP),yes)
|
||||||
|
|
|
@ -24,6 +24,6 @@ endif
|
||||||
|
|
||||||
OSARCH = $(shell uname -p)
|
OSARCH = $(shell uname -p)
|
||||||
|
|
||||||
ifneq ($(OSARCH),powerpc)
|
ifeq ($(shell uname -m), x86_64)
|
||||||
CXXFLAGS += -msse
|
CXXFLAGS += -msse
|
||||||
endif
|
endif
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue