From 29cdc1df39c81d7a001053ffca4aa1bc194a3c7b Mon Sep 17 00:00:00 2001 From: ShizZy <shizzy@6bit.net> Date: Mon, 23 Sep 2013 22:04:56 -0400 Subject: [PATCH] moved file_sys to common --- src/common/common.vcxproj | 3 +++ src/common/common.vcxproj.filters | 3 +++ src/{core/src/file_sys => common/src}/file_sys.h | 0 .../file_sys => common/src}/file_sys_directory.cpp | 0 .../src/file_sys => common/src}/file_sys_directory.h | 0 src/core/core.vcxproj | 3 --- src/core/core.vcxproj.filters | 12 ------------ 7 files changed, 6 insertions(+), 15 deletions(-) rename src/{core/src/file_sys => common/src}/file_sys.h (100%) rename src/{core/src/file_sys => common/src}/file_sys_directory.cpp (100%) rename src/{core/src/file_sys => common/src}/file_sys_directory.h (100%) diff --git a/src/common/common.vcxproj b/src/common/common.vcxproj index 9cf382c29..498ca8401 100644 --- a/src/common/common.vcxproj +++ b/src/common/common.vcxproj @@ -159,6 +159,8 @@ <ClInclude Include="src\extended_trace.h" /> <ClInclude Include="src\fifo_queue.h" /> <ClInclude Include="src\file_search.h" /> + <ClInclude Include="src\file_sys.h" /> + <ClInclude Include="src\file_sys_directory.h" /> <ClInclude Include="src\file_util.h" /> <ClInclude Include="src\fixed_size_queue.h" /> <ClInclude Include="src\hash.h" /> @@ -186,6 +188,7 @@ <ClCompile Include="src\console_listener.cpp" /> <ClCompile Include="src\extended_trace.cpp" /> <ClCompile Include="src\file_search.cpp" /> + <ClCompile Include="src\file_sys_directory.cpp" /> <ClCompile Include="src\file_util.cpp" /> <ClCompile Include="src\hash.cpp" /> <ClCompile Include="src\log_manager.cpp" /> diff --git a/src/common/common.vcxproj.filters b/src/common/common.vcxproj.filters index ccc15d613..21e348df4 100644 --- a/src/common/common.vcxproj.filters +++ b/src/common/common.vcxproj.filters @@ -18,6 +18,7 @@ <ClCompile Include="src\timer.cpp" /> <ClCompile Include="src\version.cpp" /> <ClCompile Include="src\utf8.cpp" /> + <ClCompile Include="src\file_sys_directory.cpp" /> </ItemGroup> <ItemGroup> <ClInclude Include="src\atomic.h" /> @@ -57,6 +58,8 @@ <ClInclude Include="src\platform.h" /> <ClInclude Include="src\swap.h" /> <ClInclude Include="src\utf8.h" /> + <ClInclude Include="src\file_sys.h" /> + <ClInclude Include="src\file_sys_directory.h" /> </ItemGroup> <ItemGroup> <None Include="CMakeLists.txt" /> diff --git a/src/core/src/file_sys/file_sys.h b/src/common/src/file_sys.h similarity index 100% rename from src/core/src/file_sys/file_sys.h rename to src/common/src/file_sys.h diff --git a/src/core/src/file_sys/file_sys_directory.cpp b/src/common/src/file_sys_directory.cpp similarity index 100% rename from src/core/src/file_sys/file_sys_directory.cpp rename to src/common/src/file_sys_directory.cpp diff --git a/src/core/src/file_sys/file_sys_directory.h b/src/common/src/file_sys_directory.h similarity index 100% rename from src/core/src/file_sys/file_sys_directory.h rename to src/common/src/file_sys_directory.h diff --git a/src/core/core.vcxproj b/src/core/core.vcxproj index 4ae1cb234..11e31c8f5 100644 --- a/src/core/core.vcxproj +++ b/src/core/core.vcxproj @@ -137,7 +137,6 @@ <ClCompile Include="src\arm\arminit.cpp" /> <ClCompile Include="src\arm\disassembler\arm_disasm.cpp" /> <ClCompile Include="src\core.cpp" /> - <ClCompile Include="src\file_sys\file_sys_directory.cpp" /> <ClCompile Include="src\loader.cpp" /> <ClCompile Include="src\mem_map.cpp" /> <ClCompile Include="src\mem_map_funcs.cpp" /> @@ -157,8 +156,6 @@ <ClInclude Include="src\arm\mmu\wb.h" /> <ClInclude Include="src\arm\skyeye_defs.h" /> <ClInclude Include="src\core.h" /> - <ClInclude Include="src\file_sys\file_sys.h" /> - <ClInclude Include="src\file_sys\file_sys_directory.h" /> <ClInclude Include="src\loader.h" /> <ClInclude Include="src\mem_map.h" /> </ItemGroup> diff --git a/src/core/core.vcxproj.filters b/src/core/core.vcxproj.filters index 8fbb1d4e3..51aa17d76 100644 --- a/src/core/core.vcxproj.filters +++ b/src/core/core.vcxproj.filters @@ -14,9 +14,6 @@ </ClCompile> <ClCompile Include="src\mem_map_funcs.cpp" /> <ClCompile Include="src\loader.cpp" /> - <ClCompile Include="src\file_sys\file_sys_directory.cpp"> - <Filter>file_sys</Filter> - </ClCompile> </ItemGroup> <ItemGroup> <Filter Include="arm"> @@ -28,9 +25,6 @@ <Filter Include="arm\mmu"> <UniqueIdentifier>{a64d3c8a-747a-491b-b782-6e2622bedf24}</UniqueIdentifier> </Filter> - <Filter Include="file_sys"> - <UniqueIdentifier>{d19a3be3-56c3-4b0b-877c-c68388904bb2}</UniqueIdentifier> - </Filter> </ItemGroup> <ItemGroup> <ClInclude Include="src\arm\disassembler\arm_disasm.h"> @@ -75,12 +69,6 @@ <Filter>arm\mmu</Filter> </ClInclude> <ClInclude Include="src\loader.h" /> - <ClInclude Include="src\file_sys\file_sys.h"> - <Filter>file_sys</Filter> - </ClInclude> - <ClInclude Include="src\file_sys\file_sys_directory.h"> - <Filter>file_sys</Filter> - </ClInclude> </ItemGroup> <ItemGroup> <None Include="CMakeLists.txt" />