Merge pull request #5360 from rainers/fix_vsbuild3

VS: remove deleted files from project, fix conditional compilation
dlang · Jan 21, 2016 · 5ce9dcc · 5ce9dcc
2 parents 605be4c + 2c04a42
commit 5ce9dcc
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 23 deletions.
diff --git a/src/backend/elfobj.c b/src/backend/elfobj.c
@@ -3495,8 +3495,6 @@ void Obj::gotref(symbol *s)
     }
 }
 
-#endif
-
 /******************************************
  * Generate fixup specific to .eh_frame and .gcc_except_table sections.
  * Params:
@@ -3547,3 +3545,5 @@ int dwarf_reftoident(int seg, targ_size_t offset, Symbol *s, targ_size_t val)
 }
 
 #endif
+
+#endif
diff --git a/src/vcbuild/dmd_backend.vcxproj b/src/vcbuild/dmd_backend.vcxproj
@@ -89,9 +89,6 @@
     <ClCompile Include="..\tocsym.c" />
     <ClCompile Include="..\tocvdebug.c" />
     <ClCompile Include="..\todt.c" />
-    <ClCompile Include="..\toelfdebug.c">
-      <ExcludedFromBuild>true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="..\toir.c" />
     <ClCompile Include="..\toobj.c" />
     <ClCompile Include="..\backend\aa.c" />
@@ -185,12 +182,6 @@ popd</Command>
       <Outputs>$(IntDir)generated\optab.c;$(IntDir)generated\debtab.c;$(IntDir)generated\cdxxx.c;$(IntDir)generated\elxxx.c;$(IntDir)generated\tytab.c;$(IntDir)generated\fltables.c;%(Outputs)</Outputs>
       <AdditionalInputs>..\backend\cc.h;..\backend\oper.h;%(AdditionalInputs)</AdditionalInputs>
     </CustomBuild>
-    <ClCompile Include="..\libelf.c">
-      <ExcludedFromBuild>true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\libmach.c">
-      <ExcludedFromBuild>true</ExcludedFromBuild>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\aggregate.h" />

diff --git a/src/vcbuild/dmd_backend.vcxproj.filters b/src/vcbuild/dmd_backend.vcxproj.filters
@@ -19,9 +19,6 @@
     <Filter Include="src\generated">
       <UniqueIdentifier>{6deaa83b-2b97-4159-a330-266507006483}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\no_win">
-      <UniqueIdentifier>{b8c9d61e-7fef-4d7e-83e8-c230ccf89ef5}</UniqueIdentifier>
-    </Filter>
     <Filter Include="src\vcbuild">
       <UniqueIdentifier>{5fa9d849-fc22-4664-bb36-8ed7e1bff041}</UniqueIdentifier>
     </Filter>
@@ -57,9 +54,6 @@
     <ClCompile Include="..\todt.c">
       <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\toelfdebug.c">
-      <Filter>src</Filter>
-    </ClCompile>
     <ClCompile Include="..\toir.c">
       <Filter>src</Filter>
     </ClCompile>
@@ -237,12 +231,6 @@
     <ClCompile Include="..\root\newdelete.c">
       <Filter>src\root</Filter>
     </ClCompile>
-    <ClCompile Include="..\libelf.c">
-      <Filter>src\no_win</Filter>
-    </ClCompile>
-    <ClCompile Include="..\libmach.c">
-      <Filter>src\no_win</Filter>
-    </ClCompile>
     <ClCompile Include="..\backend\backconfig.c">
       <Filter>src\backend</Filter>
     </ClCompile>