From b6de2bb9a396b49ac8c4447fe2b584118e90d99b Mon Sep 17 00:00:00 2001 From: ruki Date: Mon, 19 Sep 2016 11:04:33 +0800 Subject: fix vs2010 and vs2012 project plugin bug --- xmake/platforms/iphoneos/checker.lua | 2 +- 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("") - filtersfile:enter("", vsinfo.filters_version or version[vsinfo.vstudio_version]) + filtersfile:enter("", vsinfo.filters_version or versions[vsinfo.vstudio_version]) end -- make tailer -- cgit v1.3.1