2 files changed, 149 insertions, 152 deletions

diff --git a/src/core/core.vcxproj b/src/core/core.vcxproj
index 2edb51214..1800b5512 100644
--- a/src/core/core.vcxproj
+++ b/src/core/core.vcxproj
@@ -137,59 +137,59 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="src\arm\disassembler\arm_disasm.cpp" />
-    <ClCompile Include="src\arm\interpreter\armemu.cpp" />
-    <ClCompile Include="src\arm\interpreter\arminit.cpp" />
-    <ClCompile Include="src\arm\interpreter\armmmu.cpp" />
-    <ClCompile Include="src\arm\interpreter\armos.cpp" />
-    <ClCompile Include="src\arm\interpreter\armsupp.cpp" />
-    <ClCompile Include="src\arm\interpreter\armvirt.cpp" />
-    <ClCompile Include="src\arm\interpreter\arm_interpreter.cpp" />
-    <ClCompile Include="src\arm\interpreter\thumbemu.cpp" />
-    <ClCompile Include="src\arm\mmu\arm1176jzf_s_mmu.cpp" />
-    <ClCompile Include="src\core.cpp" />
-    <ClCompile Include="src\core_timing.cpp" />
-    <ClCompile Include="src\elf\elf_reader.cpp" />
-    <ClCompile Include="src\file_sys\directory_file_system.cpp" />
-    <ClCompile Include="src\file_sys\meta_file_system.cpp" />
-    <ClCompile Include="src\hw\hw.cpp" />
-    <ClCompile Include="src\hw\hw_lcd.cpp" />
-    <ClCompile Include="src\loader.cpp" />
-    <ClCompile Include="src\mem_map.cpp" />
-    <ClCompile Include="src\mem_map_funcs.cpp" />
-    <ClCompile Include="src\system.cpp" />
+    <ClCompile Include="arm\disassembler\arm_disasm.cpp" />
+    <ClCompile Include="arm\interpreter\armemu.cpp" />
+    <ClCompile Include="arm\interpreter\arminit.cpp" />
+    <ClCompile Include="arm\interpreter\armmmu.cpp" />
+    <ClCompile Include="arm\interpreter\armos.cpp" />
+    <ClCompile Include="arm\interpreter\armsupp.cpp" />
+    <ClCompile Include="arm\interpreter\armvirt.cpp" />
+    <ClCompile Include="arm\interpreter\arm_interpreter.cpp" />
+    <ClCompile Include="arm\interpreter\thumbemu.cpp" />
+    <ClCompile Include="arm\mmu\arm1176jzf_s_mmu.cpp" />
+    <ClCompile Include="core.cpp" />
+    <ClCompile Include="core_timing.cpp" />
+    <ClCompile Include="elf\elf_reader.cpp" />
+    <ClCompile Include="file_sys\directory_file_system.cpp" />
+    <ClCompile Include="file_sys\meta_file_system.cpp" />
+    <ClCompile Include="hw\hw.cpp" />
+    <ClCompile Include="hw\hw_lcd.cpp" />
+    <ClCompile Include="loader.cpp" />
+    <ClCompile Include="mem_map.cpp" />
+    <ClCompile Include="mem_map_funcs.cpp" />
+    <ClCompile Include="system.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="src\arm\arm_interface.h" />
-    <ClInclude Include="src\arm\disassembler\arm_disasm.h" />
-    <ClInclude Include="src\arm\interpreter\armcpu.h" />
-    <ClInclude Include="src\arm\interpreter\armdefs.h" />
-    <ClInclude Include="src\arm\interpreter\armemu.h" />
-    <ClInclude Include="src\arm\interpreter\armmmu.h" />
-    <ClInclude Include="src\arm\interpreter\armos.h" />
-    <ClInclude Include="src\arm\interpreter\arm_interpreter.h" />
-    <ClInclude Include="src\arm\interpreter\arm_regformat.h" />
-    <ClInclude Include="src\arm\interpreter\skyeye_defs.h" />
-    <ClInclude Include="src\arm\mmu\arm1176jzf_s_mmu.h" />
-    <ClInclude Include="src\arm\mmu\cache.h" />
-    <ClInclude Include="src\arm\mmu\rb.h" />
-    <ClInclude Include="src\arm\mmu\tlb.h" />
-    <ClInclude Include="src\arm\mmu\wb.h" />
-    <ClInclude Include="src\core.h" />
-    <ClInclude Include="src\core_timing.h" />
-    <ClInclude Include="src\elf\elf_reader.h" />
-    <ClInclude Include="src\elf\elf_types.h" />
-    <ClInclude Include="src\file_sys\directory_file_system.h" />
-    <ClInclude Include="src\file_sys\file_sys.h" />
-    <ClInclude Include="src\file_sys\meta_file_system.h" />
-    <ClInclude Include="src\hw\hw.h" />
-    <ClInclude Include="src\hw\hw_lcd.h" />
-    <ClInclude Include="src\loader.h" />
-    <ClInclude Include="src\mem_map.h" />
-    <ClInclude Include="src\system.h" />
+    <ClInclude Include="arm\arm_interface.h" />
+    <ClInclude Include="arm\disassembler\arm_disasm.h" />
+    <ClInclude Include="arm\interpreter\armcpu.h" />
+    <ClInclude Include="arm\interpreter\armdefs.h" />
+    <ClInclude Include="arm\interpreter\armemu.h" />
+    <ClInclude Include="arm\interpreter\armmmu.h" />
+    <ClInclude Include="arm\interpreter\armos.h" />
+    <ClInclude Include="arm\interpreter\arm_interpreter.h" />
+    <ClInclude Include="arm\interpreter\arm_regformat.h" />
+    <ClInclude Include="arm\interpreter\skyeye_defs.h" />
+    <ClInclude Include="arm\mmu\arm1176jzf_s_mmu.h" />
+    <ClInclude Include="arm\mmu\cache.h" />
+    <ClInclude Include="arm\mmu\rb.h" />
+    <ClInclude Include="arm\mmu\tlb.h" />
+    <ClInclude Include="arm\mmu\wb.h" />
+    <ClInclude Include="core.h" />
+    <ClInclude Include="core_timing.h" />
+    <ClInclude Include="elf\elf_reader.h" />
+    <ClInclude Include="elf\elf_types.h" />
+    <ClInclude Include="file_sys\directory_file_system.h" />
+    <ClInclude Include="file_sys\file_sys.h" />
+    <ClInclude Include="file_sys\meta_file_system.h" />
+    <ClInclude Include="hw\hw.h" />
+    <ClInclude Include="hw\hw_lcd.h" />
+    <ClInclude Include="loader.h" />
+    <ClInclude Include="mem_map.h" />
+    <ClInclude Include="system.h" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="CMakeLists.txt" />
+    <Text Include="CMakeLists.txt" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/src/core/core.vcxproj.filters b/src/core/core.vcxproj.filters
index 0cd208dd6..2efac8127 100644
--- a/src/core/core.vcxproj.filters
+++ b/src/core/core.vcxproj.filters
@@ -1,158 +1,155 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <ClCompile Include="src\core.cpp" />
-    <ClCompile Include="src\arm\disassembler\arm_disasm.cpp">
+    <Filter Include="arm">
+      <UniqueIdentifier>{b84ab55c-588b-45f0-a5ba-f9ebb0442f13}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="arm\disassembler">
+      <UniqueIdentifier>{61100188-a726-4024-ab16-95ee242b446e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="arm\mmu">
+      <UniqueIdentifier>{a64d3c8a-747a-491b-b782-6e2622bedf24}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="file_sys">
+      <UniqueIdentifier>{7f618562-73d1-4f55-9628-887497c27654}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="arm\interpreter">
+      <UniqueIdentifier>{cca8b763-8a80-4478-9bcc-3c979293c357}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="hw">
+      <UniqueIdentifier>{d1158fc4-3e0f-431f-9d3b-f30bbfeb4ad5}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="elf">
+      <UniqueIdentifier>{7ae34319-6d72-4d12-bc62-9b438ba9241f}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="arm\disassembler\arm_disasm.cpp">
       <Filter>arm\disassembler</Filter>
     </ClCompile>
-    <ClCompile Include="src\mem_map.cpp" />
-    <ClCompile Include="src\mem_map_funcs.cpp" />
-    <ClCompile Include="src\loader.cpp" />
-    <ClCompile Include="src\file_sys\directory_file_system.cpp">
-      <Filter>file_sys</Filter>
-    </ClCompile>
-    <ClCompile Include="src\file_sys\meta_file_system.cpp">
-      <Filter>file_sys</Filter>
-    </ClCompile>
-    <ClCompile Include="src\system.cpp" />
-    <ClCompile Include="src\core_timing.cpp" />
-    <ClCompile Include="src\elf\elf_reader.cpp">
-      <Filter>elf</Filter>
-    </ClCompile>
-    <ClCompile Include="src\arm\mmu\arm1176jzf_s_mmu.cpp">
-      <Filter>arm\mmu</Filter>
-    </ClCompile>
-    <ClCompile Include="src\arm\interpreter\armemu.cpp">
+    <ClCompile Include="arm\interpreter\arm_interpreter.cpp">
       <Filter>arm\interpreter</Filter>
     </ClCompile>
-    <ClCompile Include="src\arm\interpreter\arminit.cpp">
+    <ClCompile Include="arm\interpreter\armemu.cpp">
       <Filter>arm\interpreter</Filter>
     </ClCompile>
-    <ClCompile Include="src\arm\interpreter\armmmu.cpp">
+    <ClCompile Include="arm\interpreter\arminit.cpp">
       <Filter>arm\interpreter</Filter>
     </ClCompile>
-    <ClCompile Include="src\arm\interpreter\armos.cpp">
+    <ClCompile Include="arm\interpreter\armmmu.cpp">
       <Filter>arm\interpreter</Filter>
     </ClCompile>
-    <ClCompile Include="src\arm\interpreter\armsupp.cpp">
+    <ClCompile Include="arm\interpreter\armos.cpp">
       <Filter>arm\interpreter</Filter>
     </ClCompile>
-    <ClCompile Include="src\arm\interpreter\armvirt.cpp">
+    <ClCompile Include="arm\interpreter\armsupp.cpp">
       <Filter>arm\interpreter</Filter>
     </ClCompile>
-    <ClCompile Include="src\arm\interpreter\thumbemu.cpp">
+    <ClCompile Include="arm\interpreter\armvirt.cpp">
       <Filter>arm\interpreter</Filter>
     </ClCompile>
-    <ClCompile Include="src\arm\interpreter\arm_interpreter.cpp">
+    <ClCompile Include="arm\interpreter\thumbemu.cpp">
       <Filter>arm\interpreter</Filter>
     </ClCompile>
-    <ClCompile Include="src\hw\hw.cpp">
+    <ClCompile Include="arm\mmu\arm1176jzf_s_mmu.cpp">
+      <Filter>arm\mmu</Filter>
+    </ClCompile>
+    <ClCompile Include="file_sys\directory_file_system.cpp">
+      <Filter>file_sys</Filter>
+    </ClCompile>
+    <ClCompile Include="file_sys\meta_file_system.cpp">
+      <Filter>file_sys</Filter>
+    </ClCompile>
+    <ClCompile Include="hw\hw.cpp">
       <Filter>hw</Filter>
     </ClCompile>
-    <ClCompile Include="src\hw\hw_lcd.cpp">
+    <ClCompile Include="hw\hw_lcd.cpp">
       <Filter>hw</Filter>
     </ClCompile>
+    <ClCompile Include="elf\elf_reader.cpp">
+      <Filter>elf</Filter>
+    </ClCompile>
+    <ClCompile Include="core.cpp" />
+    <ClCompile Include="loader.cpp" />
+    <ClCompile Include="mem_map.cpp" />
+    <ClCompile Include="mem_map_funcs.cpp" />
+    <ClCompile Include="system.cpp" />
+    <ClCompile Include="core_timing.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <Filter Include="arm">
-      <UniqueIdentifier>{b84ab55c-588b-45f0-a5ba-f9ebb0442f13}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="arm\disassembler">
-      <UniqueIdentifier>{61100188-a726-4024-ab16-95ee242b446e}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="arm\mmu">
-      <UniqueIdentifier>{a64d3c8a-747a-491b-b782-6e2622bedf24}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="file_sys">
-      <UniqueIdentifier>{7f618562-73d1-4f55-9628-887497c27654}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="elf">
-      <UniqueIdentifier>{671d3218-3771-4218-b142-1f9a1cc24a51}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="hle">
-      <UniqueIdentifier>{794616f8-739f-4643-9c3f-869e50831d4f}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="arm\interpreter">
-      <UniqueIdentifier>{cca8b763-8a80-4478-9bcc-3c979293c357}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="hw">
-      <UniqueIdentifier>{d1158fc4-3e0f-431f-9d3b-f30bbfeb4ad5}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="src\arm\disassembler\arm_disasm.h">
+    <ClInclude Include="arm\disassembler\arm_disasm.h">
       <Filter>arm\disassembler</Filter>
     </ClInclude>
-    <ClInclude Include="src\mem_map.h" />
-    <ClInclude Include="src\core.h" />
-    <ClInclude Include="src\arm\mmu\arm1176jzf_s_mmu.h">
+    <ClInclude Include="arm\interpreter\arm_interpreter.h">
+      <Filter>arm\interpreter</Filter>
+    </ClInclude>
+    <ClInclude Include="arm\interpreter\arm_regformat.h">
+      <Filter>arm\interpreter</Filter>
+    </ClInclude>
+    <ClInclude Include="arm\interpreter\armcpu.h">
+      <Filter>arm\interpreter</Filter>
+    </ClInclude>
+    <ClInclude Include="arm\interpreter\armdefs.h">
+      <Filter>arm\interpreter</Filter>
+    </ClInclude>
+    <ClInclude Include="arm\interpreter\armemu.h">
+      <Filter>arm\interpreter</Filter>
+    </ClInclude>
+    <ClInclude Include="arm\interpreter\armmmu.h">
+      <Filter>arm\interpreter</Filter>
+    </ClInclude>
+    <ClInclude Include="arm\interpreter\armos.h">
+      <Filter>arm\interpreter</Filter>
+    </ClInclude>
+    <ClInclude Include="arm\interpreter\skyeye_defs.h">
+      <Filter>arm\interpreter</Filter>
+    </ClInclude>
+    <ClInclude Include="arm\mmu\arm1176jzf_s_mmu.h">
       <Filter>arm\mmu</Filter>
     </ClInclude>
-    <ClInclude Include="src\arm\mmu\cache.h">
+    <ClInclude Include="arm\mmu\cache.h">
       <Filter>arm\mmu</Filter>
     </ClInclude>
-    <ClInclude Include="src\arm\mmu\rb.h">
+    <ClInclude Include="arm\mmu\rb.h">
       <Filter>arm\mmu</Filter>
     </ClInclude>
-    <ClInclude Include="src\arm\mmu\tlb.h">
+    <ClInclude Include="arm\mmu\tlb.h">
       <Filter>arm\mmu</Filter>
     </ClInclude>
-    <ClInclude Include="src\arm\mmu\wb.h">
+    <ClInclude Include="arm\mmu\wb.h">
       <Filter>arm\mmu</Filter>
     </ClInclude>
-    <ClInclude Include="src\loader.h" />
-    <ClInclude Include="src\file_sys\file_sys.h">
+    <ClInclude Include="file_sys\directory_file_system.h">
       <Filter>file_sys</Filter>
     </ClInclude>
-    <ClInclude Include="src\file_sys\directory_file_system.h">
+    <ClInclude Include="file_sys\file_sys.h">
       <Filter>file_sys</Filter>
     </ClInclude>
-    <ClInclude Include="src\file_sys\meta_file_system.h">
+    <ClInclude Include="file_sys\meta_file_system.h">
       <Filter>file_sys</Filter>
     </ClInclude>
-    <ClInclude Include="src\system.h" />
-    <ClInclude Include="src\core_timing.h" />
-    <ClInclude Include="src\elf\elf_reader.h">
-      <Filter>elf</Filter>
-    </ClInclude>
-    <ClInclude Include="src\elf\elf_types.h">
-      <Filter>elf</Filter>
-    </ClInclude>
-    <ClInclude Include="src\arm\interpreter\arm_regformat.h">
-      <Filter>arm\interpreter</Filter>
-    </ClInclude>
-    <ClInclude Include="src\arm\interpreter\armcpu.h">
-      <Filter>arm\interpreter</Filter>
-    </ClInclude>
-    <ClInclude Include="src\arm\interpreter\armdefs.h">
-      <Filter>arm\interpreter</Filter>
-    </ClInclude>
-    <ClInclude Include="src\arm\interpreter\armemu.h">
-      <Filter>arm\interpreter</Filter>
+    <ClInclude Include="hw\hw.h">
+      <Filter>hw</Filter>
     </ClInclude>
-    <ClInclude Include="src\arm\interpreter\armmmu.h">
-      <Filter>arm\interpreter</Filter>
+    <ClInclude Include="hw\hw_lcd.h">
+      <Filter>hw</Filter>
     </ClInclude>
-    <ClInclude Include="src\arm\interpreter\armos.h">
-      <Filter>arm\interpreter</Filter>
+    <ClInclude Include="elf\elf_reader.h">
+      <Filter>elf</Filter>
     </ClInclude>
-    <ClInclude Include="src\arm\interpreter\skyeye_defs.h">
-      <Filter>arm\interpreter</Filter>
+    <ClInclude Include="elf\elf_types.h">
+      <Filter>elf</Filter>
     </ClInclude>
-    <ClInclude Include="src\arm\arm_interface.h">
+    <ClInclude Include="arm\arm_interface.h">
       <Filter>arm</Filter>
     </ClInclude>
-    <ClInclude Include="src\arm\interpreter\arm_interpreter.h">
-      <Filter>arm\interpreter</Filter>
-    </ClInclude>
-    <ClInclude Include="src\hw\hw.h">
-      <Filter>hw</Filter>
-    </ClInclude>
-    <ClInclude Include="src\hw\hw_lcd.h">
-      <Filter>hw</Filter>
-    </ClInclude>
+    <ClInclude Include="core.h" />
+    <ClInclude Include="core_timing.h" />
+    <ClInclude Include="loader.h" />
+    <ClInclude Include="mem_map.h" />
+    <ClInclude Include="system.h" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="CMakeLists.txt" />
+    <Text Include="CMakeLists.txt" />
   </ItemGroup>
 </Project>
\ No newline at end of file