diff options
| author | Michael Lutz <michi@icosahedron.de> | 2020-05-17 23:32:01 +0200 |
|---|---|---|
| committer | Michael Lutz <michi@icosahedron.de> | 2020-05-21 20:02:34 +0200 |
| commit | 8aef14386fc403ee631f176abf0ec86af7dcd37b (patch) | |
| tree | 7cafaed2c1637e933db7bdd97fa0a621920ce3b2 /projects/openttd_vs142.vcxproj | |
| parent | 63ccb36ef3ecd53a503c0e9fea87f0784802af0f (diff) | |
| download | openttd-8aef14386fc403ee631f176abf0ec86af7dcd37b.tar.xz | |
Add: Optional implementation of std::optional for pre-C++17 compilers.
Sourced from https://github.com/akrzemi1/Optional, Boost Software License, Version 1.0.
Diffstat (limited to 'projects/openttd_vs142.vcxproj')
| -rw-r--r-- | projects/openttd_vs142.vcxproj | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/projects/openttd_vs142.vcxproj b/projects/openttd_vs142.vcxproj index 49858a3e1..2539fe1d5 100644 --- a/projects/openttd_vs142.vcxproj +++ b/projects/openttd_vs142.vcxproj @@ -100,7 +100,7 @@ </HeaderFileName> </Midl> <ClCompile> - <AdditionalOptions>/J /Zc:throwingNew /std:c++latest %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/J /Zc:throwingNew /std:c++latest /Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions> <Optimization>Full</Optimization> <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> <IntrinsicFunctions>true</IntrinsicFunctions> @@ -168,7 +168,7 @@ </HeaderFileName> </Midl> <ClCompile> - <AdditionalOptions>/J /Zc:throwingNew /std:c++latest %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/J /Zc:throwingNew /std:c++latest /Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions> <Optimization>Disabled</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> <AdditionalIncludeDirectories>..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> @@ -223,7 +223,7 @@ </HeaderFileName> </Midl> <ClCompile> - <AdditionalOptions>/J /Zc:throwingNew /std:c++latest %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/J /Zc:throwingNew /std:c++latest /Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions> <Optimization>Full</Optimization> <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> <IntrinsicFunctions>true</IntrinsicFunctions> @@ -289,7 +289,7 @@ </HeaderFileName> </Midl> <ClCompile> - <AdditionalOptions>/J /Zc:throwingNew /std:c++latest %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/J /Zc:throwingNew /std:c++latest /Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions> <Optimization>Disabled</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> <AdditionalIncludeDirectories>..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> @@ -974,6 +974,8 @@ <ClInclude Include="..\src\table\water_land.h" /> <ClCompile Include="..\src\3rdparty\md5\md5.cpp" /> <ClInclude Include="..\src\3rdparty\md5\md5.h" /> + <ClInclude Include="..\src\3rdparty\optional\optional.hpp" /> + <ClInclude Include="..\src\3rdparty\optional\ottd_optional.h" /> <ClCompile Include="..\src\script\script_config.cpp" /> <ClInclude Include="..\src\script\script_config.hpp" /> <ClInclude Include="..\src\script\script_fatalerror.hpp" /> |