summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2023-10-08 10:57:46 +0800
committerGitHub <[email protected]>2023-10-08 10:57:46 +0800
commitf75e46ba64c92646b4db4613e3800993285c63bf (patch)
tree4c27f7fce223cc2336a868838d2e2973b2f199dc
parent761928b900807746a36ae24ce4fd59acafc4e55e (diff)
parent27d740a3ebd2f326d93760f6eca196121dfd7092 (diff)
Merge pull request #4262 from xmake-io/vsxmake
fix vsxmake for modules #4256
-rw-r--r--xmake/plugins/project/vsxmake/vsproj/Xmake.xml4
-rw-r--r--xmake/plugins/project/vsxmake/vsproj/templates/vcxproj.filters/File.mpp(filempp)4
-rw-r--r--xmake/plugins/project/vsxmake/vsproj/templates/vcxproj/File.mpp(filempp)4
3 files changed, 7 insertions, 5 deletions
diff --git a/xmake/plugins/project/vsxmake/vsproj/Xmake.xml b/xmake/plugins/project/vsxmake/vsproj/Xmake.xml
index 8f2869b15..11dddabec 100644
--- a/xmake/plugins/project/vsxmake/vsproj/Xmake.xml
+++ b/xmake/plugins/project/vsxmake/vsproj/Xmake.xml
@@ -12,7 +12,7 @@
<Rule.DataSource>
<DataSource Persistence="UserFile" Label="XmakeConfiguration"/>
</Rule.DataSource>
-
+
<BoolProperty
Name="XmakeVerbose"
DisplayName="Print verbose information"
@@ -43,7 +43,7 @@
Category="Common"
Description="When use 'compile' command to build selected files, add '--rebuild' flag to force rebuild files."
Switch="rebuild" />
-
+
<StringProperty
Name="XmakeCleanFlags"
DisplayName="Clean flags"
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)
index 9aee25191..134ee2b62 100644
--- 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="#path#">
+ <ClCompile Include="#path#">
<Filter>#dir#</Filter>
- </None>
+ </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)
index 6429fe3e9..7c435b1c6 100644
--- a/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj/File.mpp(filempp)
+++ b/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj/File.mpp(filempp)
@@ -1 +1,3 @@
- <None Include="#path#" />
+ <ClCompile Include="#path#">
+ <CompileAs>CompileAsCppModule</CompileAs>
+ </ClCompile>