diff options
| author | ruki <[email protected]> | 2016-09-19 11:04:33 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2016-09-19 11:04:33 +0800 |
| commit | b6de2bb9a396b49ac8c4447fe2b584118e90d99b (patch) | |
| tree | d8fdcdea8c2a164b39cab38f7fa92d4a414a6523 | |
| parent | ad1f001f3384290b6e3dd19fa46e1b11252ec038 (diff) | |
fix vs2010 and vs2012 project plugin bug
| -rw-r--r-- | xmake/platforms/iphoneos/checker.lua | 2 | ||||
| -rw-r--r-- | xmake/plugins/project/vstudio/impl/vs201x_vcxproj_filters.lua | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/xmake/platforms/iphoneos/checker.lua b/xmake/platforms/iphoneos/checker.lua index 06fb055b3..47face8ef 100644 --- a/xmake/platforms/iphoneos/checker.lua +++ b/xmake/platforms/iphoneos/checker.lua @@ -50,7 +50,7 @@ function _check_toolchains(config) checker.check_toolchain(config, "mm", "xcrun -sdk iphonesimulator ", "clang", "the objc compiler") checker.check_toolchain(config, "mxx", "xcrun -sdk iphonesimulator ", "clang++", "the objc++ compiler") checker.check_toolchain(config, "mxx", "xcrun -sdk iphonesimulator ", "clang", "the objc++ compiler") - checker.check_toolchain(config, "as", "xcrun -sdk iphonesimulator ", "clang", "the assember") + checker.check_toolchain(config, "as", "xcrun -sdk iphonesimulator ", "clang", "the assember") checker.check_toolchain(config, "ld", "xcrun -sdk iphonesimulator ", "clang++", "the linker") checker.check_toolchain(config, "ld", "xcrun -sdk iphonesimulator ", "clang", "the linker") checker.check_toolchain(config, "ar", "xcrun -sdk iphonesimulator ", "ar", "the static library archiver") diff --git a/xmake/plugins/project/vstudio/impl/vs201x_vcxproj_filters.lua b/xmake/plugins/project/vstudio/impl/vs201x_vcxproj_filters.lua index 969edf240..68d13509f 100644 --- a/xmake/plugins/project/vstudio/impl/vs201x_vcxproj_filters.lua +++ b/xmake/plugins/project/vstudio/impl/vs201x_vcxproj_filters.lua @@ -38,7 +38,7 @@ function _make_header(filtersfile, vsinfo, target) -- make header
filtersfile:print("<?xml version=\"1.0\" encoding=\"utf-8\"?>")
- filtersfile:enter("<Project ToolsVersion=\"%s\" xmlns=\"http://schemas.microsoft.com/developer/msbuild/2003\">", vsinfo.filters_version or version[vsinfo.vstudio_version])
+ filtersfile:enter("<Project ToolsVersion=\"%s\" xmlns=\"http://schemas.microsoft.com/developer/msbuild/2003\">", vsinfo.filters_version or versions[vsinfo.vstudio_version])
end
-- make tailer
|