Merge pull request #2088 from xq114/dev

fix vsxmake on windows
xmake-io · Feb 24, 2022 · 31cc678 · 31cc678
2 parents 13f33d1 + edad33e
commit 31cc678
Show file tree

Hide file tree

Showing 19 changed files with 21 additions and 19 deletions.
diff --git a/xmake/plugins/project/vsxmake/getinfo.lua b/xmake/plugins/project/vsxmake/getinfo.lua
@@ -472,11 +472,13 @@ function main(outputdir, vsinfo)
         target.headerfiles = table.imap(target.headerfiles, function(_, v) return path.relative(v, root) end)
         for _, f in ipairs(table.join(target.sourcefiles, target.headerfiles)) do
             local dir = path.directory(f)
+            local escaped_f = _escape(f)
             -- @see https://github.com/xmake-io/xmake/issues/2039
             dir = _strip_dotdirs(dir)
             target._paths[f] =
             {
-                path = _escape(f),
+                -- @see https://github.com/xmake-io/xmake/issues/2077
+                path = path.is_absolute(escaped_f) and escaped_f or "$(XmakeProjectDir)\\" .. escaped_f,
                 dir = _escape(dir)
             }
             while dir ~= "." do

diff --git a/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj.filters/File.c(filec) b/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj.filters/File.c(filec)
@@ -1,3 +1,3 @@
-    <ClCompile Include="$(XmakeProjectDir)\#path#">
+    <ClCompile Include="#path#">
       <Filter>#dir#</Filter>
     </ClCompile>
diff --git a/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj.filters/File.cu(filecu) b/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj.filters/File.cu(filecu)
@@ -1,3 +1,3 @@
-    <CudaCompile Include="$(XmakeProjectDir)\#path#">
+    <CudaCompile Include="#path#">
       <Filter>#dir#</Filter>
     </CudaCompile>
diff --git a/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj.filters/File.cxx(filecxx) b/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj.filters/File.cxx(filecxx)
@@ -1,3 +1,3 @@
-    <ClCompile Include="$(XmakeProjectDir)\#path#">
+    <ClCompile Include="#path#">
       <Filter>#dir#</Filter>
     </ClCompile>
diff --git a/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj.filters/File.mpp(filempp) b/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj.filters/File.mpp(filempp)
@@ -1,3 +1,3 @@
-    <None Include="$(XmakeProjectDir)\#path#">
+    <None Include="#path#">
       <Filter>#dir#</Filter>
     </None>
diff --git a/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj.filters/File.obj(fileobj) b/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj.filters/File.obj(fileobj)
@@ -1,3 +1,3 @@
-    <Object Include="$(XmakeProjectDir)\#path#">
+    <Object Include="#path#">
       <Filter>#dir#</Filter>
     </Object>
diff --git a/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj.filters/File.rc(filerc) b/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj.filters/File.rc(filerc)
@@ -1,3 +1,3 @@
-    <ResourceCompile Include="$(XmakeProjectDir)\#path#">
+    <ResourceCompile Include="#path#">
       <Filter>#dir#</Filter>
     </ResourceCompile>
diff --git a/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj.filters/File.ui(fileui) b/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj.filters/File.ui(fileui)
@@ -1,3 +1,3 @@
-    <None Include="$(XmakeProjectDir)\#path#">
+    <None Include="#path#">
       <Filter>#dir#</Filter>
     </None>
diff --git a/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj.filters/Include.c(incc) b/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj.filters/Include.c(incc)
@@ -1,3 +1,3 @@
-    <ClInclude Include="$(XmakeProjectDir)\#path#">
+    <ClInclude Include="#path#">
       <Filter>#dir#</Filter>
     </ClInclude>
diff --git a/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj.filters/Include.natvis(incnatvis) b/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj.filters/Include.natvis(incnatvis)
@@ -1,3 +1,3 @@
-    <Natvis Include="$(XmakeProjectDir)\#path#">
+    <Natvis Include="#path#">
       <Filter>#dir#</Filter>
     </Natvis>
diff --git a/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj/File.c(filec) b/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj/File.c(filec)
@@ -1,3 +1,3 @@
-    <ClCompile Include="$(XmakeProjectDir)\#path#">
+    <ClCompile Include="#path#">
       <CompileAs>CompileAsC</CompileAs>
     </ClCompile>
diff --git a/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj/File.cu(filecu) b/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj/File.cu(filecu)
@@ -1 +1 @@
-    <CudaCompile Include="$(XmakeProjectDir)\#path#" />
+    <CudaCompile Include="#path#" />
diff --git a/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj/File.cxx(filecxx) b/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj/File.cxx(filecxx)
@@ -1,3 +1,3 @@
-    <ClCompile Include="$(XmakeProjectDir)\#path#">
+    <ClCompile Include="#path#">
       <CompileAs>CompileAsCpp</CompileAs>
     </ClCompile>
diff --git a/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj/File.mpp(filempp) b/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj/File.mpp(filempp)
@@ -1 +1 @@
-    <None Include="$(XmakeProjectDir)\#path#" />
+    <None Include="#path#" />
diff --git a/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj/File.obj(fileobj) b/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj/File.obj(fileobj)
@@ -1 +1 @@
-    <Object Include="$(XmakeProjectDir)\#path#" />
+    <Object Include="#path#" />
diff --git a/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj/File.rc(filerc) b/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj/File.rc(filerc)
@@ -1 +1 @@
-    <ResourceCompile Include="$(XmakeProjectDir)\#path#" />
+    <ResourceCompile Include="#path#" />
diff --git a/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj/File.ui(fileui) b/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj/File.ui(fileui)
@@ -1 +1 @@
-    <None Include="$(XmakeProjectDir)\#path#" />
+    <None Include="#path#" />
diff --git a/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj/Include.c(incc) b/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj/Include.c(incc)
@@ -1 +1 @@
-    <ClInclude Include="$(XmakeProjectDir)\#path#" />
+    <ClInclude Include="#path#" />
diff --git a/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj/Include.natvis(incnatvis) b/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj/Include.natvis(incnatvis)
@@ -1,3 +1,3 @@
-    <Natvis Include="$(XmakeProjectDir)\#path#">
+    <Natvis Include="#path#">
       <FileType>Document</FileType>
     </Natvis>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<CudaCompile Include="$(XmakeProjectDir)\#path#" />
		<CudaCompile Include="#path#" />
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<None Include="$(XmakeProjectDir)\#path#" />
		<None Include="#path#" />
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<Object Include="$(XmakeProjectDir)\#path#" />
		<Object Include="#path#" />
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<ResourceCompile Include="$(XmakeProjectDir)\#path#" />
		<ResourceCompile Include="#path#" />
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<ClInclude Include="$(XmakeProjectDir)\#path#" />
		<ClInclude Include="#path#" />