diff --git a/COMPILING.md b/COMPILING.md index 171696c..7a2c455 100644 --- a/COMPILING.md +++ b/COMPILING.md @@ -1,19 +1,24 @@ ### Windows -1) Open the solution in VS2017 +#### *Standalone* + +1) Open the solution in Visual Studio 2019 2) Compile as Release/x64 3) Run #### *Libretro* -1) Open the solution in VS2017 +1) Open the solution in Visual Studio 2019 2) Compile as Libretro/x64 3) Use the "mesen-s_libretro.dll" file in bin/(x64 or x86)/Libretro/mesen-s_libretro.dll +Note: It's also possible to build the Libretro core via MINGW by using the makefile in the Libretro subfolder. ### Linux -To compile Mesen-S under Linux you will need a recent version of clang/gcc. This is because Mesen-S requires a C++14 compiler, along with support for the filesystem API (C++17). Additionally, Mesen-S has the following dependencies: +#### *Standalone* + +To compile Mesen-S under Linux you will need a relatively recent version of clang or gcc that supports the C++17 filesystem API.) Additionally, Mesen-S has the following dependencies: * Mono 5.18+ (package: mono-devel) * SDL2 (package: libsdl2-dev) @@ -30,9 +35,5 @@ Examples: #### *Libretro* -To compile the libretro core you will need a recent version of clang/gcc. This is because Mesen-S requires a C++14 compiler, along with support for the filesystem API (C++17). - -Running "make libretro" will build the core and put it in "bin/mesen-s_libretro.(x64 or x86).so". -LTO is supported under clang, which gives a large performance boost (25-30%+), so turning it on is highly recommended (see makefile for details). - -**Note:** There is also another makefile in the Libretro folder - this is used by the RetroArch buildbot to build the core. You can also try using this makefile if you are having issues with the one in the root folder. +To compile the Libretro core you will need a version of clang/gcc that supports C++14. +Run "make" from the "Libretro" subfolder to build the Libretro core. diff --git a/Core/Core.vcxproj b/Core/Core.vcxproj index eb36277..b44a3cb 100644 --- a/Core/Core.vcxproj +++ b/Core/Core.vcxproj @@ -322,74 +322,74 @@ Win32Proj Core Core - 10.0.16299.0 + 10.0 StaticLibrary true - v141 + v142 Unicode StaticLibrary true - v141 + v142 Unicode StaticLibrary false - v141 + v142 true Unicode StaticLibrary false - v141 + v142 true Unicode StaticLibrary false - v141 + v142 true Unicode StaticLibrary false - v141 + v142 true Unicode StaticLibrary false - v141 + v142 true Unicode StaticLibrary false - v141 + v142 true Unicode StaticLibrary false - v141 + v142 true Unicode StaticLibrary false - v141 + v142 true Unicode @@ -433,6 +433,7 @@ $(LibraryPath) $(SolutionDir)\bin\$(PlatformTarget)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + false true @@ -440,46 +441,55 @@ $(LibraryPath) $(SolutionDir)\bin\$(PlatformTarget)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + false false $(SolutionDir)\bin\$(PlatformTarget)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + false false $(SolutionDir)\bin\$(PlatformTarget)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + false false $(SolutionDir)\bin\$(PlatformTarget)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + false false $(SolutionDir)\bin\$(PlatformTarget)\PGO Profile\ obj\$(Platform)\PGO Profile\ + false false $(SolutionDir)\bin\$(PlatformTarget)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + false false $(SolutionDir)\bin\$(PlatformTarget)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + false false $(SolutionDir)\bin\$(PlatformTarget)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + false false $(SolutionDir)\bin\$(PlatformTarget)\PGO Profile\ obj\$(Platform)\PGO Profile\ + false diff --git a/InteropDLL/InteropDLL.vcxproj b/InteropDLL/InteropDLL.vcxproj index 1b49191..a67bf1a 100644 --- a/InteropDLL/InteropDLL.vcxproj +++ b/InteropDLL/InteropDLL.vcxproj @@ -46,74 +46,74 @@ {37749BB2-FA78-4EC9-8990-5628FC0BBA19} Win32Proj InteropDLL - 10.0.16299.0 + 10.0 DynamicLibrary true - v141 + v142 Unicode DynamicLibrary true - v141 + v142 Unicode DynamicLibrary false - v141 + v142 true Unicode DynamicLibrary false - v141 + v142 true Unicode DynamicLibrary false - v141 + v142 true Unicode DynamicLibrary false - v141 + v142 true Unicode DynamicLibrary false - v141 + v142 true Unicode DynamicLibrary false - v141 + v142 true Unicode DynamicLibrary false - v141 + v142 true Unicode DynamicLibrary false - v141 + v142 true Unicode @@ -156,60 +156,70 @@ MesenSCore $(SolutionDir)\bin\$(PlatformTarget)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + false true MesenSCore $(SolutionDir)\bin\$(PlatformTarget)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + false false MesenSCore $(SolutionDir)\bin\$(PlatformTarget)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + false false MesenSCore $(SolutionDir)\bin\$(PlatformTarget)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + false false MesenSCore $(SolutionDir)\bin\$(PlatformTarget)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + false false MesenSCore $(SolutionDir)\bin\$(PlatformTarget)\PGO Profile\ obj\$(Platform)\PGO Profile\ + false false MesenSCore $(SolutionDir)\bin\$(PlatformTarget)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + false false MesenSCore $(SolutionDir)\bin\$(PlatformTarget)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + false false MesenSCore $(SolutionDir)\bin\$(PlatformTarget)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + false false MesenSCore $(SolutionDir)\bin\$(PlatformTarget)\PGO Profile\ obj\$(Platform)\PGO Profile\ + false diff --git a/Libretro/Libretro.vcxproj b/Libretro/Libretro.vcxproj index 59caf30..2249b5f 100644 --- a/Libretro/Libretro.vcxproj +++ b/Libretro/Libretro.vcxproj @@ -31,47 +31,47 @@ {4432139E-528B-44DE-961C-B37CD5E92E0E} Win32Proj Libretro - 10.0.16299.0 + 10.0 Libretro DynamicLibrary true - v141 + v142 Unicode DynamicLibrary false - v141 + v142 true Unicode DynamicLibrary false - v141 + v142 true Unicode DynamicLibrary true - v141 + v142 Unicode DynamicLibrary false - v141 + v142 true Unicode DynamicLibrary false - v141 + v142 true Unicode @@ -104,36 +104,42 @@ $(SolutionDir)\bin\$(PlatformTarget)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ mesen-s_libretro + false false $(SolutionDir)\bin\$(PlatformTarget)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ mesen-s_libretro + false true $(SolutionDir)\bin\$(PlatformTarget)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ mesen-s_libretro + false true $(SolutionDir)\bin\$(PlatformTarget)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ mesen-s_libretro + false false $(SolutionDir)\bin\$(PlatformTarget)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ mesen-s_libretro + false false $(SolutionDir)\bin\$(PlatformTarget)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ mesen-s_libretro + false diff --git a/Lua/Lua.vcxproj b/Lua/Lua.vcxproj index 4837d19..e082cd8 100644 --- a/Lua/Lua.vcxproj +++ b/Lua/Lua.vcxproj @@ -141,74 +141,74 @@ {B609E0A0-5050-4871-91D6-E760633BCDD1} Win32Proj Lua - 10.0.16299.0 + 10.0 StaticLibrary true - v141 + v142 Unicode StaticLibrary false - v141 + v142 true Unicode StaticLibrary false - v141 + v142 true Unicode StaticLibrary false - v141 + v142 true Unicode StaticLibrary false - v141 + v142 true Unicode StaticLibrary true - v141 + v142 Unicode StaticLibrary false - v141 + v142 true Unicode StaticLibrary false - v141 + v142 true Unicode StaticLibrary false - v141 + v142 true Unicode StaticLibrary false - v141 + v142 true Unicode @@ -251,42 +251,52 @@ $(SolutionDir)\bin\$(PlatformTarget)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + false $(SolutionDir)\bin\$(PlatformTarget)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + false $(SolutionDir)\bin\$(PlatformTarget)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + false $(SolutionDir)\bin\$(PlatformTarget)\PGO Profile\ obj\$(Platform)\PGO Profile\ + false $(SolutionDir)\bin\$(PlatformTarget)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + false $(SolutionDir)\bin\$(PlatformTarget)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + false $(SolutionDir)\bin\$(PlatformTarget)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + false $(SolutionDir)\bin\$(PlatformTarget)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + false $(SolutionDir)\bin\$(PlatformTarget)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + false $(SolutionDir)\bin\$(PlatformTarget)\PGO Profile\ obj\$(Platform)\PGO Profile\ + false diff --git a/PGOHelper/PGOHelper.cpp b/PGOHelper/PGOHelper.cpp index c67173a..33feca2 100644 --- a/PGOHelper/PGOHelper.cpp +++ b/PGOHelper/PGOHelper.cpp @@ -1,10 +1,11 @@ +#define _SILENCE_EXPERIMENTAL_FILESYSTEM_DEPRECATION_WARNING #include #include #include #include -#include +#include -namespace fs = std::experimental::filesystem; +namespace fs = std::filesystem; using std::string; using std::vector; diff --git a/PGOHelper/PGOHelper.vcxproj b/PGOHelper/PGOHelper.vcxproj index a5070d7..5928118 100644 --- a/PGOHelper/PGOHelper.vcxproj +++ b/PGOHelper/PGOHelper.vcxproj @@ -46,74 +46,74 @@ {38D74EE1-5276-4D24-AABC-104B912A27D2} Win32Proj PGOHelper - 10.0.16299.0 + 10.0 Application true - v141 + v142 Unicode Application true - v141 + v142 Unicode Application false - v141 + v142 true Unicode Application false - v141 + v142 true Unicode Application false - v141 + v142 true Unicode Application false - v141 + v142 true Unicode Application false - v141 + v142 true Unicode Application false - v141 + v142 true Unicode Application false - v141 + v142 true Unicode Application false - v141 + v142 true Unicode @@ -155,51 +155,61 @@ true $(SolutionDir)\bin\$(PlatformTarget)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + false true $(SolutionDir)\bin\$(PlatformTarget)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + false false $(SolutionDir)\bin\$(PlatformTarget)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + false false $(SolutionDir)\bin\$(PlatformTarget)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + false false $(SolutionDir)\bin\$(PlatformTarget)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + false false $(SolutionDir)\bin\$(PlatformTarget)\PGO Profile\ obj\$(Platform)\PGO Profile\ + false false $(SolutionDir)\bin\$(PlatformTarget)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + false false $(SolutionDir)\bin\$(PlatformTarget)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + false false $(SolutionDir)\bin\$(PlatformTarget)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + false false $(SolutionDir)\bin\$(PlatformTarget)\PGO Profile\ obj\$(Platform)\PGO Profile\ + false @@ -213,6 +223,7 @@ true false MultiThreadedDebug + stdcpp17 Console @@ -231,6 +242,7 @@ true false MultiThreadedDebug + stdcpp17 Console @@ -250,6 +262,7 @@ true MultiThreaded + stdcpp17 Console @@ -271,6 +284,7 @@ true MultiThreaded + stdcpp17 Console @@ -291,6 +305,7 @@ true + stdcpp17 Console @@ -311,6 +326,7 @@ true + stdcpp17 Console @@ -332,6 +348,7 @@ true MultiThreaded + stdcpp17 Console @@ -353,6 +370,7 @@ true MultiThreaded + stdcpp17 Console @@ -373,6 +391,7 @@ true + stdcpp17 Console @@ -393,6 +412,7 @@ true + stdcpp17 Console diff --git a/README.md b/README.md index 9c26e93..d762db2 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ If you want to support this project, please consider making a donation: Development builds of the latest commit are available from Appveyor. For release builds, see the **Releases** tab on GitHub. -**Warning:** These are development builds and may be ***unstable***. Using them may also increase the chances of your settings being corrupted, or having issues when upgrading to the next official release. Additionally, these builds are currently not optimized via PGO and will typically run 20-30% slower than the official release builds. +**Warning:** These are development builds and may be ***unstable***. Using them may also increase the chances of your settings being corrupted, or having issues when upgrading to the next official release. Additionally, these builds are currently not optimized via PGO and will typically run a bit slower than the official release builds. Windows: [![Build status](https://ci.appveyor.com/api/projects/status/cjk97u1yvwnae83x/branch/master?svg=true)](https://ci.appveyor.com/project/Sour/mesen-s/build/artifacts) @@ -21,7 +21,6 @@ The following should be added over time (in no particular order): * Additions/improvements in the debugging tools * SPC7110 support -* MSU-1 support * Satellaview/BS-X support ## Compiling diff --git a/SevenZip/SevenZip.vcxproj b/SevenZip/SevenZip.vcxproj index 3fc2fb8..eba1336 100644 --- a/SevenZip/SevenZip.vcxproj +++ b/SevenZip/SevenZip.vcxproj @@ -87,74 +87,74 @@ {52C4BA3A-E699-4305-B23F-C9083FD07AB6} Win32Proj SevenZip - 10.0.16299.0 + 10.0 StaticLibrary true - v141 + v142 Unicode StaticLibrary false - v141 + v142 true Unicode StaticLibrary false - v141 + v142 true Unicode StaticLibrary false - v141 + v142 true Unicode StaticLibrary false - v141 + v142 true Unicode StaticLibrary true - v141 + v142 Unicode StaticLibrary false - v141 + v142 true Unicode StaticLibrary false - v141 + v142 true Unicode StaticLibrary false - v141 + v142 true Unicode StaticLibrary false - v141 + v142 true Unicode @@ -197,42 +197,52 @@ $(SolutionDir)\bin\$(PlatformTarget)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + false $(SolutionDir)\bin\$(PlatformTarget)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + false $(SolutionDir)\bin\$(PlatformTarget)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + false $(SolutionDir)\bin\$(PlatformTarget)\PGO Profile\ obj\$(Platform)\PGO Profile\ + false $(SolutionDir)\bin\$(PlatformTarget)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + false $(SolutionDir)\bin\$(PlatformTarget)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + false $(SolutionDir)\bin\$(PlatformTarget)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + false $(SolutionDir)\bin\$(PlatformTarget)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + false $(SolutionDir)\bin\$(PlatformTarget)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + false $(SolutionDir)\bin\$(PlatformTarget)\PGO Profile\ obj\$(Platform)\PGO Profile\ + false diff --git a/Utilities/FolderUtilities.cpp b/Utilities/FolderUtilities.cpp index 68d3dc1..f9765ea 100644 --- a/Utilities/FolderUtilities.cpp +++ b/Utilities/FolderUtilities.cpp @@ -2,8 +2,9 @@ //TODO: Use non-experimental namespace (once it is officially supported by VC & GCC) #ifndef LIBRETRO -#include -namespace fs = std::experimental::filesystem; +#define _SILENCE_EXPERIMENTAL_FILESYSTEM_DEPRECATION_WARNING +#include +namespace fs = std::filesystem; #endif #include diff --git a/Utilities/Utilities.vcxproj b/Utilities/Utilities.vcxproj index 583d7c5..91c3129 100644 --- a/Utilities/Utilities.vcxproj +++ b/Utilities/Utilities.vcxproj @@ -46,74 +46,74 @@ {B5330148-E8C7-46BA-B54E-69BE59EA337D} Win32Proj Utilities - 10.0.16299.0 + 10.0 StaticLibrary true - v141 + v142 Unicode StaticLibrary true - v141 + v142 Unicode StaticLibrary false - v141 + v142 true Unicode StaticLibrary false - v141 + v142 true Unicode StaticLibrary false - v141 + v142 true Unicode StaticLibrary false - v141 + v142 true Unicode StaticLibrary false - v141 + v142 true Unicode StaticLibrary false - v141 + v142 true Unicode StaticLibrary false - v141 + v142 true Unicode StaticLibrary false - v141 + v142 true Unicode @@ -154,49 +154,59 @@ $(SolutionDir)\bin\$(PlatformTarget)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + false $(SolutionDir)\bin\$(PlatformTarget)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + false $(SolutionDir)\bin\$(PlatformTarget)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + false $(SolutionDir)\bin\$(PlatformTarget)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + false $(SolutionDir)\bin\$(PlatformTarget)\PGO Profile\ obj\$(Platform)\PGO Profile\ + false $(SolutionDir)\bin\$(PlatformTarget)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + false $(SolutionDir)\bin\$(PlatformTarget)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + false $(SolutionDir)\bin\$(PlatformTarget)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + false $(SolutionDir)\bin\$(PlatformTarget)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + false $(SolutionDir)\bin\$(PlatformTarget)\PGO Profile\ obj\$(Platform)\PGO Profile\ + false Use Level3 Disabled - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + _SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true Cdecl @@ -205,6 +215,7 @@ MultiThreadedDebug true false + stdcpp17 Windows @@ -216,7 +227,7 @@ Use Level3 Disabled - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + _SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true Cdecl @@ -224,6 +235,7 @@ MultiThreadedDebug true false + stdcpp17 Windows @@ -237,12 +249,13 @@ MaxSpeed true true - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + _SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded true + stdcpp17 Windows @@ -258,12 +271,13 @@ MaxSpeed true true - LIBRETRO;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + LIBRETRO;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded true + stdcpp17 Windows @@ -279,12 +293,13 @@ MaxSpeed true true - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + _SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded true + stdcpp17 Windows @@ -300,12 +315,13 @@ MaxSpeed true true - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + _SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded true + stdcpp17 Windows @@ -321,12 +337,13 @@ MaxSpeed true true - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + _SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded true + stdcpp17 Windows @@ -342,12 +359,13 @@ MaxSpeed true true - LIBRETRO;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + LIBRETRO;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded true + stdcpp17 Windows @@ -363,12 +381,13 @@ MaxSpeed true true - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + _SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded true + stdcpp17 Windows @@ -384,12 +403,13 @@ MaxSpeed true true - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + _SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true MultiThreaded true + stdcpp17 Windows diff --git a/Windows/Windows.vcxproj b/Windows/Windows.vcxproj index dc86dc5..ec27504 100644 --- a/Windows/Windows.vcxproj +++ b/Windows/Windows.vcxproj @@ -46,74 +46,74 @@ {7761E790-B42C-4179-8550-8365FF9EB23E} Win32Proj Windows - 10.0.16299.0 + 10.0 StaticLibrary true - v141 + v142 MultiByte StaticLibrary true - v141 + v142 MultiByte StaticLibrary false - v141 + v142 true MultiByte StaticLibrary false - v141 + v142 true MultiByte StaticLibrary false - v141 + v142 true MultiByte StaticLibrary false - v141 + v142 true MultiByte StaticLibrary false - v141 + v142 true MultiByte StaticLibrary false - v141 + v142 true MultiByte StaticLibrary false - v141 + v142 true MultiByte StaticLibrary false - v141 + v142 true MultiByte @@ -154,42 +154,52 @@ $(SolutionDir)\bin\$(PlatformTarget)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + false $(SolutionDir)\bin\$(PlatformTarget)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + false $(SolutionDir)\bin\$(PlatformTarget)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + false $(SolutionDir)\bin\$(PlatformTarget)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + false $(SolutionDir)\bin\$(PlatformTarget)\PGO Profile\ obj\$(Platform)\PGO Profile\ + false $(SolutionDir)\bin\$(PlatformTarget)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + false $(SolutionDir)\bin\$(PlatformTarget)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + false $(SolutionDir)\bin\$(PlatformTarget)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + false $(SolutionDir)\bin\$(PlatformTarget)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + false $(SolutionDir)\bin\$(PlatformTarget)\PGO Profile\ obj\$(Platform)\PGO Profile\ + false @@ -201,6 +211,7 @@ MultiThreadedDebug true false + stdcpp17 Windows @@ -217,6 +228,7 @@ MultiThreadedDebug true false + stdcpp17 Windows @@ -233,6 +245,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreaded true + stdcpp17 Windows @@ -251,6 +264,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreaded true + stdcpp17 Windows @@ -269,6 +283,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreaded true + stdcpp17 Windows @@ -287,6 +302,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreaded true + stdcpp17 Windows @@ -305,6 +321,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreaded true + stdcpp17 Windows @@ -323,6 +340,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreaded true + stdcpp17 Windows @@ -341,6 +359,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreaded true + stdcpp17 Windows @@ -359,6 +378,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreaded true + stdcpp17 Windows diff --git a/makefile b/makefile index 7a0dd36..68599b2 100644 --- a/makefile +++ b/makefile @@ -32,7 +32,7 @@ else PROFILE_USE_FLAG = -fprofile-instr-use=$(CURDIR)/PGOHelper/pgo.profdata endif -GCCOPTIONS=-fPIC -Wall --std=c++14 -O3 $(MESENFLAGS) +GCCOPTIONS=-fPIC -Wall --std=c++17 -O3 $(MESENFLAGS) CCOPTIONS=-fPIC -Wall -O3 $(MESENFLAGS) LINKOPTIONS=