summaryrefslogtreecommitdiff
path: root/vsproject/mrustc.vcxproj
diff options
context:
space:
mode:
authorJohn Hodge <tpg@mutabah.net>2019-10-26 16:09:24 +0800
committerJohn Hodge <tpg@mutabah.net>2019-10-26 16:09:24 +0800
commit9ce35b65e5be4ce75b3b7aabe29c432128a17279 (patch)
tree069581e21b424a24c92b1f87e7d00f3af006366d /vsproject/mrustc.vcxproj
parentabd2a151b9107221e753c5b2fe09a143d09ad1f5 (diff)
downloadmrust-9ce35b65e5be4ce75b3b7aabe29c432128a17279.tar.gz
All - Compilation fixes on VS2015 (constructors, warnings, missing files, class/struct disagreement, <algorithm>)
Diffstat (limited to 'vsproject/mrustc.vcxproj')
-rw-r--r--vsproject/mrustc.vcxproj7
1 files changed, 5 insertions, 2 deletions
diff --git a/vsproject/mrustc.vcxproj b/vsproject/mrustc.vcxproj
index 13c4a23e..6cd135f4 100644
--- a/vsproject/mrustc.vcxproj
+++ b/vsproject/mrustc.vcxproj
@@ -157,6 +157,8 @@
<ProjectReference />
</ItemDefinitionGroup>
<ItemGroup>
+ <ClCompile Include="..\..\mrustc-merge_attempt_one\src\trans\auto_impls.cpp" />
+ <ClCompile Include="..\..\mrustc-merge_attempt_one\src\trans\mangling_v2.cpp" />
<ClCompile Include="..\src\ast\ast.cpp" />
<ClCompile Include="..\src\ast\crate.cpp" />
<ClCompile Include="..\src\ast\dump.cpp" />
@@ -166,6 +168,7 @@
<ClCompile Include="..\src\ast\types.cpp" />
<ClCompile Include="..\src\debug.cpp" />
<ClCompile Include="..\src\expand\asm.cpp" />
+ <ClCompile Include="..\src\expand\assert.cpp" />
<ClCompile Include="..\src\expand\cfg.cpp" />
<ClCompile Include="..\src\expand\concat.cpp" />
<ClCompile Include="..\src\expand\crate_tags.cpp" />
@@ -193,6 +196,7 @@
<ClCompile Include="..\src\hir\from_ast_expr.cpp" />
<ClCompile Include="..\src\hir\generic_params.cpp" />
<ClCompile Include="..\src\hir\hir.cpp" />
+ <ClCompile Include="..\src\hir\hir_ops.cpp" />
<ClCompile Include="..\src\hir\path.cpp" />
<ClCompile Include="..\src\hir\pattern.cpp" />
<ClCompile Include="..\src\hir\serialise.cpp" />
@@ -204,9 +208,9 @@
<ClCompile Include="..\src\hir_conv\expand_type.cpp" />
<ClCompile Include="..\src\hir_conv\markings.cpp" />
<ClCompile Include="..\src\hir_conv\resolve_ufcs.cpp" />
+ <ClCompile Include="..\src\hir_conv\resolve_ufcs_outer.cpp" />
<ClCompile Include="..\src\hir_expand\annotate_value_usage.cpp" />
<ClCompile Include="..\src\hir_expand\closures.cpp" />
- <ClCompile Include="..\src\hir_expand\const_eval_full.cpp" />
<ClCompile Include="..\src\hir_expand\erased_types.cpp" />
<ClCompile Include="..\src\hir_expand\reborrow.cpp" />
<ClCompile Include="..\src\hir_expand\ufcs_everything.cpp" />
@@ -259,7 +263,6 @@
<ClCompile Include="..\src\trans\codegen_c_structured.cpp" />
<ClCompile Include="..\src\trans\codegen_mmir.cpp" />
<ClCompile Include="..\src\trans\enumerate.cpp" />
- <ClCompile Include="..\src\trans\mangling.cpp" />
<ClCompile Include="..\src\trans\monomorphise.cpp" />
<ClCompile Include="..\src\trans\target.cpp" />
<ClCompile Include="..\src\trans\trans_list.cpp" />