From a35063dfd653ee19385a4d8599822247abdee170 Mon Sep 17 00:00:00 2001 From: Vincent Stumpf Date: Mon, 13 Feb 2023 10:58:31 -0800 Subject: [PATCH] Upgrade to c++14 (#7593) --- CMakeLists.txt | 2 +- README.md | 2 +- configure | 8 ++++---- configure.ac | 8 ++++---- rAthena.sln | 6 +++--- src/char/char-server.vcxproj | 4 ++++ src/common/common-minicore.vcxproj | 4 ++++ src/common/common.vcxproj | 5 ++++- src/common/core.cpp | 4 ++-- src/login/login-server.vcxproj | 4 ++++ src/map/map-server-generator.vcxproj | 4 ++++ src/map/map-server.vcxproj | 4 ++++ src/tool/csv2yaml.vcxproj | 4 ++++ src/tool/mapcache.vcxproj | 4 ++++ src/tool/yaml2sql.vcxproj | 4 ++++ src/tool/yamlupgrade.vcxproj | 4 ++++ src/web/web-server.vcxproj | 4 ++++ 17 files changed, 59 insertions(+), 16 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index efb037bb92..c00378d856 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,7 +35,7 @@ project( rAthena ) if( CYGWIN ) unset( WIN32 ) endif() -set(CMAKE_CXX_STANDARD 11) # C++11... +set(CMAKE_CXX_STANDARD 14) # C++14... set(CMAKE_CXX_STANDARD_REQUIRED ON) #...is required... #set(CMAKE_CXX_EXTENSIONS OFF) #...without compiler extensions like gnu++11 diff --git a/README.md b/README.md index 2ebc2b1db4..3bd97c5a77 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ Disk Space | 300 MB | 500 MB Operating System | Compiler ------|------ Linux | [gcc-5 or newer](https://www.gnu.org/software/gcc/gcc-5/) / [Make](https://www.gnu.org/software/make/) -Windows | [MS Visual Studio 2013, 2015, 2017](https://www.visualstudio.com/downloads/) +Windows | [MS Visual Studio 2017 or newer](https://www.visualstudio.com/downloads/) ### Required Applications Application | Name diff --git a/configure b/configure index 0dba23eb87..b1180edf87 100755 --- a/configure +++ b/configure @@ -4538,9 +4538,9 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu CFLAGS="$CFLAGS -pipe -ffast-math -Wall" CPPFLAGS="$CPPFLAGS -I../common" -CXXFLAGS="$CXXFLAGS -std=c++11" -#CXXFLAGS="$CXXFLAGS -std=gnu++11" -CXXFLAG_CLEARS="-std=c++11" +CXXFLAGS="$CXXFLAGS -std=c++14" +#CXXFLAGS="$CXXFLAGS -std=gnu++14" +CXXFLAG_CLEARS="-std=c++14" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 $as_echo_n "checking whether byte ordering is bigendian... " >&6; } @@ -7109,7 +7109,7 @@ else $as_echo "no" >&6; } fi -CXXFLAG_CLEARS="-std=c++11 $CPPFLAGS" +CXXFLAG_CLEARS="-std=c++14 $CPPFLAGS" CFLAGS="$OPT_LTO $CFLAGS" CFLAGS_AR="$OPT_LTO_AR $CFLAGS" diff --git a/configure.ac b/configure.ac index 6a4a99a7b6..dba80b996b 100644 --- a/configure.ac +++ b/configure.ac @@ -483,9 +483,9 @@ AC_LANG([C++]) CFLAGS="$CFLAGS -pipe -ffast-math -Wall" CPPFLAGS="$CPPFLAGS -I../common" -CXXFLAGS="$CXXFLAGS -std=c++11" -#CXXFLAGS="$CXXFLAGS -std=gnu++11" -CXXFLAG_CLEARS="-std=c++11" +CXXFLAGS="$CXXFLAGS -std=c++14" +#CXXFLAGS="$CXXFLAGS -std=gnu++14" +CXXFLAG_CLEARS="-std=c++14" AC_C_BIGENDIAN( [AC_MSG_ERROR([[bigendian is not supported... stopping]])], @@ -1355,7 +1355,7 @@ else AC_MSG_RESULT([no]) fi -CXXFLAG_CLEARS="-std=c++11 $CPPFLAGS" +CXXFLAG_CLEARS="-std=c++14 $CPPFLAGS" CFLAGS="$OPT_LTO $CFLAGS" CFLAGS_AR="$OPT_LTO_AR $CFLAGS" AC_SUBST([CFLAGS_AR]) diff --git a/rAthena.sln b/rAthena.sln index 884a0f66c4..9c2d692787 100644 --- a/rAthena.sln +++ b/rAthena.sln @@ -1,8 +1,8 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.40629.0 -MinimumVisualStudioVersion = 12.0.40629.0 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.0.0 +MinimumVisualStudioVersion = 15.0.0.0 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "3rdparty", "3rdparty", "{6ABA1767-6242-4CA0-BA22-A30972DC8918}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "src\common\common.vcxproj", "{F8FD7B1E-8E1C-4CC3-9CD1-2E28F77B6559}" diff --git a/src/char/char-server.vcxproj b/src/char/char-server.vcxproj index 1a18334dc3..6250230842 100644 --- a/src/char/char-server.vcxproj +++ b/src/char/char-server.vcxproj @@ -111,6 +111,7 @@ MultiThreadedDebug $(SolutionDir)src;$(SolutionDir)3rdparty\rapidyaml\src;$(SolutionDir)3rdparty\rapidyaml\ext\c4core\src;%(AdditionalIncludeDirectories) true + stdcpp14 Console @@ -126,6 +127,7 @@ Disabled $(DefineConstants);WIN32;FD_SETSIZE=4096;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;_DEBUG;_CONSOLE;_LIB;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) MultiThreadedDebug + stdcpp14 $(SolutionDir)src;$(SolutionDir)3rdparty\rapidyaml\src;$(SolutionDir)3rdparty\rapidyaml\ext\c4core\src;%(AdditionalIncludeDirectories) @@ -144,6 +146,7 @@ true $(DefineConstants);WIN32;FD_SETSIZE=4096;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) MultiThreaded + stdcpp14 $(SolutionDir)src;$(SolutionDir)3rdparty\rapidyaml\src;$(SolutionDir)3rdparty\rapidyaml\ext\c4core\src;%(AdditionalIncludeDirectories) @@ -164,6 +167,7 @@ true $(DefineConstants);WIN32;FD_SETSIZE=4096;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) MultiThreaded + stdcpp14 $(SolutionDir)src;$(SolutionDir)3rdparty\rapidyaml\src;$(SolutionDir)3rdparty\rapidyaml\ext\c4core\src;%(AdditionalIncludeDirectories) diff --git a/src/common/common-minicore.vcxproj b/src/common/common-minicore.vcxproj index 5dfe58782d..13a6f78239 100644 --- a/src/common/common-minicore.vcxproj +++ b/src/common/common-minicore.vcxproj @@ -128,6 +128,7 @@ MultiThreadedDebug $(SolutionDir)src;$(SolutionDir)3rdparty\zlib\include\;$(SolutionDir)3rdparty\libconfig\ true + stdcpp14 Windows @@ -142,6 +143,7 @@ Disabled $(DefineConstants);WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;MINICORE;_DEBUG;_LIB;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) MultiThreadedDebug + stdcpp14 $(SolutionDir)src;$(SolutionDir)3rdparty\zlib\include\;$(SolutionDir)3rdparty\libconfig\ @@ -159,6 +161,7 @@ true $(DefineConstants);WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;MINICORE;NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreaded + stdcpp14 $(SolutionDir)src;$(SolutionDir)3rdparty\zlib\include\;$(SolutionDir)3rdparty\libconfig\ @@ -178,6 +181,7 @@ true $(DefineConstants);WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;MINICORE;NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreaded + stdcpp14 $(SolutionDir)src;$(SolutionDir)3rdparty\zlib\include\;$(SolutionDir)3rdparty\libconfig\ diff --git a/src/common/common.vcxproj b/src/common/common.vcxproj index 440933ac60..03b329564f 100644 --- a/src/common/common.vcxproj +++ b/src/common/common.vcxproj @@ -161,6 +161,7 @@ MultiThreadedDebug $(SolutionDir)src;$(SolutionDir)\3rdparty\rapidyaml\src;$(SolutionDir)\3rdparty\rapidyaml\ext\c4core\src;%(AdditionalIncludeDirectories) true + stdcpp14 Windows @@ -178,6 +179,7 @@ Disabled $(DefineConstants);WIN32;FD_SETSIZE=4096;PCRE_SUPPORT;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;_DEBUG;_LIB;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) MultiThreadedDebug + stdcpp14 $(SolutionDir)src;$(SolutionDir)\3rdparty\rapidyaml\src;$(SolutionDir)\3rdparty\rapidyaml\ext\c4core\src;%(AdditionalIncludeDirectories) @@ -198,8 +200,8 @@ true $(DefineConstants);WIN32;FD_SETSIZE=4096;PCRE_SUPPORT;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreaded + stdcpp14 $(SolutionDir)src;$(SolutionDir)\3rdparty\rapidyaml\src;$(SolutionDir)\3rdparty\rapidyaml\ext\c4core\src;%(AdditionalIncludeDirectories) - Default Windows @@ -221,6 +223,7 @@ true $(DefineConstants);WIN32;FD_SETSIZE=4096;PCRE_SUPPORT;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreaded + stdcpp14 $(SolutionDir)src;$(SolutionDir)\3rdparty\rapidyaml\src;$(SolutionDir)\3rdparty\rapidyaml\ext\c4core\src;%(AdditionalIncludeDirectories) diff --git a/src/common/core.cpp b/src/common/core.cpp index 2c8d7bc3d5..edbe46f9c6 100644 --- a/src/common/core.cpp +++ b/src/common/core.cpp @@ -28,8 +28,8 @@ #include "strlib.hpp" #ifndef DEPRECATED_COMPILER_SUPPORT - #if defined( _MSC_VER ) && _MSC_VER < 1900 - #error "Visual Studio versions older than Visual Studio 2015 are not officially supported anymore" + #if defined( _MSC_VER ) && _MSC_VER < 1910 + #error "Visual Studio versions older than Visual Studio 2017 are not officially supported anymore" #elif defined( __clang__ ) && __clang_major__ < 6 #error "clang versions older than clang 6.0 are not officially supported anymore" #elif !defined( __clang__ ) && defined( __GNUC__ ) && __GNUC__ < 5 diff --git a/src/login/login-server.vcxproj b/src/login/login-server.vcxproj index 58e5450f9b..70f7d2aafd 100644 --- a/src/login/login-server.vcxproj +++ b/src/login/login-server.vcxproj @@ -110,6 +110,7 @@ FD_SETSIZE=4096;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;WIN32;_DEBUG;_CONSOLE;_LIB;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) MultiThreadedDebug true + stdcpp14 $(SolutionDir)src;%(AdditionalIncludeDirectories) @@ -126,6 +127,7 @@ Disabled FD_SETSIZE=4096;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;WIN32;_DEBUG;_CONSOLE;_LIB;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) MultiThreadedDebug + stdcpp14 $(SolutionDir)src;%(AdditionalIncludeDirectories) @@ -144,6 +146,7 @@ true FD_SETSIZE=4096;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) MultiThreaded + stdcpp14 $(SolutionDir)src;%(AdditionalIncludeDirectories) @@ -164,6 +167,7 @@ true FD_SETSIZE=4096;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) MultiThreaded + stdcpp14 $(SolutionDir)src;%(AdditionalIncludeDirectories) diff --git a/src/map/map-server-generator.vcxproj b/src/map/map-server-generator.vcxproj index ee81d3251e..bb5c858271 100644 --- a/src/map/map-server-generator.vcxproj +++ b/src/map/map-server-generator.vcxproj @@ -113,6 +113,7 @@ MultiThreadedDebug $(SolutionDir)src;$(SolutionDir)\3rdparty\rapidyaml\src;$(SolutionDir)\3rdparty\rapidyaml\ext\c4core\src;$(SolutionDir)\3rdparty\json\include;$(SolutionDir)\3rdparty\pcre\include;%(AdditionalIncludeDirectories) true + stdcpp14 Console @@ -129,6 +130,7 @@ $(DefineConstants);MAP_GENERATOR;WIN32;FD_SETSIZE=4096;PCRE_SUPPORT;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;_DEBUG;_CONSOLE;_LIB;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) 4018 MultiThreadedDebug + stdcpp14 $(SolutionDir)src;$(SolutionDir)\3rdparty\rapidyaml\src;$(SolutionDir)\3rdparty\rapidyaml\ext\c4core\src;$(SolutionDir)\3rdparty\json\include;$(SolutionDir)\3rdparty\pcre\include;%(AdditionalIncludeDirectories) @@ -148,6 +150,7 @@ $(DefineConstants);MAP_GENERATOR;WIN32;FD_SETSIZE=4096;PCRE_SUPPORT;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) MultiThreaded 4018 + stdcpp14 $(SolutionDir)src;$(SolutionDir)\3rdparty\rapidyaml\src;$(SolutionDir)\3rdparty\rapidyaml\ext\c4core\src;$(SolutionDir)\3rdparty\json\include;$(SolutionDir)\3rdparty\pcre\include;%(AdditionalIncludeDirectories) @@ -170,6 +173,7 @@ $(DefineConstants);MAP_GENERATOR;WIN32;FD_SETSIZE=4096;PCRE_SUPPORT;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) MultiThreaded 4018 + stdcpp14 $(SolutionDir)src;$(SolutionDir)\3rdparty\rapidyaml\src;$(SolutionDir)\3rdparty\rapidyaml\ext\c4core\src;$(SolutionDir)\3rdparty\json\include;$(SolutionDir)\3rdparty\pcre\include;%(AdditionalIncludeDirectories) diff --git a/src/map/map-server.vcxproj b/src/map/map-server.vcxproj index 9a1809c7b7..1211c821a7 100644 --- a/src/map/map-server.vcxproj +++ b/src/map/map-server.vcxproj @@ -113,6 +113,7 @@ MultiThreadedDebug $(SolutionDir)src;$(SolutionDir)\3rdparty\rapidyaml\src;$(SolutionDir)\3rdparty\rapidyaml\ext\c4core\src;$(SolutionDir)\3rdparty\pcre\include;%(AdditionalIncludeDirectories) true + stdcpp14 Console @@ -129,6 +130,7 @@ $(DefineConstants);WIN32;FD_SETSIZE=4096;PCRE_SUPPORT;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;_DEBUG;_CONSOLE;_LIB;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) 4018 MultiThreadedDebug + stdcpp14 $(SolutionDir)src;$(SolutionDir)\3rdparty\rapidyaml\src;$(SolutionDir)\3rdparty\rapidyaml\ext\c4core\src;$(SolutionDir)\3rdparty\pcre\include;%(AdditionalIncludeDirectories) @@ -148,6 +150,7 @@ $(DefineConstants);WIN32;FD_SETSIZE=4096;PCRE_SUPPORT;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) MultiThreaded 4018 + stdcpp14 $(SolutionDir)src;$(SolutionDir)\3rdparty\rapidyaml\src;$(SolutionDir)\3rdparty\rapidyaml\ext\c4core\src;$(SolutionDir)\3rdparty\pcre\include;%(AdditionalIncludeDirectories) @@ -170,6 +173,7 @@ $(DefineConstants);WIN32;FD_SETSIZE=4096;PCRE_SUPPORT;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) MultiThreaded 4018 + stdcpp14 $(SolutionDir)src;$(SolutionDir)\3rdparty\rapidyaml\src;$(SolutionDir)\3rdparty\rapidyaml\ext\c4core\src;$(SolutionDir)\3rdparty\pcre\include;%(AdditionalIncludeDirectories) diff --git a/src/tool/csv2yaml.vcxproj b/src/tool/csv2yaml.vcxproj index fd5c508b98..9cbfd8adb4 100644 --- a/src/tool/csv2yaml.vcxproj +++ b/src/tool/csv2yaml.vcxproj @@ -115,6 +115,7 @@ MultiThreadedDebug $(SolutionDir)src;$(SolutionDir)3rdparty\yaml-cpp\include\;$(SolutionDir)3rdparty\rapidyaml\src;$(SolutionDir)3rdparty\rapidyaml\ext\c4core\src true + stdcpp14 Console @@ -130,6 +131,7 @@ Disabled $(DefineConstants);WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;MINICORE;_DEBUG;_CONSOLE;_LIB;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) MultiThreadedDebug + stdcpp14 $(SolutionDir)src;$(SolutionDir)3rdparty\yaml-cpp\include\;$(SolutionDir)3rdparty\rapidyaml\src;$(SolutionDir)3rdparty\rapidyaml\ext\c4core\src @@ -148,6 +150,7 @@ true $(DefineConstants);WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;MINICORE;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) MultiThreaded + stdcpp14 $(SolutionDir)src;$(SolutionDir)3rdparty\yaml-cpp\include\;$(SolutionDir)3rdparty\rapidyaml\src;$(SolutionDir)3rdparty\rapidyaml\ext\c4core\src @@ -168,6 +171,7 @@ true $(DefineConstants);WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;MINICORE;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) MultiThreaded + stdcpp14 $(SolutionDir)src;$(SolutionDir)3rdparty\yaml-cpp\include\;$(SolutionDir)3rdparty\rapidyaml\src;$(SolutionDir)3rdparty\rapidyaml\ext\c4core\src diff --git a/src/tool/mapcache.vcxproj b/src/tool/mapcache.vcxproj index 4c3111e9f9..a8a864c481 100644 --- a/src/tool/mapcache.vcxproj +++ b/src/tool/mapcache.vcxproj @@ -95,6 +95,7 @@ $(DefineConstants);WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;MINICORE;_DEBUG;_CONSOLE;_LIB;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) MultiThreadedDebug true + stdcpp14 $(SolutionDir)src;%(AdditionalIncludeDirectories) @@ -111,6 +112,7 @@ Disabled $(DefineConstants);WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;MINICORE;_DEBUG;_CONSOLE;_LIB;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) MultiThreadedDebug + stdcpp14 $(SolutionDir)src;%(AdditionalIncludeDirectories) @@ -129,6 +131,7 @@ true $(DefineConstants);WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;MINICORE;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) MultiThreaded + stdcpp14 $(SolutionDir)src;%(AdditionalIncludeDirectories) @@ -149,6 +152,7 @@ true $(DefineConstants);WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;MINICORE;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) MultiThreaded + stdcpp14 $(SolutionDir)src;%(AdditionalIncludeDirectories) diff --git a/src/tool/yaml2sql.vcxproj b/src/tool/yaml2sql.vcxproj index a8a8541e24..5cedbf22a3 100644 --- a/src/tool/yaml2sql.vcxproj +++ b/src/tool/yaml2sql.vcxproj @@ -96,6 +96,7 @@ MultiThreadedDebug $(SolutionDir)src;$(SolutionDir)3rdparty\yaml-cpp\include\;$(SolutionDir)3rdparty\rapidyaml\src;$(SolutionDir)3rdparty\rapidyaml\ext\c4core\src true + stdcpp14 Console @@ -111,6 +112,7 @@ Disabled $(DefineConstants);WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;MINICORE;_DEBUG;_CONSOLE;_LIB;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) MultiThreadedDebug + stdcpp14 $(SolutionDir)src;$(SolutionDir)3rdparty\yaml-cpp\include\;$(SolutionDir)3rdparty\rapidyaml\src;$(SolutionDir)3rdparty\rapidyaml\ext\c4core\src @@ -129,6 +131,7 @@ true $(DefineConstants);WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;MINICORE;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) MultiThreaded + stdcpp14 $(SolutionDir)src;$(SolutionDir)3rdparty\yaml-cpp\include\;$(SolutionDir)3rdparty\rapidyaml\src;$(SolutionDir)3rdparty\rapidyaml\ext\c4core\src @@ -149,6 +152,7 @@ true $(DefineConstants);WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;MINICORE;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) MultiThreaded + stdcpp14 $(SolutionDir)src;$(SolutionDir)3rdparty\yaml-cpp\include\;$(SolutionDir)3rdparty\rapidyaml\src;$(SolutionDir)3rdparty\rapidyaml\ext\c4core\src diff --git a/src/tool/yamlupgrade.vcxproj b/src/tool/yamlupgrade.vcxproj index 80cdade9b9..5efc934ecb 100644 --- a/src/tool/yamlupgrade.vcxproj +++ b/src/tool/yamlupgrade.vcxproj @@ -96,6 +96,7 @@ MultiThreadedDebug $(SolutionDir)src;$(SolutionDir)3rdparty\yaml-cpp\include\;$(SolutionDir)3rdparty\rapidyaml\src;$(SolutionDir)3rdparty\rapidyaml\ext\c4core\src true + stdcpp14 Console @@ -111,6 +112,7 @@ Disabled $(DefineConstants);WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;MINICORE;_DEBUG;_CONSOLE;_LIB;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions) MultiThreadedDebug + stdcpp14 $(SolutionDir)src;$(SolutionDir)3rdparty\yaml-cpp\include\;$(SolutionDir)3rdparty\rapidyaml\src;$(SolutionDir)3rdparty\rapidyaml\ext\c4core\src @@ -129,6 +131,7 @@ true $(DefineConstants);WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;MINICORE;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) MultiThreaded + stdcpp14 $(SolutionDir)src;$(SolutionDir)3rdparty\yaml-cpp\include\;$(SolutionDir)3rdparty\rapidyaml\src;$(SolutionDir)3rdparty\rapidyaml\ext\c4core\src @@ -149,6 +152,7 @@ true $(DefineConstants);WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;MINICORE;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) MultiThreaded + stdcpp14 $(SolutionDir)src;$(SolutionDir)3rdparty\yaml-cpp\include\;$(SolutionDir)3rdparty\rapidyaml\src;$(SolutionDir)3rdparty\rapidyaml\ext\c4core\src diff --git a/src/web/web-server.vcxproj b/src/web/web-server.vcxproj index 59150edd9d..95b43c8bc2 100644 --- a/src/web/web-server.vcxproj +++ b/src/web/web-server.vcxproj @@ -98,6 +98,7 @@ 4018;4200 true true + stdcpp14 Console @@ -115,6 +116,7 @@ MultiThreadedDebug $(SolutionDir)src;$(SolutionDir)3rdparty\httplib\;$(SolutionDir)\3rdparty\rapidyaml\src;$(SolutionDir)\3rdparty\rapidyaml\ext\c4core\src;$(SolutionDir)\3rdparty\json\include;%(AdditionalIncludeDirectories) 4018 + stdcpp14 Console @@ -134,6 +136,7 @@ MultiThreaded $(SolutionDir)src;$(SolutionDir)3rdparty\httplib\;$(SolutionDir)\3rdparty\rapidyaml\src;$(SolutionDir)\3rdparty\rapidyaml\ext\c4core\src;$(SolutionDir)\3rdparty\json\include;%(AdditionalIncludeDirectories) 4018 + stdcpp14 Console @@ -155,6 +158,7 @@ MultiThreaded $(SolutionDir)src;$(SolutionDir)3rdparty\httplib\;$(SolutionDir)\3rdparty\rapidyaml\src;$(SolutionDir)\3rdparty\rapidyaml\ext\c4core\src;$(SolutionDir)\3rdparty\json\include;%(AdditionalIncludeDirectories) 4018 + stdcpp14 Console