fix targetdir,objectdir not used in vsproject#205
Merged
waruqi merged 3 commits intoxmake-io:devfrom Aug 31, 2018
Merged
Conversation
…ng target:targetdir The temporary obj directory of VS is adjusted to match the xmake script, using target:objectdir The vs output file (including pdb, lib, etc.) removes explicit specifications and adjusts to use the $(TargetDir) $(TargetName) name (this setting is not specified to be set automatically, so it is not explicitly specified). This modification also restores the bug of the dynamic library output lib which is inconsistent with the specified directory in xmake. Generate the directory Library of the vs project, including file directory to standardize the path. 1.vs的输出目录调整为和xmake脚本中的一致，使用target:targetdir 2.vs的临时obj目录调整为和xmake脚本中的一致，使用target:objectdir 3.vs输出文件（包括pdb、lib等）去除显式指定，调整为使用$(TargetDir)$(TargetName)命名（该设置不指定会自动设置，所以不用显式指定）。该修改同时修复了动态库输出lib与xmake中指定目录不一致的bug 4.生成vs项目中的链接库目录、包含文件目录进行路径标准化转换
waruqi
reviewed
Aug 30, 2018
| vcprojfile:print("IntermediateDirectory=\"%$(ConfigurationName)\"") | ||
| vcprojfile:print("OutputDirectory=\"%s\"", path.relative(path.absolute(target:targetdir()), vcprojdir)) | ||
| vcprojfile:print("IntermediateDirectory=\"%s\"",path.relative(path.absolute(target:objectdir()), vcprojdir)) | ||
| vcprojfile:print("ConfigurationType=\"%d\"", assert(configuration_types[target:get("kind")])) |
waruqi
reviewed
Aug 30, 2018
| vcxprojfile:print("<IntDir>%$(Configuration)\\</IntDir>") | ||
| vcxprojfile:print("<OutDir>%s\\</OutDir>", path.relative(path.absolute(targetinfo.targetdir), vcxprojdir)) | ||
| vcxprojfile:print("<IntDir>%s\\</IntDir>",path.relative(path.absolute(targetinfo.objectdir),vcxprojdir)) | ||
| vcxprojfile:print("<TargetName>%s</TargetName>", path.basename(targetinfo.targetfile)) |
Member
|
👍 |
Codecov Report
@@ Coverage Diff @@
## dev #205 +/- ##
=======================================
Coverage 55.19% 55.19%
=======================================
Files 342 342
Lines 15920 15920
=======================================
Hits 8787 8787
Misses 7133 7133Continue to review full report at Codecov.
|
Member
|
已merge， 多谢贡献 😄 |
Closed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
1.vs的输出目录调整为和xmake脚本中的一致，使用target:targetdir
2.vs的临时obj目录调整为和xmake脚本中的一致，使用target:objectdir
3.vs输出文件（包括pdb、lib等）去除显式指定，调整为使用$(TargetDir)$(TargetName)命名（该设置不指定会自动设置，所以不用显式指定）。该修改同时修复了动态库输出lib与xmake中指定目录不一致的bug
4.生成vs项目中的链接库目录、包含文件目录进行路径标准化转换