From: tobtoht <tob@featherwallet.org>
Date: Tue, 11 Jul 2023 10:06:05 +0000 (+0200)
Subject: depends: c++17 fixes
X-Git-Url: https://git.nutra.tk/v1?a=commitdiff_plain;h=e36534cd19d8a7561ccbe7feaa2555f770405fec;p=gamesguru%2Ffeather.git

depends: c++17 fixes
---

diff --git a/contrib/depends/hosts/mingw32.mk b/contrib/depends/hosts/mingw32.mk
index 604a34d8..5ab3df1c 100644
--- a/contrib/depends/hosts/mingw32.mk
+++ b/contrib/depends/hosts/mingw32.mk
@@ -3,7 +3,7 @@ mingw32_CXX := $(host)-g++-posix
 endif
 
 mingw32_CFLAGS=-pipe
-mingw32_CXXFLAGS=-pipe std=$(CXX_STANDARD)
+mingw32_CXXFLAGS=-pipe -std=$(CXX_STANDARD)
 mingw32_ARFLAGS=cr
 
 mingw32_release_CFLAGS=-O2
diff --git a/contrib/depends/toolchain.cmake.in b/contrib/depends/toolchain.cmake.in
index 86e826e2..4b548732 100644
--- a/contrib/depends/toolchain.cmake.in
+++ b/contrib/depends/toolchain.cmake.in
@@ -111,7 +111,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
   SET(PORT OFF)
   SET(CMAKE_OSX_SYSROOT "@prefix@/native/SDK")
   SET(CMAKE_OSX_DEPLOYMENT_TARGET "11")
-  SET(CMAKE_CXX_STANDARD 14)
+  SET(CMAKE_CXX_STANDARD 17)
   SET(LLVM_ENABLE_PIC OFF)
   SET(LLVM_ENABLE_PIE OFF)
 elseif(CMAKE_SYSTEM_NAME STREQUAL "Android")