diff options
95 files changed, 634 insertions, 613 deletions
diff --git a/src/citra/citra.cpp b/src/citra/citra.cpp index 746cf083d..37ea97403 100644 --- a/src/citra/citra.cpp +++ b/src/citra/citra.cpp @@ -22,17 +22,17 @@ * http://code.google.com/p/gekko-gc-emu/ */ -#include "common.h" -#include "log_manager.h" -#include "file_util.h" +#include "common/common.h" +#include "common/log_manager.h" +#include "common/file_util.h" -#include "system.h" -#include "core.h" -#include "loader.h" +#include "core/system.h" +#include "core/core.h" +#include "core/loader.h" -#include "emu_window/emu_window_glfw.h" +#include "citra/emu_window/emu_window_glfw.h" -#include "citra.h" +#include "citra/citra.h" #define E_ERR -1 @@ -52,7 +52,7 @@ int __cdecl main(int argc, char **argv) { System::Init(emu_window); - std::string boot_filename = "homebrew.elf"; + std::string boot_filename = "C:\\Users\\eric\\Desktop\\3ds\\homebrew\\Mandelbrot3DS.elf"; std::string error_str; bool res = Loader::LoadFile(boot_filename, &error_str); diff --git a/src/citra/citra.vcxproj b/src/citra/citra.vcxproj index 16157ad04..4ea222fcd 100644 --- a/src/citra/citra.vcxproj +++ b/src/citra/citra.vcxproj @@ -199,20 +199,17 @@ </ProjectReference> </ItemGroup> <ItemGroup> - <ClCompile Include="src\citra.cpp" /> - <ClCompile Include="src\emu_window\emu_window_glfw.cpp" /> + <ClCompile Include="citra.cpp" /> + <ClCompile Include="emu_window\emu_window_glfw.cpp" /> </ItemGroup> <ItemGroup> + <ClInclude Include="citra.h" /> + <ClInclude Include="emu_window\emu_window_glfw.h" /> <ClInclude Include="resource.h" /> - <ClInclude Include="src\citra.h" /> - <ClInclude Include="src\emu_window\emu_window_glfw.h" /> - <ClInclude Include="src\version.h" /> + <ClInclude Include="version.h" /> </ItemGroup> <ItemGroup> - <ResourceCompile Include="citra.rc" /> - </ItemGroup> - <ItemGroup> - <None Include="CMakeLists.txt" /> + <Text Include="CMakeLists.txt" /> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> diff --git a/src/citra/citra.vcxproj.filters b/src/citra/citra.vcxproj.filters index f0b6906de..b41cdf146 100644 --- a/src/citra/citra.vcxproj.filters +++ b/src/citra/citra.vcxproj.filters @@ -1,28 +1,25 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> - <ClCompile Include="src\citra.cpp" /> - <ClCompile Include="src\emu_window\emu_window_glfw.cpp"> + <Filter Include="emu_window"> + <UniqueIdentifier>{e3161526-9f53-4670-8dae-2be81ff01bc2}</UniqueIdentifier> + </Filter> + </ItemGroup> + <ItemGroup> + <ClCompile Include="citra.cpp" /> + <ClCompile Include="emu_window\emu_window_glfw.cpp"> <Filter>emu_window</Filter> </ClCompile> </ItemGroup> <ItemGroup> + <ClInclude Include="citra.h" /> <ClInclude Include="resource.h" /> - <ClInclude Include="src\version.h" /> - <ClInclude Include="src\citra.h" /> - <ClInclude Include="src\emu_window\emu_window_glfw.h"> + <ClInclude Include="version.h" /> + <ClInclude Include="emu_window\emu_window_glfw.h"> <Filter>emu_window</Filter> </ClInclude> </ItemGroup> <ItemGroup> - <ResourceCompile Include="citra.rc" /> - </ItemGroup> - <ItemGroup> - <Filter Include="emu_window"> - <UniqueIdentifier>{e3161526-9f53-4670-8dae-2be81ff01bc2}</UniqueIdentifier> - </Filter> - </ItemGroup> - <ItemGroup> - <None Include="CMakeLists.txt" /> + <Text Include="CMakeLists.txt" /> </ItemGroup> </Project>
\ No newline at end of file diff --git a/src/citra/emu_window/emu_window_glfw.cpp b/src/citra/emu_window/emu_window_glfw.cpp index 4cdb7fbb0..0192d8598 100644 --- a/src/citra/emu_window/emu_window_glfw.cpp +++ b/src/citra/emu_window/emu_window_glfw.cpp @@ -22,9 +22,9 @@ * http://code.google.com/p/gekko-gc-emu/ */ -#include "common.h" -#include "video_core.h" -#include "emu_window_glfw.h" +#include "common/common.h" +#include "video_core/video_core.h" +#include "citra/emu_window/emu_window_glfw.h" static void OnKeyEvent(GLFWwindow* win, int key, int action) { // EmuWindow_GLFW* emuwin = (EmuWindow_GLFW*)glfwGetWindowUserPointer(win); diff --git a/src/citra/emu_window/emu_window_glfw.h b/src/citra/emu_window/emu_window_glfw.h index abca9faa8..c3feb6e51 100644 --- a/src/citra/emu_window/emu_window_glfw.h +++ b/src/citra/emu_window/emu_window_glfw.h @@ -27,7 +27,7 @@ #include <GL/glew.h> #include <GLFW/glfw3.h> -#include "emu_window.h" +#include "common/emu_window.h" class EmuWindow_GLFW : public EmuWindow { public: diff --git a/src/citra_qt/citra_qt.vcxproj b/src/citra_qt/citra_qt.vcxproj index 9164b280b..da8740bec 100644 --- a/src/citra_qt/citra_qt.vcxproj +++ b/src/citra_qt/citra_qt.vcxproj @@ -127,43 +127,21 @@ <ClCompile Include="..\..\externals\qhexedit\qhexedit.cpp" /> <ClCompile Include="..\..\externals\qhexedit\qhexedit_p.cpp" /> <ClCompile Include="..\..\externals\qhexedit\xbytearray.cpp" /> - <ClCompile Include="src\bootmanager.cpp" /> - <ClCompile Include="src\callstack.cpp" /> - <ClCompile Include="src\config\controller_config.cpp" /> - <ClCompile Include="src\config\controller_config_util.cpp" /> - <ClCompile Include="src\disasm.cpp" /> - <ClCompile Include="src\cpu_regs.cpp" /> - <ClCompile Include="src\hotkeys.cpp" /> - <ClCompile Include="src\main.cpp" /> - <ClCompile Include="src\ramview.cpp" /> - </ItemGroup> - <ItemGroup> - <MOC Include="src\bootmanager.hxx" /> - <MOC Include="src\callstack.hxx" /> - <MOC Include="src\config\controller_config.hxx" /> - <MOC Include="src\config\controller_config_util.hxx" /> - <MOC Include="src\disasm.hxx" /> - <MOC Include="src\cpu_regs.hxx" /> - <MOC Include="src\hotkeys.hxx" /> - <MOC Include="src\main.hxx" /> - <MOC Include="src\ramview.hxx" /> - </ItemGroup> - <ItemGroup> - <UIC Include="src\callstack.ui" /> - <UIC Include="src\config\controller_config.ui"> - <QtUicPrefix>src/config/ui_</QtUicPrefix> - </UIC> - <UIC Include="src\disasm.ui" /> - <UIC Include="src\cpu_regs.ui" /> - <UIC Include="src\hotkeys.ui" /> - <UIC Include="src\main.ui" /> + <ClCompile Include="bootmanager.cpp" /> + <ClCompile Include="callstack.cpp" /> + <ClCompile Include="config\controller_config.cpp" /> + <ClCompile Include="config\controller_config_util.cpp" /> + <ClCompile Include="cpu_regs.cpp" /> + <ClCompile Include="disasm.cpp" /> + <ClCompile Include="hotkeys.cpp" /> + <ClCompile Include="main.cpp" /> + <ClCompile Include="ramview.cpp" /> </ItemGroup> <ItemGroup> <MOC Include="..\..\externals\qhexedit\commands.h" /> <MOC Include="..\..\externals\qhexedit\qhexedit.h" /> <MOC Include="..\..\externals\qhexedit\qhexedit_p.h" /> <MOC Include="..\..\externals\qhexedit\xbytearray.h" /> - <ClInclude Include="src\version.h" /> </ItemGroup> <ItemGroup> <ProjectReference Include="..\common\common.vcxproj"> @@ -173,6 +151,38 @@ <Project>{8aea7f29-3466-4786-a10d-6a4bd0610977}</Project> </ProjectReference> </ItemGroup> + <ItemGroup> + <ClInclude Include="bootmanager.hxx" /> + <ClInclude Include="callstack.hxx" /> + <ClInclude Include="config\controller_config.hxx" /> + <ClInclude Include="config\controller_config_util.hxx" /> + <ClInclude Include="config\ui_controller_config.h" /> + <ClInclude Include="cpu_regs.hxx" /> + <ClInclude Include="disasm.hxx" /> + <ClInclude Include="hotkeys.hxx" /> + <ClInclude Include="main.hxx" /> + <ClInclude Include="ramview.hxx" /> + <ClInclude Include="ui_callstack.h" /> + <ClInclude Include="ui_cpu_regs.h" /> + <ClInclude Include="ui_disasm.h" /> + <ClInclude Include="ui_gfx_fifo_player.h" /> + <ClInclude Include="ui_hotkeys.h" /> + <ClInclude Include="ui_image_info.h" /> + <ClInclude Include="ui_main.h" /> + <ClInclude Include="ui_welcome_wizard.h" /> + <ClInclude Include="version.h" /> + </ItemGroup> + <ItemGroup> + <UIC Include="callstack.ui" /> + <UIC Include="config\controller_config.ui" /> + <UIC Include="cpu_regs.ui" /> + <UIC Include="disasm.ui" /> + <UIC Include="hotkeys.ui" /> + <UIC Include="main.ui" /> + </ItemGroup> + <ItemGroup> + <Text Include="CMakeLists.txt" /> + </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> <Import Project="qt-build.targets" /> diff --git a/src/citra_qt/citra_qt.vcxproj.filters b/src/citra_qt/citra_qt.vcxproj.filters index 3900cc8e0..5bc29c1d7 100644 --- a/src/citra_qt/citra_qt.vcxproj.filters +++ b/src/citra_qt/citra_qt.vcxproj.filters @@ -12,20 +12,6 @@ </Filter> </ItemGroup> <ItemGroup> - <ClCompile Include="src\main.cpp" /> - <ClCompile Include="src\disasm.cpp"> - <Filter>debugger</Filter> - </ClCompile> - <ClCompile Include="src\cpu_regs.cpp"> - <Filter>debugger</Filter> - </ClCompile> - <ClCompile Include="src\bootmanager.cpp" /> - <ClCompile Include="src\callstack.cpp"> - <Filter>debugger</Filter> - </ClCompile> - <ClCompile Include="src\ramview.cpp"> - <Filter>debugger</Filter> - </ClCompile> <ClCompile Include="..\..\externals\qhexedit\commands.cpp"> <Filter>qhexedit</Filter> </ClCompile> @@ -38,22 +24,29 @@ <ClCompile Include="..\..\externals\qhexedit\xbytearray.cpp"> <Filter>qhexedit</Filter> </ClCompile> - <ClCompile Include="src\hotkeys.cpp" /> - <ClCompile Include="src\config\controller_config.cpp"> + <ClCompile Include="bootmanager.cpp" /> + <ClCompile Include="hotkeys.cpp" /> + <ClCompile Include="main.cpp" /> + <ClCompile Include="config\controller_config.cpp"> <Filter>config</Filter> </ClCompile> - <ClCompile Include="src\config\controller_config_util.cpp"> + <ClCompile Include="config\controller_config_util.cpp"> <Filter>config</Filter> </ClCompile> - </ItemGroup> - <ItemGroup> - <MOC Include="src\main.hxx" /> - <MOC Include="src\cpu_regs.hxx"> + <ClCompile Include="cpu_regs.cpp"> <Filter>debugger</Filter> - </MOC> - <MOC Include="src\callstack.hxx"> + </ClCompile> + <ClCompile Include="disasm.cpp"> <Filter>debugger</Filter> - </MOC> + </ClCompile> + <ClCompile Include="ramview.cpp"> + <Filter>debugger</Filter> + </ClCompile> + <ClCompile Include="callstack.cpp"> + <Filter>debugger</Filter> + </ClCompile> + </ItemGroup> + <ItemGroup> <MOC Include="..\..\externals\qhexedit\commands.h"> <Filter>qhexedit</Filter> </MOC> @@ -66,38 +59,67 @@ <MOC Include="..\..\externals\qhexedit\qhexedit.h"> <Filter>qhexedit</Filter> </MOC> - <MOC Include="src\ramview.hxx"> - <Filter>debugger</Filter> - </MOC> - <MOC Include="src\disasm.hxx"> - <Filter>debugger</Filter> - </MOC> - <MOC Include="src\bootmanager.hxx" /> - <MOC Include="src\hotkeys.hxx" /> - <MOC Include="src\config\controller_config.hxx"> + </ItemGroup> + <ItemGroup> + <ClInclude Include="bootmanager.hxx" /> + <ClInclude Include="hotkeys.hxx" /> + <ClInclude Include="main.hxx" /> + <ClInclude Include="ui_hotkeys.h" /> + <ClInclude Include="ui_image_info.h" /> + <ClInclude Include="ui_main.h" /> + <ClInclude Include="ui_welcome_wizard.h" /> + <ClInclude Include="version.h" /> + <ClInclude Include="config\controller_config.hxx"> <Filter>config</Filter> - </MOC> - <MOC Include="src\config\controller_config_util.hxx"> + </ClInclude> + <ClInclude Include="config\controller_config_util.hxx"> <Filter>config</Filter> - </MOC> + </ClInclude> + <ClInclude Include="config\ui_controller_config.h"> + <Filter>config</Filter> + </ClInclude> + <ClInclude Include="cpu_regs.hxx"> + <Filter>debugger</Filter> + </ClInclude> + <ClInclude Include="disasm.hxx"> + <Filter>debugger</Filter> + </ClInclude> + <ClInclude Include="ramview.hxx"> + <Filter>debugger</Filter> + </ClInclude> + <ClInclude Include="ui_callstack.h"> + <Filter>debugger</Filter> + </ClInclude> + <ClInclude Include="ui_cpu_regs.h"> + <Filter>debugger</Filter> + </ClInclude> + <ClInclude Include="ui_disasm.h"> + <Filter>debugger</Filter> + </ClInclude> + <ClInclude Include="ui_gfx_fifo_player.h"> + <Filter>debugger</Filter> + </ClInclude> + <ClInclude Include="callstack.hxx"> + <Filter>debugger</Filter> + </ClInclude> </ItemGroup> <ItemGroup> - <UIC Include="src\main.ui" /> - <UIC Include="src\cpu_regs.ui"> - <Filter>debugger</Filter> + <UIC Include="hotkeys.ui" /> + <UIC Include="main.ui" /> + <UIC Include="config\controller_config.ui"> + <Filter>config</Filter> </UIC> - <UIC Include="src\disasm.ui"> + <UIC Include="callstack.ui"> <Filter>debugger</Filter> </UIC> - <UIC Include="src\callstack.ui"> + <UIC Include="cpu_regs.ui"> <Filter>debugger</Filter> </UIC> - <UIC Include="src\hotkeys.ui" /> - <UIC Include="src\config\controller_config.ui"> - <Filter>config</Filter> + <UIC Include="disasm.ui"> + <Filter>debugger</Filter> </UIC> </ItemGroup> <ItemGroup> - <ClInclude Include="src\version.h" /> + <Text Include="CMakeLists.txt" /> </ItemGroup> </Project>
\ No newline at end of file diff --git a/src/common/atomic.h b/src/common/atomic.h index 883bc14fb..ff2fb23d3 100644 --- a/src/common/atomic.h +++ b/src/common/atomic.h @@ -7,12 +7,12 @@ #ifdef _WIN32 -#include "atomic_win32.h" +#include "common/atomic_win32.h" #else // GCC-compatible compiler assumed! -#include "atomic_gcc.h" +#include "common/atomic_gcc.h" #endif diff --git a/src/common/atomic_gcc.h b/src/common/atomic_gcc.h index 2eb38697b..953c82c6c 100644 --- a/src/common/atomic_gcc.h +++ b/src/common/atomic_gcc.h @@ -5,7 +5,7 @@ #ifndef _ATOMIC_GCC_H_ #define _ATOMIC_GCC_H_ -#include "common.h" +#include "common/common.h" // Atomic operations are performed in a single step by the CPU. It is // impossible for other threads to see the operation "half-done." diff --git a/src/common/atomic_win32.h b/src/common/atomic_win32.h index 760b16d4d..f8ec80520 100644 --- a/src/common/atomic_win32.h +++ b/src/common/atomic_win32.h @@ -5,7 +5,7 @@ #ifndef _ATOMIC_WIN32_H_ #define _ATOMIC_WIN32_H_ -#include "common.h" +#include "common/common.h" #include <intrin.h> #include <Windows.h> diff --git a/src/common/break_points.cpp b/src/common/break_points.cpp index 787263f79..25d34a21a 100644 --- a/src/common/break_points.cpp +++ b/src/common/break_points.cpp @@ -2,9 +2,9 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "common.h" -#include "debug_interface.h" -#include "break_points.h" +#include "common/common.h" +#include "common/debug_interface.h" +#include "common/break_points.h" #include <sstream> #include <algorithm> diff --git a/src/common/break_points.h b/src/common/break_points.h index dc771ba01..46df34665 100644 --- a/src/common/break_points.h +++ b/src/common/break_points.h @@ -8,7 +8,7 @@ #include <vector> #include <string> -#include "common.h" +#include "common/common.h" class DebugInterface; diff --git a/src/common/chunk_file.h b/src/common/chunk_file.h index 68c2943ab..a41205857 100644 --- a/src/common/chunk_file.h +++ b/src/common/chunk_file.h @@ -41,8 +41,8 @@ #endif #endif -#include "common.h" -#include "file_util.h" +#include "common/common.h" +#include "common/file_util.h" //#include "../ext/snappy/snappy-c.h" #if defined(IOS) || defined(MACGNUSTD) diff --git a/src/common/common.h b/src/common/common.h index 3b71d9b3d..8795c8a0e 100644 --- a/src/common/common.h +++ b/src/common/common.h @@ -43,12 +43,12 @@ private: }; #endif -#include "log.h" -#include "common_types.h" -#include "msg_handler.h" -#include "common_funcs.h" -#include "common_paths.h" -#include "platform.h" +#include "common/log.h" +#include "common/common_types.h" +#include "common/msg_handler.h" +#include "common/common_funcs.h" +#include "common/common_paths.h" +#include "common/platform.h" #ifdef __APPLE__ // The Darwin ABI requires that stack frames be aligned to 16-byte boundaries. diff --git a/src/common/common.vcxproj b/src/common/common.vcxproj index f9033fa57..32d735a09 100644 --- a/src/common/common.vcxproj +++ b/src/common/common.vcxproj @@ -147,72 +147,71 @@ <Lib /> </ItemDefinitionGroup> <ItemGroup> - <ClInclude Include="src\atomic.h" /> - <ClInclude Include="src\atomic_gcc.h" /> - <ClInclude Include="src\atomic_win32.h" /> - <ClInclude Include="src\break_points.h" /> - <ClInclude Include="src\chunk_file.h" /> - <ClInclude Include="src\common.h" /> - <ClInclude Include="src\common_funcs.h" /> - <ClInclude Include="src\common_paths.h" /> - <ClInclude Include="src\common_types.h" /> - <ClInclude Include="src\console_listener.h" /> - <ClInclude Include="src\cpu_detect.h" /> - <ClInclude Include="src\debug_interface.h" /> - <ClInclude Include="src\emu_window.h" /> - <ClInclude Include="src\extended_trace.h" /> - <ClInclude Include="src\fifo_queue.h" /> - <ClInclude Include="src\file_search.h" /> - <ClInclude Include="src\file_util.h" /> - <ClInclude Include="src\fixed_size_queue.h" /> - <ClInclude Include="src\hash.h" /> - <ClInclude Include="src\linear_disk_cache.h" /> - <ClInclude Include="src\log.h" /> - <ClInclude Include="src\log_manager.h" /> - <ClInclude Include="src\math_util.h" /> - <ClInclude Include="src\memory_util.h" /> - <ClInclude Include="src\mem_arena.h" /> - <ClInclude Include="src\msg_handler.h" /> - <ClInclude Include="src\platform.h" /> - <ClInclude Include="src\scm_rev.h" /> - <ClInclude Include="src\std_condition_variable.h" /> - <ClInclude Include="src\std_mutex.h" /> - <ClInclude Include="src\std_thread.h" /> - <ClInclude Include="src\string_util.h" /> - <ClInclude Include="src\swap.h" /> - <ClInclude Include="src\thread.h" /> - <ClInclude Include="src\thunk.h" /> - <ClInclude Include="src\timer.h" /> - <ClInclude Include="src\utf8.h" /> + <Reference Include="System" /> + <Reference Include="System.Data" /> + <Reference Include="System.Drawing" /> + <Reference Include="System.Windows.Forms" /> + <Reference Include="System.Xml" /> </ItemGroup> <ItemGroup> - <ClCompile Include="src\break_points.cpp" /> - <ClCompile Include="src\console_listener.cpp" /> - <ClCompile Include="src\extended_trace.cpp" /> - <ClCompile Include="src\file_search.cpp" /> - <ClCompile Include="src\file_util.cpp" /> - <ClCompile Include="src\hash.cpp" /> - <ClCompile Include="src\log_manager.cpp" /> - <ClCompile Include="src\math_util.cpp" /> - <ClCompile Include="src\memory_util.cpp" /> - <ClCompile Include="src\mem_arena.cpp" /> - <ClCompile Include="src\misc.cpp" /> - <ClCompile Include="src\msg_handler.cpp" /> - <ClCompile Include="src\string_util.cpp" /> - <ClCompile Include="src\thread.cpp" /> - <ClCompile Include="src\timer.cpp" /> - <ClCompile Include="src\utf8.cpp" /> - <ClCompile Include="src\version.cpp" /> + <ClInclude Include="atomic.h" /> + <ClInclude Include="atomic_gcc.h" /> + <ClInclude Include="atomic_win32.h" /> + <ClInclude Include="break_points.h" /> + <ClInclude Include="chunk_file.h" /> + <ClInclude Include="common.h" /> + <ClInclude Include="common_funcs.h" /> + <ClInclude Include="common_paths.h" /> + <ClInclude Include="common_types.h" /> + <ClInclude Include="console_listener.h" /> + <ClInclude Include="cpu_detect.h" /> + <ClInclude Include="debug_interface.h" /> + <ClInclude Include="emu_window.h" /> + <ClInclude Include="extended_trace.h" /> + <ClInclude Include="fifo_queue.h" /> + <ClInclude Include="file_search.h" /> + <ClInclude Include="file_util.h" /> + <ClInclude Include="fixed_size_queue.h" /> + <ClInclude Include="hash.h" /> + <ClInclude Include="linear_disk_cache.h" /> + <ClInclude Include="log.h" /> + <ClInclude Include="log_manager.h" /> + <ClInclude Include="math_util.h" /> + <ClInclude Include="memory_util.h" /> + <ClInclude Include="mem_arena.h" /> + <ClInclude Include="msg_handler.h" /> + <ClInclude Include="platform.h" /> + <ClInclude Include="std_condition_variable.h" /> + <ClInclude Include="std_mutex.h" /> + <ClInclude Include="std_thread.h" /> + <ClInclude Include="string_util.h" /> + <ClInclude Include="swap.h" /> + <ClInclude Include="thread.h" /> + <ClInclude Include="thunk.h" /> + <ClInclude Include="timer.h" /> + <ClInclude Include="utf8.h" /> </ItemGroup> <ItemGroup> - <None Include="CMakeLists.txt" /> + <ClCompile Include="break_points.cpp" /> + <ClCompile Include="console_listener.cpp" /> + <ClCompile Include="extended_trace.cpp" /> + <ClCompile Include="file_search.cpp" /> + <ClCompile Include="file_util.cpp" /> + <ClCompile Include="hash.cpp" /> + <ClCompile Include="log_manager.cpp" /> + <ClCompile Include="math_util.cpp" /> + <ClCompile Include="memory_util.cpp" /> + <ClCompile Include="mem_arena.cpp" /> + <ClCompile Include="misc.cpp" /> + <ClCompile Include="msg_handler.cpp" /> + <ClCompile Include="string_util.cpp" /> + <ClCompile Include="thread.cpp" /> + <ClCompile Include="timer.cpp" /> + <ClCompile Include="utf8.cpp" /> + <ClCompile Include="version.cpp" /> </ItemGroup> <ItemGroup> - <Reference Include="System" /> - <Reference Include="System.Data" /> - <Reference Include="System.Drawing" /> - <Reference Include="System.Windows.Forms" /> - <Reference Include="System.Xml" /> + <Text Include="CMakeLists.txt" /> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> diff --git a/src/common/common.vcxproj.filters b/src/common/common.vcxproj.filters index ccc15d613..3bdaa973f 100644 --- a/src/common/common.vcxproj.filters +++ b/src/common/common.vcxproj.filters @@ -1,64 +1,63 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> - <ClCompile Include="src\break_points.cpp" /> - <ClCompile Include="src\console_listener.cpp" /> - <ClCompile Include="src\extended_trace.cpp" /> - <ClCompile Include="src\file_search.cpp" /> - <ClCompile Include="src\file_util.cpp" /> - <ClCompile Include="src\hash.cpp" /> - <ClCompile Include="src\log_manager.cpp" /> - <ClCompile Include="src\math_util.cpp" /> - <ClCompile Include="src\memory_util.cpp" /> - <ClCompile Include="src\mem_arena.cpp" /> - <ClCompile Include="src\misc.cpp" /> - <ClCompile Include="src\msg_handler.cpp" /> - <ClCompile Include="src\string_util.cpp" /> - <ClCompile Include="src\thread.cpp" /> - <ClCompile Include="src\timer.cpp" /> - <ClCompile Include="src\version.cpp" /> - <ClCompile Include="src\utf8.cpp" /> + <ClInclude Include="atomic.h" /> + <ClInclude Include="atomic_gcc.h" /> + <ClInclude Include="atomic_win32.h" /> + <ClInclude Include="break_points.h" /> + <ClInclude Include="chunk_file.h" /> + <ClInclude Include="common.h" /> + <ClInclude Include="common_funcs.h" /> + <ClInclude Include="common_paths.h" /> + <ClInclude Include="common_types.h" /> + <ClInclude Include="console_listener.h" /> + <ClInclude Include="cpu_detect.h" /> + <ClInclude Include="debug_interface.h" /> + <ClInclude Include="emu_window.h" /> + <ClInclude Include="extended_trace.h" /> + <ClInclude Include="fifo_queue.h" /> + <ClInclude Include="file_search.h" /> + <ClInclude Include="file_util.h" /> + <ClInclude Include="fixed_size_queue.h" /> + <ClInclude Include="hash.h" /> + <ClInclude Include="linear_disk_cache.h" /> + <ClInclude Include="log.h" /> + <ClInclude Include="log_manager.h" /> + <ClInclude Include="math_util.h" /> + <ClInclude Include="mem_arena.h" /> + <ClInclude Include="memory_util.h" /> + <ClInclude Include="msg_handler.h" /> + <ClInclude Include="platform.h" /> + <ClInclude Include="std_condition_variable.h" /> + <ClInclude Include="std_mutex.h" /> + <ClInclude Include="std_thread.h" /> + <ClInclude Include="string_util.h" /> + <ClInclude Include="swap.h" /> + <ClInclude Include="thread.h" /> + <ClInclude Include="thunk.h" /> + <ClInclude Include="timer.h" /> + <ClInclude Include="utf8.h" /> </ItemGroup> <ItemGroup> - <ClInclude Include="src\atomic.h" /> - <ClInclude Include="src\break_points.h" /> - <ClInclude Include="src\chunk_file.h" /> - <ClInclude Include="src\common.h" /> - <ClInclude Include="src\common_funcs.h" /> - <ClInclude Include="src\common_paths.h" /> - <ClInclude Include="src\common_types.h" /> - <ClInclude Include="src\console_listener.h" /> - <ClInclude Include="src\cpu_detect.h" /> - <ClInclude Include="src\debug_interface.h" /> - <ClInclude Include="src\extended_trace.h" /> - <ClInclude Include="src\fifo_queue.h" /> - <ClInclude Include="src\file_search.h" /> - <ClInclude Include="src\file_util.h" /> - <ClInclude Include="src\fixed_size_queue.h" /> - <ClInclude Include="src\hash.h" /> - <ClInclude Include="src\linear_disk_cache.h" /> - <ClInclude Include="src\log.h" /> - <ClInclude Include="src\log_manager.h" /> - <ClInclude Include="src\math_util.h" /> - <ClInclude Include="src\memory_util.h" /> - <ClInclude Include="src\mem_arena.h" /> - <ClInclude Include="src\msg_handler.h" /> - <ClInclude Include="src\scm_rev.h" /> - <ClInclude Include="src\std_condition_variable.h" /> - <ClInclude Include="src\std_mutex.h" /> - <ClInclude Include="src\std_thread.h" /> - <ClInclude Include="src\string_util.h" /> - <ClInclude Include="src\thread.h" /> - <ClInclude Include="src\thunk.h" /> - <ClInclude Include="src\timer.h" /> - <ClInclude Include="src\atomic_gcc.h" /> - <ClInclude Include="src\atomic_win32.h" /> - <ClInclude Include="src\emu_window.h" /> - <ClInclude Include="src\platform.h" /> - <ClInclude Include="src\swap.h" /> - <ClInclude Include="src\utf8.h" /> + <ClCompile Include="break_points.cpp" /> + <ClCompile Include="console_listener.cpp" /> + <ClCompile Include="extended_trace.cpp" /> + <ClCompile Include="file_search.cpp" /> + <ClCompile Include="file_util.cpp" /> + <ClCompile Include="hash.cpp" /> + <ClCompile Include="log_manager.cpp" /> + <ClCompile Include="math_util.cpp" /> + <ClCompile Include="mem_arena.cpp" /> + <ClCompile Include="memory_util.cpp" /> + <ClCompile Include="misc.cpp" /> + <ClCompile Include="msg_handler.cpp" /> + <ClCompile Include="string_util.cpp" /> + <ClCompile Include="thread.cpp" /> + <ClCompile Include="timer.cpp" /> + <ClCompile Include="utf8.cpp" /> + <ClCompile Include="version.cpp" /> </ItemGroup> <ItemGroup> - <None Include="CMakeLists.txt" /> + <Text Include="CMakeLists.txt" /> </ItemGroup> </Project>
\ No newline at end of file diff --git a/src/common/common_paths.h b/src/common/common_paths.h index 9ccb87d82..252e93fa9 100644 --- a/src/common/common_paths.h +++ b/src/common/common_paths.h @@ -6,7 +6,7 @@ #define _COMMON_PATHS_H_ // Make sure we pick up USER_DIR if set in config.h -#include "common.h" +#include "common/common.h" // Directory seperators, do we need this? #define DIR_SEP "/" diff --git a/src/common/common_types.h b/src/common/common_types.h index af1cd0e21..4289b88d3 100644 --- a/src/common/common_types.h +++ b/src/common/common_types.h @@ -62,7 +62,7 @@ typedef signed long long s64; ///< 64-bit signed int typedef float f32; ///< 32-bit floating point typedef double f64; ///< 64-bit floating point -#include "swap.h" +#include "common/swap.h" /// Union for fast 16-bit type casting union t16 { diff --git a/src/common/console_listener.cpp b/src/common/console_listener.cpp index 270ad9ce9..b5f32d1bd 100644 --- a/src/common/console_listener.cpp +++ b/src/common/console_listener.cpp @@ -13,9 +13,9 @@ #include <stdarg.h> #endif -#include "common.h" -#include "log_manager.h" // Common -#include "console_listener.h" // Common +#include "common/common.h" +#include "common/log_manager.h" // Common +#include "common/console_listener.h" // Common ConsoleListener::ConsoleListener() { diff --git a/src/common/console_listener.h b/src/common/console_listener.h index a2936050d..224d17017 100644 --- a/src/common/console_listener.h +++ b/src/common/console_listener.h @@ -5,7 +5,7 @@ #ifndef _CONSOLELISTENER_H #define _CONSOLELISTENER_H -#include "log_manager.h" +#include "common/log_manager.h" #ifdef _WIN32 #include <windows.h> diff --git a/src/common/emu_window.h b/src/common/emu_window.h index f49367057..7f68c9237 100644 --- a/src/common/emu_window.h +++ b/src/common/emu_window.h @@ -25,7 +25,7 @@ #ifndef CORE_EMUWINDOW_H_ #define CORE_EMUWINDOW_H_ -#include "common.h" +#include "common/common.h" //namespace input_common //{ diff --git a/src/common/extended_trace.cpp b/src/common/extended_trace.cpp index 9f717dba3..77425bd0d 100644 --- a/src/common/extended_trace.cpp +++ b/src/common/extended_trace.cpp @@ -16,8 +16,8 @@ #include <windows.h> #include <stdio.h> -#include "extended_trace.h" -#include "string_util.h" +#include "common/extended_trace.h" +#include "common/string_util.h" using namespace std; #include <tchar.h> diff --git a/src/common/fifo_queue.h b/src/common/fifo_queue.h index 57efcd839..4e80f53b4 100644 --- a/src/common/fifo_queue.h +++ b/src/common/fifo_queue.h @@ -5,7 +5,7 @@ // a simple lockless thread-safe, // single reader, single writer queue -#include "atomic.h" +#include "common/atomic.h" namespace Common { diff --git a/src/common/file_search.cpp b/src/common/file_search.cpp index 59f640109..a9d19477d 100644 --- a/src/common/file_search.cpp +++ b/src/common/file_search.cpp @@ -3,8 +3,8 @@ // Refer to the license.txt file included. -#include "common.h" -#include "common_paths.h" +#include "common/common.h" +#include "common/common_paths.h" #ifndef _WIN32 #include <sys/types.h> #include <dirent.h> @@ -15,9 +15,8 @@ #include <string> #include <algorithm> -#include "file_search.h" - -#include "string_util.h" +#include "common/file_search.h" +#include "common/string_util.h" CFileSearch::CFileSearch(const CFileSearch::XStringVector& _rSearchStrings, const CFileSearch::XStringVector& _rDirectories) diff --git a/src/common/file_util.cpp b/src/common/file_util.cpp index 8b47cb3e5..d36304d91 100644 --- a/src/common/file_util.cpp +++ b/src/common/file_util.cpp @@ -3,10 +3,10 @@ // Refer to the license.txt file included. -#include "common.h" -#include "common_paths.h" -#include "file_util.h" -#include "string_util.h" +#include "common/common.h" +#include "common/common_paths.h" +#include "common/file_util.h" +#include "common/string_util.h" #ifdef _WIN32 #include <windows.h> @@ -32,7 +32,7 @@ #include <algorithm> #include <sys/stat.h> -#include "string_util.h" +#include "common/string_util.h" #ifndef S_ISDIR #define S_ISDIR(m) (((m)&S_IFMT) == S_IFDIR) diff --git a/src/common/file_util.h b/src/common/file_util.h index f4ef949d8..5edb43f6a 100644 --- a/src/common/file_util.h +++ b/src/common/file_util.h @@ -12,8 +12,8 @@ #include <vector> #include <string.h> -#include "common.h" -#include "string_util.h" +#include "common/common.h" +#include "common/string_util.h" // User directory indices for GetUserPath enum { diff --git a/src/common/hash.cpp b/src/common/hash.cpp index 5303f07b5..d2ebc7341 100644 --- a/src/common/hash.cpp +++ b/src/common/hash.cpp @@ -3,9 +3,9 @@ // Refer to the license.txt file included. -#include "hash.h" +#include "common/hash.h" #if _M_SSE >= 0x402 -#include "cpu_detect.h" +#include "common/cpu_detect.h" #include <nmmintrin.h> #endif diff --git a/src/common/hash.h b/src/common/hash.h index addfa4b5f..c69908415 100644 --- a/src/common/hash.h +++ b/src/common/hash.h @@ -6,7 +6,7 @@ #ifndef _HASH_H_ #define _HASH_H_ -#include "common.h" +#include "common/common.h" u32 HashFletcher(const u8* data_u8, size_t length); // FAST. Length & 1 == 0. u32 HashAdler32(const u8* data, size_t len); // Fairly accurate, slightly slower diff --git a/src/common/linear_disk_cache.h b/src/common/linear_disk_cache.h index da5d6b9b4..a24687615 100644 --- a/src/common/linear_disk_cache.h +++ b/src/common/linear_disk_cache.h @@ -6,7 +6,7 @@ #ifndef _LINEAR_DISKCACHE #define _LINEAR_DISKCACHE -#include "common.h" +#include "common/common.h" #include <fstream> // defined in Version.cpp diff --git a/src/common/log_manager.cpp b/src/common/log_manager.cpp index b5b034846..245760d0d 100644 --- a/src/common/log_manager.cpp +++ b/src/common/log_manager.cpp @@ -4,14 +4,11 @@ #include <algorithm> -#ifdef ANDROID -#include "Host.h" -#endif -#include "log_manager.h" -#include "console_listener.h" -#include "timer.h" -#include "thread.h" -#include "file_util.h" +#include "common/log_manager.h" +#include "common/console_listener.h" +#include "common/timer.h" +#include "common/thread.h" +#include "common/file_util.h" void GenericLog(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type, const char *file, int line, const char* fmt, ...) diff --git a/src/common/log_manager.h b/src/common/log_manager.h index 579198ff6..580860b4d 100644 --- a/src/common/log_manager.h +++ b/src/common/log_manager.h @@ -5,10 +5,10 @@ #ifndef _LOGMANAGER_H_ #define _LOGMANAGER_H_ -#include "log.h" -#include "string_util.h" -#include "thread.h" -#include "file_util.h" +#include "common/log.h" +#include "common/string_util.h" +#include "common/thread.h" +#include "common/file_util.h" #include <set> #include <string.h> diff --git a/src/common/math_util.cpp b/src/common/math_util.cpp index da90f8d74..82eceab00 100644 --- a/src/common/math_util.cpp +++ b/src/common/math_util.cpp @@ -3,8 +3,8 @@ // Refer to the license.txt file included. -#include "common.h" -#include "math_util.h" +#include "common/common.h" +#include "common/math_util.h" #include <cmath> #include <numeric> diff --git a/src/common/math_util.h b/src/common/math_util.h index 4410c5e01..9167d2012 100644 --- a/src/common/math_util.h +++ b/src/common/math_util.h @@ -6,7 +6,7 @@ #ifndef _MATH_UTIL_H_ #define _MATH_UTIL_H_ -#include "common.h" +#include "common/common.h" #include <vector> diff --git a/src/common/mem_arena.cpp b/src/common/mem_arena.cpp index 1a6fcf44d..b918eb568 100644 --- a/src/common/mem_arena.cpp +++ b/src/common/mem_arena.cpp @@ -17,12 +17,10 @@ #include <string> -#include "memory_util.h" -#include "mem_arena.h" +#include "common/memory_util.h" +#include "common/mem_arena.h" -#ifdef _WIN32 -//#include "CommonWindows.h" -#else +#ifndef _WIN32 #include <sys/stat.h> #include <fcntl.h> #include <unistd.h> diff --git a/src/common/mem_arena.h b/src/common/mem_arena.h index 8bdf9f189..667efbea9 100644 --- a/src/common/mem_arena.h +++ b/src/common/mem_arena.h @@ -26,7 +26,7 @@ #include <e32std.h> #endif -#include "common.h" +#include "common/common.h" // This class lets you create a block of anonymous RAM, and then arbitrarily map views into it. // Multiple views can mirror the same section of the block, which makes it very convient for emulating diff --git a/src/common/memory_util.cpp b/src/common/memory_util.cpp index cc6e77b35..71ef159c3 100644 --- a/src/common/memory_util.cpp +++ b/src/common/memory_util.cpp @@ -3,9 +3,9 @@ // Refer to the license.txt file included. -#include "common.h" -#include "memory_util.h" -#include "string_util.h" +#include "common/common.h" +#include "common/memory_util.h" +#include "common/string_util.h" #ifdef _WIN32 #include <windows.h> diff --git a/src/common/misc.cpp b/src/common/misc.cpp index 935805478..cf6df44e8 100644 --- a/src/common/misc.cpp +++ b/src/common/misc.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "common.h" +#include "common/common.h" #ifdef _WIN32 #include <windows.h> diff --git a/src/common/msg_handler.cpp b/src/common/msg_handler.cpp index 8e9fe218e..c1386cdaa 100644 --- a/src/common/msg_handler.cpp +++ b/src/common/msg_handler.cpp @@ -4,8 +4,8 @@ #include <stdio.h> // System -#include "common.h" // Local -#include "string_util.h" +#include "common/common.h" // Local +#include "common/string_util.h" bool DefaultMsgHandler(const char* caption, const char* text, bool yes_no, int Style); static MsgAlertHandler msg_handler = DefaultMsgHandler; diff --git a/src/common/platform.h b/src/common/platform.h index 84c6b6365..633f1d694 100644 --- a/src/common/platform.h +++ b/src/common/platform.h @@ -25,7 +25,7 @@ #ifndef COMMON_PLATFORM_H_ #define COMMON_PLATFORM_H_ -#include "common_types.h" +#include "common/common_types.h" //////////////////////////////////////////////////////////////////////////////////////////////////// // Platform definitions diff --git a/src/common/scm_rev_gen.vcxproj b/src/common/scm_rev_gen.vcxproj index d2d9b7fbb..6b81c9055 100644 --- a/src/common/scm_rev_gen.vcxproj +++ b/src/common/scm_rev_gen.vcxproj @@ -19,12 +19,11 @@ </ProjectConfiguration> </ItemGroup> <ItemGroup> - <None Include="scm_rev_gen.js"> - </None> + <ClInclude Include="force_rebuild.h" /> + <ClInclude Include="scm_rev.h" /> </ItemGroup> <ItemGroup> - <ClInclude Include="force_rebuild.h" /> - <ClInclude Include="src\scm_rev.h" /> + <None Include="scm_rev_gen.js" /> </ItemGroup> <PropertyGroup Label="Globals"> <ProjectGuid>{69F00340-5C3D-449F-9A80-958435C6CF06}</ProjectGuid> diff --git a/src/common/std_condition_variable.h b/src/common/std_condition_variable.h index cee7a9dcd..8964b4f6f 100644 --- a/src/common/std_condition_variable.h +++ b/src/common/std_condition_variable.h @@ -29,7 +29,7 @@ // partial std::condition_variable implementation for win32/pthread -#include "std_mutex.h" +#include "common/std_mutex.h" #if (_MSC_VER >= 1600) || (GCC_VERSION >= GCC_VER(4,3,0) && __GXX_EXPERIMENTAL_CXX0X__) #define USE_RVALUE_REFERENCES diff --git a/src/common/string_util.cpp b/src/common/string_util.cpp index 415dcbbc7..a99644f11 100644 --- a/src/common/string_util.cpp +++ b/src/common/string_util.cpp @@ -6,9 +6,9 @@ #include <stdio.h> #include <algorithm> -#include "common.h" -#include "common_paths.h" -#include "string_util.h" +#include "common/common.h" +#include "common/common_paths.h" +#include "common/string_util.h" #ifdef _WIN32 #include <Windows.h> diff --git a/src/common/string_util.h b/src/common/string_util.h index fcbae4715..6b7e84797 100644 --- a/src/common/string_util.h +++ b/src/common/string_util.h @@ -12,7 +12,7 @@ #include <sstream> #include <iomanip> -#include "common.h" +#include "common/common.h" std::string StringFromFormat(const char* format, ...); // Cheap! diff --git a/src/common/thread.cpp b/src/common/thread.cpp index 27dbf3f93..c70ee37cf 100644 --- a/src/common/thread.cpp +++ b/src/common/thread.cpp @@ -2,8 +2,8 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "thread.h" -#include "common.h" +#include "common/thread.h" +#include "common/common.h" #ifdef __APPLE__ #include <mach/mach.h> diff --git a/src/common/thread.h b/src/common/thread.h index 6384a44a1..d72ac7b47 100644 --- a/src/common/thread.h +++ b/src/common/thread.h @@ -5,12 +5,12 @@ #ifndef _THREAD_H_ #define _THREAD_H_ -#include "std_condition_variable.h" -#include "std_mutex.h" -#include "std_thread.h" +#include "common/std_condition_variable.h" +#include "common/std_mutex.h" +#include "common/std_thread.h" // Don't include common.h here as it will break LogManager -#include "common_types.h" +#include "common/common_types.h" #include <stdio.h> #include <string.h> diff --git a/src/common/thunk.h b/src/common/thunk.h index c9e6fd39f..2c2f23cd0 100644 --- a/src/common/thunk.h +++ b/src/common/thunk.h @@ -7,8 +7,7 @@ #include <map> -#include "common.h" -#include "x64Emitter.h" +#include "common/common.h" // This simple class creates a wrapper around a C/C++ function that saves all fp state // before entering it, and restores it upon exit. This is required to be able to selectively diff --git a/src/common/timer.cpp b/src/common/timer.cpp index 90604292e..f8e1fadca 100644 --- a/src/common/timer.cpp +++ b/src/common/timer.cpp @@ -12,9 +12,9 @@ #include <sys/time.h> #endif -#include "common.h" -#include "timer.h" -#include "string_util.h" +#include "common/common.h" +#include "common/timer.h" +#include "common/string_util.h" namespace Common { diff --git a/src/common/timer.h b/src/common/timer.h index 20c86762a..cfa5cf609 100644 --- a/src/common/timer.h +++ b/src/common/timer.h @@ -5,7 +5,7 @@ #ifndef _TIMER_H_ #define _TIMER_H_ -#include "common.h" +#include "common/common.h" #include <string> namespace Common diff --git a/src/common/utf8.cpp b/src/common/utf8.cpp index 9aa8088ef..fe5270183 100644 --- a/src/common/utf8.cpp +++ b/src/common/utf8.cpp @@ -26,8 +26,8 @@ #include <algorithm> #include <string> -#include "common_types.h" -#include "utf8.h" +#include "common/common_types.h" +#include "common/utf8.h" // is start of UTF sequence inline bool isutf(char c) { diff --git a/src/common/utf8.h b/src/common/utf8.h index 36cf75713..6479ec5ad 100644 --- a/src/common/utf8.h +++ b/src/common/utf8.h @@ -16,7 +16,7 @@ #pragma once -#include "common_types.h" +#include "common/common_types.h" #include <string> u32 u8_nextchar(const char *s, int *i); diff --git a/src/common/version.cpp b/src/common/version.cpp index 01890dbb6..f0df884d7 100644 --- a/src/common/version.cpp +++ b/src/common/version.cpp @@ -2,8 +2,8 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "common.h" -#include "scm_rev.h" +#include "common/common.h" +#include "common/scm_rev.h" #ifdef _DEBUG #define BUILD_TYPE_STR "Debug " diff --git a/src/core/arm/arm_interface.h b/src/core/arm/arm_interface.h index eee2f6240..e5df2d971 100644 --- a/src/core/arm/arm_interface.h +++ b/src/core/arm/arm_interface.h @@ -4,8 +4,8 @@ #pragma once -#include "common.h" -#include "common_types.h" +#include "common/common.h" +#include "common/common_types.h" /// Generic ARM11 CPU interface class ARM_Interface { diff --git a/src/core/arm/disassembler/arm_disasm.cpp b/src/core/arm/disassembler/arm_disasm.cpp index 82ca5ee8d..db1567498 100644 --- a/src/core/arm/disassembler/arm_disasm.cpp +++ b/src/core/arm/disassembler/arm_disasm.cpp @@ -2,7 +2,8 @@ #include <stdio.h> #include <string.h> -#include "arm_disasm.h" + +#include "core/arm/disassembler/arm_disasm.h" static const char *cond_names[] = { "eq", diff --git a/src/core/arm/interpreter/arm_interpreter.h b/src/core/arm/interpreter/arm_interpreter.h index 074149f1b..03b781c6d 100644 --- a/src/core/arm/interpreter/arm_interpreter.h +++ b/src/core/arm/interpreter/arm_interpreter.h @@ -24,12 +24,11 @@ #pragma once -#include "common.h" -#include "common_types.h" -#include "arm/arm_interface.h" +#include "common/common.h" -#include "arm/interpreter/armdefs.h" -#include "arm/interpreter/armemu.h" +#include "core/arm/arm_interface.h" +#include "core/arm/interpreter/armdefs.h" +#include "core/arm/interpreter/armemu.h" class ARM_Interpreter : virtual public ARM_Interface { public: diff --git a/src/core/arm/interpreter/armcpu.h b/src/core/arm/interpreter/armcpu.h index d7e336b94..6b5ea8566 100644 --- a/src/core/arm/interpreter/armcpu.h +++ b/src/core/arm/interpreter/armcpu.h @@ -28,7 +28,7 @@ #include <stddef.h> #include <stdio.h> -#include "thread.h" +#include "common/thread.h" typedef struct ARM_CPU_State_s { diff --git a/src/core/arm/interpreter/armdefs.h b/src/core/arm/interpreter/armdefs.h index 0136a52d2..30b5b689c 100644 --- a/src/core/arm/interpreter/armdefs.h +++ b/src/core/arm/interpreter/armdefs.h @@ -32,7 +32,7 @@ //#include "portable/mman.h" #include "arm_regformat.h" -#include "platform.h" +#include "common/platform.h" #include "skyeye_defs.h" //AJ2D-------------------------------------------------------------------------- @@ -82,7 +82,7 @@ //teawater add DBCT_TEST_SPEED 2005.10.04--------------------------------------- #include <signal.h> -#include "platform.h" +#include "common/platform.h" #if EMU_PLATFORM == PLATFORM_LINUX #include <sys/time.h> diff --git a/src/core/arm/interpreter/armemu.h b/src/core/arm/interpreter/armemu.h index 2ab317fdd..7391dea7f 100644 --- a/src/core/arm/interpreter/armemu.h +++ b/src/core/arm/interpreter/armemu.h @@ -17,7 +17,7 @@ #ifndef __ARMEMU_H__ #define __ARMEMU_H__ -#include "common.h" +#include "common/common.h" #include "armdefs.h" //#include "skyeye.h" diff --git a/src/core/arm/interpreter/arminit.cpp b/src/core/arm/interpreter/arminit.cpp index f48232eec..cdbd02f3c 100644 --- a/src/core/arm/interpreter/arminit.cpp +++ b/src/core/arm/interpreter/arminit.cpp @@ -16,7 +16,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "platform.h" +#include "common/platform.h" #if EMU_PLATFORM == PLATFORM_LINUX #include <unistd.h> #endif diff --git a/src/core/arm/interpreter/armmmu.h b/src/core/arm/interpreter/armmmu.h index c28d8753e..8b24e6151 100644 --- a/src/core/arm/interpreter/armmmu.h +++ b/src/core/arm/interpreter/armmmu.h @@ -172,18 +172,18 @@ typedef struct mmu_ops_s } mmu_ops_t; -#include "arm/mmu/tlb.h" -#include "arm/mmu/rb.h" -#include "arm/mmu/wb.h" -#include "arm/mmu/cache.h" +#include "core/arm/mmu/tlb.h" +#include "core/arm/mmu/rb.h" +#include "core/arm/mmu/wb.h" +#include "core/arm/mmu/cache.h" /*special process mmu.h*/ -//#include "arm/mmu/sa_mmu.h" -//#include "arm/mmu/arm7100_mmu.h" -//#include "arm/mmu/arm920t_mmu.h" -//#include "arm/mmu/arm926ejs_mmu.h" -#include "arm/mmu/arm1176jzf_s_mmu.h" -//#include "arm/mmu/cortex_a9_mmu.h" +//#include "core/arm/mmu/sa_mmu.h" +//#include "core/arm/mmu/arm7100_mmu.h" +//#include "core/arm/mmu/arm920t_mmu.h" +//#include "core/arm/mmu/arm926ejs_mmu.h" +#include "core/arm/mmu/arm1176jzf_s_mmu.h" +//#include "core/arm/mmu/cortex_a9_mmu.h" typedef struct mmu_state_t { diff --git a/src/core/arm/interpreter/skyeye_defs.h b/src/core/arm/interpreter/skyeye_defs.h index 6562e595a..b6713ebad 100644 --- a/src/core/arm/interpreter/skyeye_defs.h +++ b/src/core/arm/interpreter/skyeye_defs.h @@ -1,7 +1,7 @@ #ifndef CORE_ARM_SKYEYE_DEFS_H_ #define CORE_ARM_SKYEYE_DEFS_H_ -#include "common.h" +#include "common/common.h" #define MODE32 #define MODET diff --git a/src/core/arm/mmu/arm1176jzf_s_mmu.cpp b/src/core/arm/mmu/arm1176jzf_s_mmu.cpp index 0a3206abb..7e7fbfbfa 100644 --- a/src/core/arm/mmu/arm1176jzf_s_mmu.cpp +++ b/src/core/arm/mmu/arm1176jzf_s_mmu.cpp @@ -22,11 +22,11 @@ #include <string.h> #include <stdint.h> -#include "mem_map.h" +#include "core/mem_map.h" -#include "arm/interpreter/skyeye_defs.h" +#include "core/arm/interpreter/skyeye_defs.h" -#include "arm/interpreter/armdefs.h" +#include "core/arm/interpreter/armdefs.h" //#include "bank_defs.h" #if 0 #define TLB_SIZE 1024 * 1024 diff --git a/src/core/core.cpp b/src/core/core.cpp index 540b20f27..28f6b6c58 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -2,12 +2,14 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "log.h" -#include "core.h" -#include "mem_map.h" -#include "hw/hw.h" -#include "arm/disassembler/arm_disasm.h" -#include "arm/interpreter/arm_interpreter.h" +#include "common/common_types.h" +#include "common/log.h" +#include "core/core.h" + +#include "core/mem_map.h" +#include "core/hw/hw.h" +#include "core/arm/disassembler/arm_disasm.h" +#include "core/arm/interpreter/arm_interpreter.h" namespace Core { diff --git a/src/core/core.h b/src/core/core.h index bae9f3e3d..4b42dabcb 100644 --- a/src/core/core.h +++ b/src/core/core.h @@ -4,8 +4,8 @@ #pragma once -#include "arm/arm_interface.h" -#include "arm/interpreter/armdefs.h" +#include "core/arm/arm_interface.h" +#include "core/arm/interpreter/armdefs.h" //////////////////////////////////////////////////////////////////////////////////////////////////// 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 diff --git a/src/core/core_timing.cpp b/src/core/core_timing.cpp index 78bbaafe2..a4fc0aaa4 100644 --- a/src/core/core_timing.cpp +++ b/src/core/core_timing.cpp @@ -5,12 +5,13 @@ #include <vector> #include <cstdio> -#include "msg_handler.h" -#include "std_mutex.h" -#include "atomic.h" -#include "core_timing.h" -#include "core.h" -#include "chunk_file.h" +#include "common/msg_handler.h" +#include "common/std_mutex.h" +#include "common/atomic.h" +#include "common/chunk_file.h" + +#include "core/core_timing.h" +#include "core/core.h" int g_clock_rate_arm11 = 268123480; diff --git a/src/core/core_timing.h b/src/core/core_timing.h index b62acea6c..09fdf7a90 100644 --- a/src/core/core_timing.h +++ b/src/core/core_timing.h @@ -17,7 +17,7 @@ // inside callback: // ScheduleEvent(periodInCycles - cyclesLate, callback, "whatever") -#include "common.h" +#include "common/common.h" class PointerWrap; diff --git a/src/core/elf/elf_reader.cpp b/src/core/elf/elf_reader.cpp index aef7c13e9..2b03caa0f 100644 --- a/src/core/elf/elf_reader.cpp +++ b/src/core/elf/elf_reader.cpp @@ -4,10 +4,11 @@ #include <string> -#include "common.h" -#include "mem_map.h" +#include "common/common.h" + +#include "core/mem_map.h" +#include "core/elf/elf_reader.h" -#include "elf/elf_reader.h" //#include "Core/Debugger/Debugger_SymbolMap.h" //#include "Core/HW/Memmap.h" //#include "Core/PowerPC/PPCSymbolDB.h" diff --git a/src/core/elf/elf_reader.h b/src/core/elf/elf_reader.h index 9393a589d..3e2869f87 100644 --- a/src/core/elf/elf_reader.h +++ b/src/core/elf/elf_reader.h @@ -4,7 +4,7 @@ #pragma once -#include "elf/elf_types.h" +#include "core/elf/elf_types.h" enum KnownElfTypes { diff --git a/src/core/file_sys/directory_file_system.cpp b/src/core/file_sys/directory_file_system.cpp index 29369eec4..6c6f33c2b 100644 --- a/src/core/file_sys/directory_file_system.cpp +++ b/src/core/file_sys/directory_file_system.cpp @@ -15,13 +15,11 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. -#include "chunk_file.h" -#include "file_util.h" -#include "directory_file_system.h" -//#include "ISOFileSystem.h" -//#include "Core/HLE/sceKernel.h" -//#include "file/zip_read.h" -#include "utf8.h" +#include "common/chunk_file.h" +#include "common/file_util.h" +#include "common/utf8.h" + +#include "core/file_sys/directory_file_system.h" #if EMU_PLATFORM == PLATFORM_WINDOWS #include <windows.h> diff --git a/src/core/file_sys/directory_file_system.h b/src/core/file_sys/directory_file_system.h index a11331a27..9af2854a2 100644 --- a/src/core/file_sys/directory_file_system.h +++ b/src/core/file_sys/directory_file_system.h @@ -15,14 +15,13 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. -#ifndef CORE_FILE_SYS_DIRECTORY_H_ -#define CORE_FILE_SYS_DIRECTORY_H_ +#pragma once // TODO: Remove the Windows-specific code, FILE is fine there too. #include <map> -#include "file_sys.h" +#include "core/file_sys/file_sys.h" #ifdef _WIN32 typedef void * HANDLE; @@ -154,5 +153,3 @@ private: std::string GetLocalPath(std::string localpath); }; - -#endif // CORE_FILE_SYS_DIRECTORY_H_ diff --git a/src/core/file_sys/file_sys.h b/src/core/file_sys/file_sys.h index b27e36c80..bb8503e62 100644 --- a/src/core/file_sys/file_sys.h +++ b/src/core/file_sys/file_sys.h @@ -17,8 +17,8 @@ #pragma once -#include "common.h" -#include "chunk_file.h" +#include "common/common.h" +#include "common/chunk_file.h" enum FileAccess { FILEACCESS_NONE=0, diff --git a/src/core/file_sys/meta_file_system.cpp b/src/core/file_sys/meta_file_system.cpp index f86c3cb18..01048e498 100644 --- a/src/core/file_sys/meta_file_system.cpp +++ b/src/core/file_sys/meta_file_system.cpp @@ -17,10 +17,9 @@ #include <set> #include <algorithm> -#include "string_util.h" -#include "file_sys/meta_file_system.h" -//#include "Core/HLE/sceKernelThread.h" -//#include "Core/Reporting.h" + +#include "common/string_util.h" +#include "core/file_sys/meta_file_system.h" static bool ApplyPathStringToComponentsVector(std::vector<std::string> &vector, const std::string &pathString) { diff --git a/src/core/file_sys/meta_file_system.h b/src/core/file_sys/meta_file_system.h index 0de23d49c..961f75cda 100644 --- a/src/core/file_sys/meta_file_system.h +++ b/src/core/file_sys/meta_file_system.h @@ -17,8 +17,9 @@ #pragma once -#include "std_mutex.h" -#include "file_sys.h" +#include "common/std_mutex.h" + +#include "core/file_sys/file_sys.h" class MetaFileSystem : public IHandleAllocator, public IFileSystem { diff --git a/src/core/hw/hw.cpp b/src/core/hw/hw.cpp index 57be4d6a8..44625e3af 100644 --- a/src/core/hw/hw.cpp +++ b/src/core/hw/hw.cpp @@ -2,9 +2,11 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "log.h" -#include "hw/hw.h" -#include "hw/hw_lcd.h" +#include "common/common_types.h" +#include "common/log.h" + +#include "core/hw/hw.h" +#include "core/hw/hw_lcd.h" namespace HW { diff --git a/src/core/hw/hw.h b/src/core/hw/hw.h index 5b0cc8c87..92e9304ca 100644 --- a/src/core/hw/hw.h +++ b/src/core/hw/hw.h @@ -4,7 +4,7 @@ #pragma once -#include "common_types.h" +#include "common/common_types.h" namespace HW { diff --git a/src/core/hw/hw_lcd.cpp b/src/core/hw/hw_lcd.cpp index ad346c794..fd783a84a 100644 --- a/src/core/hw/hw_lcd.cpp +++ b/src/core/hw/hw_lcd.cpp @@ -2,10 +2,13 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "log.h" -#include "core.h" -#include "hw_lcd.h" -#include "video_core.h" +#include "common/common_types.h" +#include "common/log.h" + +#include "core/core.h" +#include "core/hw/hw_lcd.h" + +#include "video_core/video_core.h" namespace LCD { diff --git a/src/core/hw/hw_lcd.h b/src/core/hw/hw_lcd.h index 30e347ccb..386ed6004 100644 --- a/src/core/hw/hw_lcd.h +++ b/src/core/hw/hw_lcd.h @@ -4,7 +4,7 @@ #pragma once -#include "common_types.h" +#include "common/common_types.h" namespace LCD { diff --git a/src/core/loader.cpp b/src/core/loader.cpp index 5d039dc94..8c6d54a68 100644 --- a/src/core/loader.cpp +++ b/src/core/loader.cpp @@ -2,12 +2,14 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "file_util.h" -#include "loader.h" -#include "system.h" -#include "core.h" -#include "file_sys/directory_file_system.h" -#include "elf/elf_reader.h" +#include "common/common_types.h" +#include "common/file_util.h" + +#include "core/loader.h" +#include "core/system.h" +#include "core/core.h" +#include "core/file_sys/directory_file_system.h" +#include "core/elf/elf_reader.h" //////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/core/loader.h b/src/core/loader.h index 46525fcf8..3dd8c471d 100644 --- a/src/core/loader.h +++ b/src/core/loader.h @@ -4,7 +4,7 @@ #pragma once -#include "common.h" +#include "common/common.h" //////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/core/mem_map.cpp b/src/core/mem_map.cpp index 96f77d32e..96f8d0440 100644 --- a/src/core/mem_map.cpp +++ b/src/core/mem_map.cpp @@ -2,11 +2,11 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "common.h" -#include "mem_arena.h" +#include "common/common.h" +#include "common/mem_arena.h" -#include "mem_map.h" -#include "core.h" +#include "core/mem_map.h" +#include "core/core.h" //////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/core/mem_map.h b/src/core/mem_map.h index ad5abd16d..1a3bd7234 100644 --- a/src/core/mem_map.h +++ b/src/core/mem_map.h @@ -6,8 +6,8 @@ //////////////////////////////////////////////////////////////////////////////////////////////////// -#include "common.h" -#include "common_types.h" +#include "common/common.h" +#include "common/common_types.h" //////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/core/mem_map_funcs.cpp b/src/core/mem_map_funcs.cpp index 7d8ae2915..4c0e08b3f 100644 --- a/src/core/mem_map_funcs.cpp +++ b/src/core/mem_map_funcs.cpp @@ -2,10 +2,10 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "common.h" +#include "common/common.h" -#include "mem_map.h" -#include "hw/hw.h" +#include "core/mem_map.h" +#include "core/hw/hw.h" namespace Memory { diff --git a/src/core/system.cpp b/src/core/system.cpp index 1fc272d70..edb07fef5 100644 --- a/src/core/system.cpp +++ b/src/core/system.cpp @@ -2,12 +2,13 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "core.h" -#include "hw/hw.h" -#include "core_timing.h" -#include "mem_map.h" -#include "system.h" -#include "video_core.h" +#include "core/core.h" +#include "core/core_timing.h" +#include "core/mem_map.h" +#include "core/system.h" +#include "core/hw/hw.h" + +#include "video_core/video_core.h" namespace System { diff --git a/src/core/system.h b/src/core/system.h index 8e94e5252..09f1f6ebe 100644 --- a/src/core/system.h +++ b/src/core/system.h @@ -4,8 +4,8 @@ #pragma once -#include "emu_window.h" -#include "file_sys/meta_file_system.h" +#include "common/emu_window.h" +#include "core/file_sys/meta_file_system.h" //////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/video_core/renderer_base.h b/src/video_core/renderer_base.h index 94748d690..bc65bf0ce 100644 --- a/src/video_core/renderer_base.h +++ b/src/video_core/renderer_base.h @@ -4,8 +4,7 @@ #pragma once -#include "common.h" -#include "hash.h" +#include "common/common.h" class RendererBase { public: diff --git a/src/video_core/renderer_opengl/renderer_opengl.cpp b/src/video_core/renderer_opengl/renderer_opengl.cpp index 6010bcbc3..97f84c248 100644 --- a/src/video_core/renderer_opengl/renderer_opengl.cpp +++ b/src/video_core/renderer_opengl/renderer_opengl.cpp @@ -2,9 +2,10 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "mem_map.h" -#include "video_core.h" -#include "renderer_opengl/renderer_opengl.h" +#include "video_core/video_core.h" +#include "video_core/renderer_opengl/renderer_opengl.h" + +#include "core/mem_map.h" /// RendererOpenGL constructor diff --git a/src/video_core/renderer_opengl/renderer_opengl.h b/src/video_core/renderer_opengl/renderer_opengl.h index 86dc7b70e..00aa17649 100644 --- a/src/video_core/renderer_opengl/renderer_opengl.h +++ b/src/video_core/renderer_opengl/renderer_opengl.h @@ -6,10 +6,10 @@ #include <GL/glew.h> -#include "common.h" -#include "emu_window.h" +#include "common/common.h" +#include "common/emu_window.h" -#include "renderer_base.h" +#include "video_core/renderer_base.h" class RendererOpenGL : virtual public RendererBase { diff --git a/src/video_core/utils.cpp b/src/video_core/utils.cpp index a6dd1e02c..67d74a2d8 100644 --- a/src/video_core/utils.cpp +++ b/src/video_core/utils.cpp @@ -5,7 +5,7 @@ #include <stdio.h> #include <string.h> -#include "utils.h" +#include "video_core/utils.h" namespace VideoCore { diff --git a/src/video_core/utils.h b/src/video_core/utils.h index c417342e1..20d4ec9e0 100644 --- a/src/video_core/utils.h +++ b/src/video_core/utils.h @@ -6,7 +6,7 @@ #include <string> -#include "common_types.h" +#include "common/common_types.h" namespace FormatPrecision { diff --git a/src/video_core/video_core.cpp b/src/video_core/video_core.cpp index 6c0c415f5..e227b6795 100644 --- a/src/video_core/video_core.cpp +++ b/src/video_core/video_core.cpp @@ -2,15 +2,15 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "common.h" -#include "emu_window.h" -#include "log.h" +#include "common/common.h" +#include "common/emu_window.h" +#include "common/log.h" -#include "core.h" +#include "core/core.h" -#include "video_core.h" -#include "renderer_base.h" -#include "renderer_opengl/renderer_opengl.h" +#include "video_core/video_core.h" +#include "video_core/renderer_base.h" +#include "video_core/renderer_opengl/renderer_opengl.h" //////////////////////////////////////////////////////////////////////////////////////////////////// // Video Core namespace diff --git a/src/video_core/video_core.h b/src/video_core/video_core.h index 19bf49dd7..d227b6aa4 100644 --- a/src/video_core/video_core.h +++ b/src/video_core/video_core.h @@ -4,8 +4,9 @@ #pragma once -#include "common.h" -#include "emu_window.h" +#include "common/common.h" +#include "common/emu_window.h" + #include "renderer_base.h" //////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/video_core/video_core.vcxproj b/src/video_core/video_core.vcxproj index 5c56e9b71..d8c53271e 100644 --- a/src/video_core/video_core.vcxproj +++ b/src/video_core/video_core.vcxproj @@ -19,15 +19,15 @@ </ProjectConfiguration> </ItemGroup> <ItemGroup> - <ClCompile Include="src\renderer_opengl\renderer_opengl.cpp" /> - <ClCompile Include="src\utils.cpp" /> - <ClCompile Include="src\video_core.cpp" /> + <ClCompile Include="renderer_opengl\renderer_opengl.cpp" /> + <ClCompile Include="utils.cpp" /> + <ClCompile Include="video_core.cpp" /> </ItemGroup> <ItemGroup> - <ClInclude Include="src\renderer_base.h" /> - <ClInclude Include="src\renderer_opengl\renderer_opengl.h" /> - <ClInclude Include="src\utils.h" /> - <ClInclude Include="src\video_core.h" /> + <ClInclude Include="renderer_base.h" /> + <ClInclude Include="renderer_opengl\renderer_opengl.h" /> + <ClInclude Include="utils.h" /> + <ClInclude Include="video_core.h" /> </ItemGroup> <ItemGroup> <Text Include="CMakeLists.txt" /> diff --git a/src/video_core/video_core.vcxproj.filters b/src/video_core/video_core.vcxproj.filters index e796fbe21..4eb2ef0a4 100644 --- a/src/video_core/video_core.vcxproj.filters +++ b/src/video_core/video_core.vcxproj.filters @@ -1,26 +1,26 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> - <ClCompile Include="src\video_core.cpp" /> - <ClCompile Include="src\utils.cpp" /> - <ClCompile Include="src\renderer_opengl\renderer_opengl.cpp"> + <Filter Include="renderer_opengl"> + <UniqueIdentifier>{e0245557-dbd4-423e-9399-513d5e99f1e4}</UniqueIdentifier> + </Filter> + </ItemGroup> + <ItemGroup> + <ClCompile Include="renderer_opengl\renderer_opengl.cpp"> <Filter>renderer_opengl</Filter> </ClCompile> + <ClCompile Include="utils.cpp" /> + <ClCompile Include="video_core.cpp" /> </ItemGroup> <ItemGroup> - <ClInclude Include="src\renderer_base.h" /> - <ClInclude Include="src\video_core.h" /> - <ClInclude Include="src\utils.h" /> - <ClInclude Include="src\renderer_opengl\renderer_opengl.h"> + <ClInclude Include="renderer_opengl\renderer_opengl.h"> <Filter>renderer_opengl</Filter> </ClInclude> + <ClInclude Include="renderer_base.h" /> + <ClInclude Include="utils.h" /> + <ClInclude Include="video_core.h" /> </ItemGroup> <ItemGroup> <Text Include="CMakeLists.txt" /> </ItemGroup> - <ItemGroup> - <Filter Include="renderer_opengl"> - <UniqueIdentifier>{e0245557-dbd4-423e-9399-513d5e99f1e4}</UniqueIdentifier> - </Filter> - </ItemGroup> </Project>
\ No newline at end of file diff --git a/vsprops/base.props b/vsprops/base.props index 6241bd44b..7eedacc74 100644 --- a/vsprops/base.props +++ b/vsprops/base.props @@ -12,7 +12,7 @@ <StructMemberAlignment>16Bytes</StructMemberAlignment> <FunctionLevelLinking>true</FunctionLevelLinking> <MultiProcessorCompilation>true</MultiProcessorCompilation> - <AdditionalIncludeDirectories>$(SolutionDir)src\common\src;$(SolutionDir)src\core\src;$(SolutionDir)src\video_core\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(SolutionDir)src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions> </PreprocessorDefinitions> <RuntimeTypeInfo>false</RuntimeTypeInfo> |