Mirrors/i2pd
2
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2025-01-22 21:37:17 +01:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Switch to C++17 for Mac OS X

Browse source
This commit is contained in:
orignal 2024-09-01 15:23:14 -04:00
parent 509c039e2f
commit bbadbdbfdb
4 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile.homebrew
View file

@ -5,7 +5,7 @@ SSLROOT = ${BREWROOT}/opt/openssl@1.1
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++11 NEEDED_CXXFLAGS ?= -std=c++17
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

2
Makefile.osx
View file

@ -1,5 +1,5 @@
CXX = clang++ CXX = clang++
CXXFLAGS := ${CXX_DEBUG} -Wall -std=c++11 CXXFLAGS := ${CXX_DEBUG} -Wall -std=c++17
INCFLAGS = -I/usr/local/include INCFLAGS = -I/usr/local/include
DEFINES := -DMAC_OSX DEFINES := -DMAC_OSX
LDFLAGS := -Wl,-rpath,/usr/local/lib -L/usr/local/lib LDFLAGS := -Wl,-rpath,/usr/local/lib -L/usr/local/lib

2
libi2pd/FS.cpp
View file

@ -9,7 +9,9 @@
#include <algorithm> #include <algorithm>
#if defined(MAC_OSX) #if defined(MAC_OSX)
#if !STD_FILESYSTEM
#include <boost/system/system_error.hpp> #include <boost/system/system_error.hpp>
#endif
#include <TargetConditionals.h> #include <TargetConditionals.h>
#endif #endif

2
libi2pd/FS.h
View file

@ -16,7 +16,7 @@
#include <functional> #include <functional>
#ifndef STD_FILESYSTEM #ifndef STD_FILESYSTEM
# if (!defined(MAC_OSX) && !TARGET_OS_SIMULATOR && \ # if (!TARGET_OS_SIMULATOR && \
(__cplusplus >= 201703L) && __has_include(<filesystem>)) // C++ 17 or higher and supports std::filesystem (__cplusplus >= 201703L) && __has_include(<filesystem>)) // C++ 17 or higher and supports std::filesystem
# define STD_FILESYSTEM 1 # define STD_FILESYSTEM 1
# else # else