diff options
| author | ruki <[email protected]> | 2019-11-01 20:17:42 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-11-01 20:17:42 +0800 |
| commit | 60b894c005f2074380e054dfc20d352ee9123bf8 (patch) | |
| tree | 9777d2abf7f4d47f5c20820c15cb491e2fb3d9dd | |
| parent | ef055ce4ca8ba96422488e115ab43a3fb981ea21 (diff) | |
| parent | 155deaae3ea36460929db9c8f28f2b97a319f54c (diff) | |
Merge pull request #613 from OpportunityLiu/dev
fix WindowsTargetPlatformVersion & LanguageStandard
| -rw-r--r-- | xmake/modules/core/tools/cl.lua | 8 | ||||
| -rw-r--r-- | xmake/plugins/project/vsxmake/vsproj/Xmake.props | 20 |
2 files changed, 16 insertions, 12 deletions
diff --git a/xmake/modules/core/tools/cl.lua b/xmake/modules/core/tools/cl.lua index c8e20d552..9c60c9e54 100644 --- a/xmake/modules/core/tools/cl.lua +++ b/xmake/modules/core/tools/cl.lua @@ -192,10 +192,10 @@ function nf_language(self, stdname) , gnuxx17 = "-std:c++17" , cxx1z = "-std:c++17" , gnuxx1z = "-std:c++17" - , cxx20 = "-std=c++latest" - , gnuxx20 = "-std=c++latest" - , cxx2a = "-std=c++latest" - , gnuxx2a = "-std=c++latest" + , cxx20 = "-std:c++latest" + , gnuxx20 = "-std:c++latest" + , cxx2a = "-std:c++latest" + , gnuxx2a = "-std:c++latest" } local cxxmaps2 = {} for k, v in pairs(_g.cxxmaps) do diff --git a/xmake/plugins/project/vsxmake/vsproj/Xmake.props b/xmake/plugins/project/vsxmake/vsproj/Xmake.props index 873644f52..19cacd77b 100644 --- a/xmake/plugins/project/vsxmake/vsproj/Xmake.props +++ b/xmake/plugins/project/vsxmake/vsproj/Xmake.props @@ -47,12 +47,6 @@ <XmakeRebuildFile Condition="'$(XmakeRebuildFile)' == ''">false</XmakeRebuildFile> </PropertyGroup> - <PropertyGroup Condition="'$(WindowsTargetPlatformVersion)' == ''"> - <WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)' == '14.0'">10.0.10240.0</WindowsTargetPlatformVersion> - <WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)' == '15.0'">10.0.14393.0</WindowsTargetPlatformVersion> - <WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)' == '16.0'">10.0.17763.0</WindowsTargetPlatformVersion> - <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)' == ''">10.0</WindowsTargetPlatformVersion> - </PropertyGroup> <PropertyGroup Condition="'$(PlatformToolset)' == ''"> <PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset> <PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110</PlatformToolset> @@ -90,9 +84,19 @@ <ItemDefinitionGroup> <ClCompile> <PreprocessorDefinitions>%(PreprocessorDefinitions);$(XmakeDefines)</PreprocessorDefinitions> - <LanguageStandard Condition="'%(LanguageStandard)' == '' And $(XmakeLanguages.Contains('cxx17'))">stdcpp17</LanguageStandard> - <LanguageStandard Condition="'%(LanguageStandard)' == '' And $(XmakeLanguages.Contains('cxx14'))">stdcpp14</LanguageStandard> + <LanguageStandard Condition="'%(LanguageStandard)' == '' And $(XmakeLanguages.Contains('cxx11'))">stdcpp11</LanguageStandard> + <LanguageStandard Condition="'%(LanguageStandard)' == '' And $(XmakeLanguages.Contains('cxx14'))">stdcpp14</LanguageStandard> + <LanguageStandard Condition="'%(LanguageStandard)' == '' And $(XmakeLanguages.Contains('cxx17'))">stdcpp17</LanguageStandard> + <LanguageStandard Condition="'%(LanguageStandard)' == '' And $(XmakeLanguages.Contains('cxx1z'))">stdcpp17</LanguageStandard> + <LanguageStandard Condition="'%(LanguageStandard)' == '' And $(XmakeLanguages.Contains('cxx20'))">stdcpplatest</LanguageStandard> + <LanguageStandard Condition="'%(LanguageStandard)' == '' And $(XmakeLanguages.Contains('cxx2a'))">stdcpplatest</LanguageStandard> + <LanguageStandard Condition="'%(LanguageStandard)' == '' And $(XmakeLanguages.Contains('gnuxx11'))">stdcpp11</LanguageStandard> + <LanguageStandard Condition="'%(LanguageStandard)' == '' And $(XmakeLanguages.Contains('gnuxx14'))">stdcpp14</LanguageStandard> + <LanguageStandard Condition="'%(LanguageStandard)' == '' And $(XmakeLanguages.Contains('gnuxx17'))">stdcpp17</LanguageStandard> + <LanguageStandard Condition="'%(LanguageStandard)' == '' And $(XmakeLanguages.Contains('gnuxx1z'))">stdcpp17</LanguageStandard> + <LanguageStandard Condition="'%(LanguageStandard)' == '' And $(XmakeLanguages.Contains('gnuxx20'))">stdcpplatest</LanguageStandard> + <LanguageStandard Condition="'%(LanguageStandard)' == '' And $(XmakeLanguages.Contains('gnuxx2a'))">stdcpplatest</LanguageStandard> </ClCompile> </ItemDefinitionGroup> |