diff options
| author | ruki <[email protected]> | 2025-06-11 23:24:06 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2025-06-11 23:24:06 +0800 |
| commit | 18d52f33a6d4345db39240d15d27d52fa36a4b4d (patch) | |
| tree | 55e33ddf8b5f9da82871b8d059c406c7507bf88c | |
| parent | dfd765e0522345a376f019f655915827e23f69b2 (diff) | |
update target name
4 files changed, 5 insertions, 4 deletions
diff --git a/xmake/plugins/project/vsxmake/getinfo.lua b/xmake/plugins/project/vsxmake/getinfo.lua index d9c4b4b6b..ad3b77c3c 100644 --- a/xmake/plugins/project/vsxmake/getinfo.lua +++ b/xmake/plugins/project/vsxmake/getinfo.lua @@ -495,7 +495,8 @@ function main(outputdir, vsinfo) local _target = targets[targetname] -- init target info - _target.target = targetname + _target.targetname = targetname + _target.targetname_inpath = vsutils.translate_path(targetname) _target.vcxprojdir = path.join(vsinfo.vcxproj_rootdir, targetname) _target.vcxprojdir_relative_sln = path.relative(_target.vcxprojdir, vsinfo.solution_dir) _target.target_id = hash.uuid4(targetname) diff --git a/xmake/scripts/vsxmake/vsproj/templates/sln/Project(target) b/xmake/scripts/vsxmake/vsproj/templates/sln/Project(target) index 87d435af2..e53697651 100644 --- a/xmake/scripts/vsxmake/vsproj/templates/sln/Project(target) +++ b/xmake/scripts/vsxmake/vsproj/templates/sln/Project(target) @@ -1,2 +1,2 @@ -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "#target#", "#vcxprojdir_relative_sln#\#target#.vcxproj", "{#target_id#}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "#targetname#", "#vcxprojdir_relative_sln#\#targetname_inpath#.vcxproj", "{#target_id#}" EndProject diff --git a/xmake/scripts/vsxmake/vsproj/templates/vcxproj/#target#.vcxproj b/xmake/scripts/vsxmake/vsproj/templates/vcxproj/#target#.vcxproj index 44af5ac40..21a7eb99a 100644 --- a/xmake/scripts/vsxmake/vsproj/templates/vcxproj/#target#.vcxproj +++ b/xmake/scripts/vsxmake/vsproj/templates/vcxproj/#target#.vcxproj @@ -21,7 +21,7 @@ <XmakeScriptDir>#scriptdir#</XmakeScriptDir> <XmakeProjectDir>#projectdir#</XmakeProjectDir> <XmakeProjectFile>#projectfile#</XmakeProjectFile> - <XmakeTarget>#target#</XmakeTarget> + <XmakeTarget>#targetname#</XmakeTarget> </PropertyGroup> <PropertyGroup Label="XmakeProgram"> <XmakeProgramDir Condition="'$(XmakeProgramDir)' == ''">$(XMAKE_PROGRAM_DIR)</XmakeProgramDir> diff --git a/xmake/scripts/vsxmake/vsproj/templates/vcxproj/ProjectRef(dep) b/xmake/scripts/vsxmake/vsproj/templates/vcxproj/ProjectRef(dep) index 33434eca3..13ef4b251 100644 --- a/xmake/scripts/vsxmake/vsproj/templates/vcxproj/ProjectRef(dep) +++ b/xmake/scripts/vsxmake/vsproj/templates/vcxproj/ProjectRef(dep) @@ -1,3 +1,3 @@ - <ProjectReference Include="..\#target#\#target#.vcxproj"> + <ProjectReference Include="..\#targetname_inpath#\#targetname_inpath#.vcxproj"> <Project>{#target_id#}</Project> </ProjectReference> |