support vs2019 preview

5 files changed, 48 insertions, 2 deletions

diff --git a/xmake/plugins/project/main.lua b/xmake/plugins/project/main.lua
index 75da9309f..fc55fd4a1 100644..100755
--- a/xmake/plugins/project/main.lua
+++ b/xmake/plugins/project/main.lua
@@ -37,6 +37,7 @@ import("vstudio.vs2012")
 import("vstudio.vs2013")
 import("vstudio.vs2015")
 import("vstudio.vs2017")
+import("vstudio.vs2019")
 import("clang.compile_commands")
 
 -- make project
@@ -56,6 +57,7 @@ function _make(kind)
     ,   vs2013           = vs2013.make
     ,   vs2015           = vs2015.make
     ,   vs2017           = vs2017.make
+    ,   vs2019           = vs2019.make
     ,   compile_commands = compile_commands.make
     }
     assert(maps[kind], "the project kind(%s) is not supported!", kind)
diff --git a/xmake/plugins/project/vstudio/impl/vs201x_vcxproj.lua b/xmake/plugins/project/vstudio/impl/vs201x_vcxproj.lua
index 1c0bc1513..3d187acb1 100644
--- a/xmake/plugins/project/vstudio/impl/vs201x_vcxproj.lua
+++ b/xmake/plugins/project/vstudio/impl/vs201x_vcxproj.lua
@@ -24,7 +24,6 @@
 
 -- imports
 import("core.project.config")
-import("core.tool.compiler")
 import("core.language.language")
 import("vsfile")
 
@@ -39,6 +38,7 @@ function _get_toolset_ver(targetinfo, vsinfo)
     ,   vs2013 = "v120"
     ,   vs2015 = "v140"
     ,   vs2017 = "v141"
+    ,   vs2019 = "v142"
     }
 
     -- get toolset version from vs version
@@ -72,6 +72,7 @@ function _get_platform_sdkver(target, vsinfo)
     {
         vs2015 = "10.0.10240.0"
     ,   vs2017 = "10.0.14393.0"
+    ,   vs2019 = "10.0.17763.0"
     }
 
     -- get sdk version for vcvarsall[arch].WindowsSDKVersion
@@ -178,6 +179,7 @@ function _make_header(vcxprojfile, vsinfo)
     ,   vs2013 = '12'
     ,   vs2015 = '14'
     ,   vs2017 = '15'
+    ,   vs2019 = '16'
     }
 
     -- make header
diff --git a/xmake/plugins/project/vstudio/impl/vs201x_vcxproj_filters.lua b/xmake/plugins/project/vstudio/impl/vs201x_vcxproj_filters.lua
index f1fa03e9e..0a850bda1 100644..100755
--- a/xmake/plugins/project/vstudio/impl/vs201x_vcxproj_filters.lua
+++ b/xmake/plugins/project/vstudio/impl/vs201x_vcxproj_filters.lua
@@ -37,6 +37,7 @@ function _make_header(filtersfile, vsinfo)
     ,   vs2013 = '12.0'

     ,   vs2015 = '14.0'

     ,   vs2017 = '15.0'

+    ,   vs2019 = '16.0'

     }

 

     -- make header

diff --git a/xmake/plugins/project/vstudio/vs2017.lua b/xmake/plugins/project/vstudio/vs2017.lua
index 2fe1e4b03..00b910a03 100644..100755
--- a/xmake/plugins/project/vstudio/vs2017.lua
+++ b/xmake/plugins/project/vstudio/vs2017.lua
@@ -19,7 +19,7 @@
 -- Copyright (C) 2015 - 2019, TBOOX Open Source Group.
 --
 -- @author      ruki
--- @file        vs2015.lua
+-- @file        vs2017.lua
 --
 
 -- imports
diff --git a/xmake/plugins/project/vstudio/vs2019.lua b/xmake/plugins/project/vstudio/vs2019.lua
new file mode 100755
index 000000000..a8d4aff08
--- /dev/null
+++ b/xmake/plugins/project/vstudio/vs2019.lua
@@ -0,0 +1,41 @@
+--!A cross-platform build utility based on Lua
+--
+-- Licensed to the Apache Software Foundation (ASF) under one
+-- or more contributor license agreements.  See the NOTICE file
+-- distributed with this work for additional information
+-- regarding copyright ownership.  The ASF licenses this file
+-- to you under the Apache License, Version 2.0 (the
+-- "License"); you may not use this file except in compliance
+-- with the License.  You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+-- 
+-- Copyright (C) 2015 - 2019, TBOOX Open Source Group.
+--
+-- @author      ruki
+-- @file        vs2019.lua
+--
+
+-- imports
+import("impl.vs201x")
+
+-- make
+function make(outputdir)
+
+    -- init vstudio info
+    local vsinfo = 
+    {
+        vstudio_version     = "2019"
+    ,   filters_version     = "4.0"
+    ,   solution_version    = "12"
+    }
+
+    -- make project
+    vs201x.make(outputdir, vsinfo)
+end