summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/citra/citra.cpp18
-rw-r--r--src/citra/citra.vcxproj15
-rw-r--r--src/citra/citra.vcxproj.filters25
-rw-r--r--src/citra/emu_window/emu_window_glfw.cpp6
-rw-r--r--src/citra/emu_window/emu_window_glfw.h2
-rw-r--r--src/citra_qt/citra_qt.vcxproj72
-rw-r--r--src/citra_qt/citra_qt.vcxproj.filters112
-rw-r--r--src/common/atomic.h4
-rw-r--r--src/common/atomic_gcc.h2
-rw-r--r--src/common/atomic_win32.h2
-rw-r--r--src/common/break_points.cpp6
-rw-r--r--src/common/break_points.h2
-rw-r--r--src/common/chunk_file.h4
-rw-r--r--src/common/common.h12
-rw-r--r--src/common/common.vcxproj119
-rw-r--r--src/common/common.vcxproj.filters109
-rw-r--r--src/common/common_paths.h2
-rw-r--r--src/common/common_types.h2
-rw-r--r--src/common/console_listener.cpp6
-rw-r--r--src/common/console_listener.h2
-rw-r--r--src/common/emu_window.h2
-rw-r--r--src/common/extended_trace.cpp4
-rw-r--r--src/common/fifo_queue.h2
-rw-r--r--src/common/file_search.cpp9
-rw-r--r--src/common/file_util.cpp10
-rw-r--r--src/common/file_util.h4
-rw-r--r--src/common/hash.cpp4
-rw-r--r--src/common/hash.h2
-rw-r--r--src/common/linear_disk_cache.h2
-rw-r--r--src/common/log_manager.cpp13
-rw-r--r--src/common/log_manager.h8
-rw-r--r--src/common/math_util.cpp4
-rw-r--r--src/common/math_util.h2
-rw-r--r--src/common/mem_arena.cpp8
-rw-r--r--src/common/mem_arena.h2
-rw-r--r--src/common/memory_util.cpp6
-rw-r--r--src/common/misc.cpp2
-rw-r--r--src/common/msg_handler.cpp4
-rw-r--r--src/common/platform.h2
-rw-r--r--src/common/scm_rev_gen.vcxproj7
-rw-r--r--src/common/std_condition_variable.h2
-rw-r--r--src/common/string_util.cpp6
-rw-r--r--src/common/string_util.h2
-rw-r--r--src/common/thread.cpp4
-rw-r--r--src/common/thread.h8
-rw-r--r--src/common/thunk.h3
-rw-r--r--src/common/timer.cpp6
-rw-r--r--src/common/timer.h2
-rw-r--r--src/common/utf8.cpp4
-rw-r--r--src/common/utf8.h2
-rw-r--r--src/common/version.cpp4
-rw-r--r--src/core/arm/arm_interface.h4
-rw-r--r--src/core/arm/disassembler/arm_disasm.cpp3
-rw-r--r--src/core/arm/interpreter/arm_interpreter.h9
-rw-r--r--src/core/arm/interpreter/armcpu.h2
-rw-r--r--src/core/arm/interpreter/armdefs.h4
-rw-r--r--src/core/arm/interpreter/armemu.h2
-rw-r--r--src/core/arm/interpreter/arminit.cpp2
-rw-r--r--src/core/arm/interpreter/armmmu.h20
-rw-r--r--src/core/arm/interpreter/skyeye_defs.h2
-rw-r--r--src/core/arm/mmu/arm1176jzf_s_mmu.cpp6
-rw-r--r--src/core/core.cpp14
-rw-r--r--src/core/core.h4
-rw-r--r--src/core/core.vcxproj98
-rw-r--r--src/core/core.vcxproj.filters203
-rw-r--r--src/core/core_timing.cpp13
-rw-r--r--src/core/core_timing.h2
-rw-r--r--src/core/elf/elf_reader.cpp7
-rw-r--r--src/core/elf/elf_reader.h2
-rw-r--r--src/core/file_sys/directory_file_system.cpp12
-rw-r--r--src/core/file_sys/directory_file_system.h7
-rw-r--r--src/core/file_sys/file_sys.h4
-rw-r--r--src/core/file_sys/meta_file_system.cpp7
-rw-r--r--src/core/file_sys/meta_file_system.h5
-rw-r--r--src/core/hw/hw.cpp8
-rw-r--r--src/core/hw/hw.h2
-rw-r--r--src/core/hw/hw_lcd.cpp11
-rw-r--r--src/core/hw/hw_lcd.h2
-rw-r--r--src/core/loader.cpp14
-rw-r--r--src/core/loader.h2
-rw-r--r--src/core/mem_map.cpp8
-rw-r--r--src/core/mem_map.h4
-rw-r--r--src/core/mem_map_funcs.cpp6
-rw-r--r--src/core/system.cpp13
-rw-r--r--src/core/system.h4
-rw-r--r--src/video_core/renderer_base.h3
-rw-r--r--src/video_core/renderer_opengl/renderer_opengl.cpp7
-rw-r--r--src/video_core/renderer_opengl/renderer_opengl.h6
-rw-r--r--src/video_core/utils.cpp2
-rw-r--r--src/video_core/utils.h2
-rw-r--r--src/video_core/video_core.cpp14
-rw-r--r--src/video_core/video_core.h5
-rw-r--r--src/video_core/video_core.vcxproj14
-rw-r--r--src/video_core/video_core.vcxproj.filters24
-rw-r--r--vsprops/base.props2
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 @@
22 * http://code.google.com/p/gekko-gc-emu/ 22 * http://code.google.com/p/gekko-gc-emu/
23 */ 23 */
24 24
25#include "common.h" 25#include "common/common.h"
26#include "log_manager.h" 26#include "common/log_manager.h"
27#include "file_util.h" 27#include "common/file_util.h"
28 28
29#include "system.h" 29#include "core/system.h"
30#include "core.h" 30#include "core/core.h"
31#include "loader.h" 31#include "core/loader.h"
32 32
33#include "emu_window/emu_window_glfw.h" 33#include "citra/emu_window/emu_window_glfw.h"
34 34
35#include "citra.h" 35#include "citra/citra.h"
36 36
37#define E_ERR -1 37#define E_ERR -1
38 38
@@ -52,7 +52,7 @@ int __cdecl main(int argc, char **argv) {
52 52
53 System::Init(emu_window); 53 System::Init(emu_window);
54 54
55 std::string boot_filename = "homebrew.elf"; 55 std::string boot_filename = "C:\\Users\\eric\\Desktop\\3ds\\homebrew\\Mandelbrot3DS.elf";
56 std::string error_str; 56 std::string error_str;
57 57
58 bool res = Loader::LoadFile(boot_filename, &error_str); 58 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 @@
199 </ProjectReference> 199 </ProjectReference>
200 </ItemGroup> 200 </ItemGroup>
201 <ItemGroup> 201 <ItemGroup>
202 <ClCompile Include="src\citra.cpp" /> 202 <ClCompile Include="citra.cpp" />
203 <ClCompile Include="src\emu_window\emu_window_glfw.cpp" /> 203 <ClCompile Include="emu_window\emu_window_glfw.cpp" />
204 </ItemGroup> 204 </ItemGroup>
205 <ItemGroup> 205 <ItemGroup>
206 <ClInclude Include="citra.h" />
207 <ClInclude Include="emu_window\emu_window_glfw.h" />
206 <ClInclude Include="resource.h" /> 208 <ClInclude Include="resource.h" />
207 <ClInclude Include="src\citra.h" /> 209 <ClInclude Include="version.h" />
208 <ClInclude Include="src\emu_window\emu_window_glfw.h" />
209 <ClInclude Include="src\version.h" />
210 </ItemGroup> 210 </ItemGroup>
211 <ItemGroup> 211 <ItemGroup>
212 <ResourceCompile Include="citra.rc" /> 212 <Text Include="CMakeLists.txt" />
213 </ItemGroup>
214 <ItemGroup>
215 <None Include="CMakeLists.txt" />
216 </ItemGroup> 213 </ItemGroup>
217 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> 214 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
218 <ImportGroup Label="ExtensionTargets"> 215 <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 @@
1<?xml version="1.0" encoding="utf-8"?> 1<?xml version="1.0" encoding="utf-8"?>
2<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 2<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3 <ItemGroup> 3 <ItemGroup>
4 <ClCompile Include="src\citra.cpp" /> 4 <Filter Include="emu_window">
5 <ClCompile Include="src\emu_window\emu_window_glfw.cpp"> 5 <UniqueIdentifier>{e3161526-9f53-4670-8dae-2be81ff01bc2}</UniqueIdentifier>
6 </Filter>
7 </ItemGroup>
8 <ItemGroup>
9 <ClCompile Include="citra.cpp" />
10 <ClCompile Include="emu_window\emu_window_glfw.cpp">
6 <Filter>emu_window</Filter> 11 <Filter>emu_window</Filter>
7 </ClCompile> 12 </ClCompile>
8 </ItemGroup> 13 </ItemGroup>
9 <ItemGroup> 14 <ItemGroup>
15 <ClInclude Include="citra.h" />
10 <ClInclude Include="resource.h" /> 16 <ClInclude Include="resource.h" />
11 <ClInclude Include="src\version.h" /> 17 <ClInclude Include="version.h" />
12 <ClInclude Include="src\citra.h" /> 18 <ClInclude Include="emu_window\emu_window_glfw.h">
13 <ClInclude Include="src\emu_window\emu_window_glfw.h">
14 <Filter>emu_window</Filter> 19 <Filter>emu_window</Filter>
15 </ClInclude> 20 </ClInclude>
16 </ItemGroup> 21 </ItemGroup>
17 <ItemGroup> 22 <ItemGroup>
18 <ResourceCompile Include="citra.rc" /> 23 <Text Include="CMakeLists.txt" />
19 </ItemGroup>
20 <ItemGroup>
21 <Filter Include="emu_window">
22 <UniqueIdentifier>{e3161526-9f53-4670-8dae-2be81ff01bc2}</UniqueIdentifier>
23 </Filter>
24 </ItemGroup>
25 <ItemGroup>
26 <None Include="CMakeLists.txt" />
27 </ItemGroup> 24 </ItemGroup>
28</Project> \ No newline at end of file 25</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 @@
22 * http://code.google.com/p/gekko-gc-emu/ 22 * http://code.google.com/p/gekko-gc-emu/
23 */ 23 */
24 24
25#include "common.h" 25#include "common/common.h"
26#include "video_core.h" 26#include "video_core/video_core.h"
27#include "emu_window_glfw.h" 27#include "citra/emu_window/emu_window_glfw.h"
28 28
29static void OnKeyEvent(GLFWwindow* win, int key, int action) { 29static void OnKeyEvent(GLFWwindow* win, int key, int action) {
30 // EmuWindow_GLFW* emuwin = (EmuWindow_GLFW*)glfwGetWindowUserPointer(win); 30 // 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 @@
27#include <GL/glew.h> 27#include <GL/glew.h>
28#include <GLFW/glfw3.h> 28#include <GLFW/glfw3.h>
29 29
30#include "emu_window.h" 30#include "common/emu_window.h"
31 31
32class EmuWindow_GLFW : public EmuWindow { 32class EmuWindow_GLFW : public EmuWindow {
33public: 33public:
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 @@
127 <ClCompile Include="..\..\externals\qhexedit\qhexedit.cpp" /> 127 <ClCompile Include="..\..\externals\qhexedit\qhexedit.cpp" />
128 <ClCompile Include="..\..\externals\qhexedit\qhexedit_p.cpp" /> 128 <ClCompile Include="..\..\externals\qhexedit\qhexedit_p.cpp" />
129 <ClCompile Include="..\..\externals\qhexedit\xbytearray.cpp" /> 129 <ClCompile Include="..\..\externals\qhexedit\xbytearray.cpp" />
130 <ClCompile Include="src\bootmanager.cpp" /> 130 <ClCompile Include="bootmanager.cpp" />
131 <ClCompile Include="src\callstack.cpp" /> 131 <ClCompile Include="callstack.cpp" />
132 <ClCompile Include="src\config\controller_config.cpp" /> 132 <ClCompile Include="config\controller_config.cpp" />
133 <ClCompile Include="src\config\controller_config_util.cpp" /> 133 <ClCompile Include="config\controller_config_util.cpp" />
134 <ClCompile Include="src\disasm.cpp" /> 134 <ClCompile Include="cpu_regs.cpp" />
135 <ClCompile Include="src\cpu_regs.cpp" /> 135 <ClCompile Include="disasm.cpp" />
136 <ClCompile Include="src\hotkeys.cpp" /> 136 <ClCompile Include="hotkeys.cpp" />
137 <ClCompile Include="src\main.cpp" /> 137 <ClCompile Include="main.cpp" />
138 <ClCompile Include="src\ramview.cpp" /> 138 <ClCompile Include="ramview.cpp" />
139 </ItemGroup>
140 <ItemGroup>
141 <MOC Include="src\bootmanager.hxx" />
142 <MOC Include="src\callstack.hxx" />
143 <MOC Include="src\config\controller_config.hxx" />
144 <MOC Include="src\config\controller_config_util.hxx" />
145 <MOC Include="src\disasm.hxx" />
146 <MOC Include="src\cpu_regs.hxx" />
147 <MOC Include="src\hotkeys.hxx" />
148 <MOC Include="src\main.hxx" />
149 <MOC Include="src\ramview.hxx" />
150 </ItemGroup>
151 <ItemGroup>
152 <UIC Include="src\callstack.ui" />
153 <UIC Include="src\config\controller_config.ui">
154 <QtUicPrefix>src/config/ui_</QtUicPrefix>
155 </UIC>
156 <UIC Include="src\disasm.ui" />
157 <UIC Include="src\cpu_regs.ui" />
158 <UIC Include="src\hotkeys.ui" />
159 <UIC Include="src\main.ui" />
160 </ItemGroup> 139 </ItemGroup>
161 <ItemGroup> 140 <ItemGroup>
162 <MOC Include="..\..\externals\qhexedit\commands.h" /> 141 <MOC Include="..\..\externals\qhexedit\commands.h" />
163 <MOC Include="..\..\externals\qhexedit\qhexedit.h" /> 142 <MOC Include="..\..\externals\qhexedit\qhexedit.h" />
164 <MOC Include="..\..\externals\qhexedit\qhexedit_p.h" /> 143 <MOC Include="..\..\externals\qhexedit\qhexedit_p.h" />
165 <MOC Include="..\..\externals\qhexedit\xbytearray.h" /> 144 <MOC Include="..\..\externals\qhexedit\xbytearray.h" />
166 <ClInclude Include="src\version.h" />
167 </ItemGroup> 145 </ItemGroup>
168 <ItemGroup> 146 <ItemGroup>
169 <ProjectReference Include="..\common\common.vcxproj"> 147 <ProjectReference Include="..\common\common.vcxproj">
@@ -173,6 +151,38 @@
173 <Project>{8aea7f29-3466-4786-a10d-6a4bd0610977}</Project> 151 <Project>{8aea7f29-3466-4786-a10d-6a4bd0610977}</Project>
174 </ProjectReference> 152 </ProjectReference>
175 </ItemGroup> 153 </ItemGroup>
154 <ItemGroup>
155 <ClInclude Include="bootmanager.hxx" />
156 <ClInclude Include="callstack.hxx" />
157 <ClInclude Include="config\controller_config.hxx" />
158 <ClInclude Include="config\controller_config_util.hxx" />
159 <ClInclude Include="config\ui_controller_config.h" />
160 <ClInclude Include="cpu_regs.hxx" />
161 <ClInclude Include="disasm.hxx" />
162 <ClInclude Include="hotkeys.hxx" />
163 <ClInclude Include="main.hxx" />
164 <ClInclude Include="ramview.hxx" />
165 <ClInclude Include="ui_callstack.h" />
166 <ClInclude Include="ui_cpu_regs.h" />
167 <ClInclude Include="ui_disasm.h" />
168 <ClInclude Include="ui_gfx_fifo_player.h" />
169 <ClInclude Include="ui_hotkeys.h" />
170 <ClInclude Include="ui_image_info.h" />
171 <ClInclude Include="ui_main.h" />
172 <ClInclude Include="ui_welcome_wizard.h" />
173 <ClInclude Include="version.h" />
174 </ItemGroup>
175 <ItemGroup>
176 <UIC Include="callstack.ui" />
177 <UIC Include="config\controller_config.ui" />
178 <UIC Include="cpu_regs.ui" />
179 <UIC Include="disasm.ui" />
180 <UIC Include="hotkeys.ui" />
181 <UIC Include="main.ui" />
182 </ItemGroup>
183 <ItemGroup>
184 <Text Include="CMakeLists.txt" />
185 </ItemGroup>
176 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> 186 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
177 <ImportGroup Label="ExtensionTargets"> 187 <ImportGroup Label="ExtensionTargets">
178 <Import Project="qt-build.targets" /> 188 <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 @@
12 </Filter> 12 </Filter>
13 </ItemGroup> 13 </ItemGroup>
14 <ItemGroup> 14 <ItemGroup>
15 <ClCompile Include="src\main.cpp" />
16 <ClCompile Include="src\disasm.cpp">
17 <Filter>debugger</Filter>
18 </ClCompile>
19 <ClCompile Include="src\cpu_regs.cpp">
20 <Filter>debugger</Filter>
21 </ClCompile>
22 <ClCompile Include="src\bootmanager.cpp" />
23 <ClCompile Include="src\callstack.cpp">
24 <Filter>debugger</Filter>
25 </ClCompile>
26 <ClCompile Include="src\ramview.cpp">
27 <Filter>debugger</Filter>
28 </ClCompile>
29 <ClCompile Include="..\..\externals\qhexedit\commands.cpp"> 15 <ClCompile Include="..\..\externals\qhexedit\commands.cpp">
30 <Filter>qhexedit</Filter> 16 <Filter>qhexedit</Filter>
31 </ClCompile> 17 </ClCompile>
@@ -38,22 +24,29 @@
38 <ClCompile Include="..\..\externals\qhexedit\xbytearray.cpp"> 24 <ClCompile Include="..\..\externals\qhexedit\xbytearray.cpp">
39 <Filter>qhexedit</Filter> 25 <Filter>qhexedit</Filter>
40 </ClCompile> 26 </ClCompile>
41 <ClCompile Include="src\hotkeys.cpp" /> 27 <ClCompile Include="bootmanager.cpp" />
42 <ClCompile Include="src\config\controller_config.cpp"> 28 <ClCompile Include="hotkeys.cpp" />
29 <ClCompile Include="main.cpp" />
30 <ClCompile Include="config\controller_config.cpp">
43 <Filter>config</Filter> 31 <Filter>config</Filter>
44 </ClCompile> 32 </ClCompile>
45 <ClCompile Include="src\config\controller_config_util.cpp"> 33 <ClCompile Include="config\controller_config_util.cpp">
46 <Filter>config</Filter> 34 <Filter>config</Filter>
47 </ClCompile> 35 </ClCompile>
48 </ItemGroup> 36 <ClCompile Include="cpu_regs.cpp">
49 <ItemGroup>
50 <MOC Include="src\main.hxx" />
51 <MOC Include="src\cpu_regs.hxx">
52 <Filter>debugger</Filter> 37 <Filter>debugger</Filter>
53 </MOC> 38 </ClCompile>
54 <MOC Include="src\callstack.hxx"> 39 <ClCompile Include="disasm.cpp">
55 <Filter>debugger</Filter> 40 <Filter>debugger</Filter>
56 </MOC> 41 </ClCompile>
42 <ClCompile Include="ramview.cpp">
43 <Filter>debugger</Filter>
44 </ClCompile>
45 <ClCompile Include="callstack.cpp">
46 <Filter>debugger</Filter>
47 </ClCompile>
48 </ItemGroup>
49 <ItemGroup>
57 <MOC Include="..\..\externals\qhexedit\commands.h"> 50 <MOC Include="..\..\externals\qhexedit\commands.h">
58 <Filter>qhexedit</Filter> 51 <Filter>qhexedit</Filter>
59 </MOC> 52 </MOC>
@@ -66,38 +59,67 @@
66 <MOC Include="..\..\externals\qhexedit\qhexedit.h"> 59 <MOC Include="..\..\externals\qhexedit\qhexedit.h">
67 <Filter>qhexedit</Filter> 60 <Filter>qhexedit</Filter>
68 </MOC> 61 </MOC>
69 <MOC Include="src\ramview.hxx"> 62 </ItemGroup>
70 <Filter>debugger</Filter> 63 <ItemGroup>
71 </MOC> 64 <ClInclude Include="bootmanager.hxx" />
72 <MOC Include="src\disasm.hxx"> 65 <ClInclude Include="hotkeys.hxx" />
73 <Filter>debugger</Filter> 66 <ClInclude Include="main.hxx" />
74 </MOC> 67 <ClInclude Include="ui_hotkeys.h" />
75 <MOC Include="src\bootmanager.hxx" /> 68 <ClInclude Include="ui_image_info.h" />
76 <MOC Include="src\hotkeys.hxx" /> 69 <ClInclude Include="ui_main.h" />
77 <MOC Include="src\config\controller_config.hxx"> 70 <ClInclude Include="ui_welcome_wizard.h" />
71 <ClInclude Include="version.h" />
72 <ClInclude Include="config\controller_config.hxx">
78 <Filter>config</Filter> 73 <Filter>config</Filter>
79 </MOC> 74 </ClInclude>
80 <MOC Include="src\config\controller_config_util.hxx"> 75 <ClInclude Include="config\controller_config_util.hxx">
81 <Filter>config</Filter> 76 <Filter>config</Filter>
82 </MOC> 77 </ClInclude>
78 <ClInclude Include="config\ui_controller_config.h">
79 <Filter>config</Filter>
80 </ClInclude>
81 <ClInclude Include="cpu_regs.hxx">
82 <Filter>debugger</Filter>
83 </ClInclude>
84 <ClInclude Include="disasm.hxx">
85 <Filter>debugger</Filter>
86 </ClInclude>
87 <ClInclude Include="ramview.hxx">
88 <Filter>debugger</Filter>
89 </ClInclude>
90 <ClInclude Include="ui_callstack.h">
91 <Filter>debugger</Filter>
92 </ClInclude>
93 <ClInclude Include="ui_cpu_regs.h">
94 <Filter>debugger</Filter>
95 </ClInclude>
96 <ClInclude Include="ui_disasm.h">
97 <Filter>debugger</Filter>
98 </ClInclude>
99 <ClInclude Include="ui_gfx_fifo_player.h">
100 <Filter>debugger</Filter>
101 </ClInclude>
102 <ClInclude Include="callstack.hxx">
103 <Filter>debugger</Filter>
104 </ClInclude>
83 </ItemGroup> 105 </ItemGroup>
84 <ItemGroup> 106 <ItemGroup>
85 <UIC Include="src\main.ui" /> 107 <UIC Include="hotkeys.ui" />
86 <UIC Include="src\cpu_regs.ui"> 108 <UIC Include="main.ui" />
87 <Filter>debugger</Filter> 109 <UIC Include="config\controller_config.ui">
110 <Filter>config</Filter>
88 </UIC> 111 </UIC>
89 <UIC Include="src\disasm.ui"> 112 <UIC Include="callstack.ui">
90 <Filter>debugger</Filter> 113 <Filter>debugger</Filter>
91 </UIC> 114 </UIC>
92 <UIC Include="src\callstack.ui"> 115 <UIC Include="cpu_regs.ui">
93 <Filter>debugger</Filter> 116 <Filter>debugger</Filter>
94 </UIC> 117 </UIC>
95 <UIC Include="src\hotkeys.ui" /> 118 <UIC Include="disasm.ui">
96 <UIC Include="src\config\controller_config.ui"> 119 <Filter>debugger</Filter>
97 <Filter>config</Filter>
98 </UIC> 120 </UIC>
99 </ItemGroup> 121 </ItemGroup>
100 <ItemGroup> 122 <ItemGroup>
101 <ClInclude Include="src\version.h" /> 123 <Text Include="CMakeLists.txt" />
102 </ItemGroup> 124 </ItemGroup>
103</Project> \ No newline at end of file 125</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 @@
7 7
8#ifdef _WIN32 8#ifdef _WIN32
9 9
10#include "atomic_win32.h" 10#include "common/atomic_win32.h"
11 11
12#else 12#else
13 13
14// GCC-compatible compiler assumed! 14// GCC-compatible compiler assumed!
15#include "atomic_gcc.h" 15#include "common/atomic_gcc.h"
16 16
17#endif 17#endif
18 18
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 @@
5#ifndef _ATOMIC_GCC_H_ 5#ifndef _ATOMIC_GCC_H_
6#define _ATOMIC_GCC_H_ 6#define _ATOMIC_GCC_H_
7 7
8#include "common.h" 8#include "common/common.h"
9 9
10// Atomic operations are performed in a single step by the CPU. It is 10// Atomic operations are performed in a single step by the CPU. It is
11// impossible for other threads to see the operation "half-done." 11// 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 @@
5#ifndef _ATOMIC_WIN32_H_ 5#ifndef _ATOMIC_WIN32_H_
6#define _ATOMIC_WIN32_H_ 6#define _ATOMIC_WIN32_H_
7 7
8#include "common.h" 8#include "common/common.h"
9#include <intrin.h> 9#include <intrin.h>
10#include <Windows.h> 10#include <Windows.h>
11 11
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 @@
2// Licensed under GPLv2 2// Licensed under GPLv2
3// Refer to the license.txt file included. 3// Refer to the license.txt file included.
4 4
5#include "common.h" 5#include "common/common.h"
6#include "debug_interface.h" 6#include "common/debug_interface.h"
7#include "break_points.h" 7#include "common/break_points.h"
8 8
9#include <sstream> 9#include <sstream>
10#include <algorithm> 10#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 @@
8#include <vector> 8#include <vector>
9#include <string> 9#include <string>
10 10
11#include "common.h" 11#include "common/common.h"
12 12
13class DebugInterface; 13class DebugInterface;
14 14
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 @@
41#endif 41#endif
42#endif 42#endif
43 43
44#include "common.h" 44#include "common/common.h"
45#include "file_util.h" 45#include "common/file_util.h"
46//#include "../ext/snappy/snappy-c.h" 46//#include "../ext/snappy/snappy-c.h"
47 47
48#if defined(IOS) || defined(MACGNUSTD) 48#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:
43}; 43};
44#endif 44#endif
45 45
46#include "log.h" 46#include "common/log.h"
47#include "common_types.h" 47#include "common/common_types.h"
48#include "msg_handler.h" 48#include "common/msg_handler.h"
49#include "common_funcs.h" 49#include "common/common_funcs.h"
50#include "common_paths.h" 50#include "common/common_paths.h"
51#include "platform.h" 51#include "common/platform.h"
52 52
53#ifdef __APPLE__ 53#ifdef __APPLE__
54// The Darwin ABI requires that stack frames be aligned to 16-byte boundaries. 54// 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 @@
147 <Lib /> 147 <Lib />
148 </ItemDefinitionGroup> 148 </ItemDefinitionGroup>
149 <ItemGroup> 149 <ItemGroup>
150 <ClInclude Include="src\atomic.h" /> 150 <Reference Include="System" />
151 <ClInclude Include="src\atomic_gcc.h" /> 151 <Reference Include="System.Data" />
152 <ClInclude Include="src\atomic_win32.h" /> 152 <Reference Include="System.Drawing" />
153 <ClInclude Include="src\break_points.h" /> 153 <Reference Include="System.Windows.Forms" />
154 <ClInclude Include="src\chunk_file.h" /> 154 <Reference Include="System.Xml" />
155 <ClInclude Include="src\common.h" />
156 <ClInclude Include="src\common_funcs.h" />
157 <ClInclude Include="src\common_paths.h" />
158 <ClInclude Include="src\common_types.h" />
159 <ClInclude Include="src\console_listener.h" />
160 <ClInclude Include="src\cpu_detect.h" />
161 <ClInclude Include="src\debug_interface.h" />
162 <ClInclude Include="src\emu_window.h" />
163 <ClInclude Include="src\extended_trace.h" />
164 <ClInclude Include="src\fifo_queue.h" />
165 <ClInclude Include="src\file_search.h" />
166 <ClInclude Include="src\file_util.h" />
167 <ClInclude Include="src\fixed_size_queue.h" />
168 <ClInclude Include="src\hash.h" />
169 <ClInclude Include="src\linear_disk_cache.h" />
170 <ClInclude Include="src\log.h" />
171 <ClInclude Include="src\log_manager.h" />
172 <ClInclude Include="src\math_util.h" />
173 <ClInclude Include="src\memory_util.h" />
174 <ClInclude Include="src\mem_arena.h" />
175 <ClInclude Include="src\msg_handler.h" />
176 <ClInclude Include="src\platform.h" />
177 <ClInclude Include="src\scm_rev.h" />
178 <ClInclude Include="src\std_condition_variable.h" />
179 <ClInclude Include="src\std_mutex.h" />
180 <ClInclude Include="src\std_thread.h" />
181 <ClInclude Include="src\string_util.h" />
182 <ClInclude Include="src\swap.h" />
183 <ClInclude Include="src\thread.h" />
184 <ClInclude Include="src\thunk.h" />
185 <ClInclude Include="src\timer.h" />
186 <ClInclude Include="src\utf8.h" />
187 </ItemGroup> 155 </ItemGroup>
188 <ItemGroup> 156 <ItemGroup>
189 <ClCompile Include="src\break_points.cpp" /> 157 <ClInclude Include="atomic.h" />
190 <ClCompile Include="src\console_listener.cpp" /> 158 <ClInclude Include="atomic_gcc.h" />
191 <ClCompile Include="src\extended_trace.cpp" /> 159 <ClInclude Include="atomic_win32.h" />
192 <ClCompile Include="src\file_search.cpp" /> 160 <ClInclude Include="break_points.h" />
193 <ClCompile Include="src\file_util.cpp" /> 161 <ClInclude Include="chunk_file.h" />
194 <ClCompile Include="src\hash.cpp" /> 162 <ClInclude Include="common.h" />
195 <ClCompile Include="src\log_manager.cpp" /> 163 <ClInclude Include="common_funcs.h" />
196 <ClCompile Include="src\math_util.cpp" /> 164 <ClInclude Include="common_paths.h" />
197 <ClCompile Include="src\memory_util.cpp" /> 165 <ClInclude Include="common_types.h" />
198 <ClCompile Include="src\mem_arena.cpp" /> 166 <ClInclude Include="console_listener.h" />
199 <ClCompile Include="src\misc.cpp" /> 167 <ClInclude Include="cpu_detect.h" />
200 <ClCompile Include="src\msg_handler.cpp" /> 168 <ClInclude Include="debug_interface.h" />
201 <ClCompile Include="src\string_util.cpp" /> 169 <ClInclude Include="emu_window.h" />
202 <ClCompile Include="src\thread.cpp" /> 170 <ClInclude Include="extended_trace.h" />
203 <ClCompile Include="src\timer.cpp" /> 171 <ClInclude Include="fifo_queue.h" />
204 <ClCompile Include="src\utf8.cpp" /> 172 <ClInclude Include="file_search.h" />
205 <ClCompile Include="src\version.cpp" /> 173 <ClInclude Include="file_util.h" />
174 <ClInclude Include="fixed_size_queue.h" />
175 <ClInclude Include="hash.h" />
176 <ClInclude Include="linear_disk_cache.h" />
177 <ClInclude Include="log.h" />
178 <ClInclude Include="log_manager.h" />
179 <ClInclude Include="math_util.h" />
180 <ClInclude Include="memory_util.h" />
181 <ClInclude Include="mem_arena.h" />
182 <ClInclude Include="msg_handler.h" />
183 <ClInclude Include="platform.h" />
184 <ClInclude Include="std_condition_variable.h" />
185 <ClInclude Include="std_mutex.h" />
186 <ClInclude Include="std_thread.h" />
187 <ClInclude Include="string_util.h" />
188 <ClInclude Include="swap.h" />
189 <ClInclude Include="thread.h" />
190 <ClInclude Include="thunk.h" />
191 <ClInclude Include="timer.h" />
192 <ClInclude Include="utf8.h" />
206 </ItemGroup> 193 </ItemGroup>
207 <ItemGroup> 194 <ItemGroup>
208 <None Include="CMakeLists.txt" /> 195 <ClCompile Include="break_points.cpp" />
196 <ClCompile Include="console_listener.cpp" />
197 <ClCompile Include="extended_trace.cpp" />
198 <ClCompile Include="file_search.cpp" />
199 <ClCompile Include="file_util.cpp" />
200 <ClCompile Include="hash.cpp" />
201 <ClCompile Include="log_manager.cpp" />
202 <ClCompile Include="math_util.cpp" />
203 <ClCompile Include="memory_util.cpp" />
204 <ClCompile Include="mem_arena.cpp" />
205 <ClCompile Include="misc.cpp" />
206 <ClCompile Include="msg_handler.cpp" />
207 <ClCompile Include="string_util.cpp" />
208 <ClCompile Include="thread.cpp" />
209 <ClCompile Include="timer.cpp" />
210 <ClCompile Include="utf8.cpp" />
211 <ClCompile Include="version.cpp" />
209 </ItemGroup> 212 </ItemGroup>
210 <ItemGroup> 213 <ItemGroup>
211 <Reference Include="System" /> 214 <Text Include="CMakeLists.txt" />
212 <Reference Include="System.Data" />
213 <Reference Include="System.Drawing" />
214 <Reference Include="System.Windows.Forms" />
215 <Reference Include="System.Xml" />
216 </ItemGroup> 215 </ItemGroup>
217 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> 216 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
218 <ImportGroup Label="ExtensionTargets"> 217 <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 @@
1<?xml version="1.0" encoding="utf-8"?> 1<?xml version="1.0" encoding="utf-8"?>
2<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 2<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3 <ItemGroup> 3 <ItemGroup>
4 <ClCompile Include="src\break_points.cpp" /> 4 <ClInclude Include="atomic.h" />
5 <ClCompile Include="src\console_listener.cpp" /> 5 <ClInclude Include="atomic_gcc.h" />
6 <ClCompile Include="src\extended_trace.cpp" /> 6 <ClInclude Include="atomic_win32.h" />
7 <ClCompile Include="src\file_search.cpp" /> 7 <ClInclude Include="break_points.h" />
8 <ClCompile Include="src\file_util.cpp" /> 8 <ClInclude Include="chunk_file.h" />
9 <ClCompile Include="src\hash.cpp" /> 9 <ClInclude Include="common.h" />
10 <ClCompile Include="src\log_manager.cpp" /> 10 <ClInclude Include="common_funcs.h" />
11 <ClCompile Include="src\math_util.cpp" /> 11 <ClInclude Include="common_paths.h" />
12 <ClCompile Include="src\memory_util.cpp" /> 12 <ClInclude Include="common_types.h" />
13 <ClCompile Include="src\mem_arena.cpp" /> 13 <ClInclude Include="console_listener.h" />
14 <ClCompile Include="src\misc.cpp" /> 14 <ClInclude Include="cpu_detect.h" />
15 <ClCompile Include="src\msg_handler.cpp" /> 15 <ClInclude Include="debug_interface.h" />
16 <ClCompile Include="src\string_util.cpp" /> 16 <ClInclude Include="emu_window.h" />
17 <ClCompile Include="src\thread.cpp" /> 17 <ClInclude Include="extended_trace.h" />
18 <ClCompile Include="src\timer.cpp" /> 18 <ClInclude Include="fifo_queue.h" />
19 <ClCompile Include="src\version.cpp" /> 19 <ClInclude Include="file_search.h" />
20 <ClCompile Include="src\utf8.cpp" /> 20 <ClInclude Include="file_util.h" />
21 <ClInclude Include="fixed_size_queue.h" />
22 <ClInclude Include="hash.h" />
23 <ClInclude Include="linear_disk_cache.h" />
24 <ClInclude Include="log.h" />
25 <ClInclude Include="log_manager.h" />
26 <ClInclude Include="math_util.h" />
27 <ClInclude Include="mem_arena.h" />
28 <ClInclude Include="memory_util.h" />
29 <ClInclude Include="msg_handler.h" />
30 <ClInclude Include="platform.h" />
31 <ClInclude Include="std_condition_variable.h" />
32 <ClInclude Include="std_mutex.h" />
33 <ClInclude Include="std_thread.h" />
34 <ClInclude Include="string_util.h" />
35 <ClInclude Include="swap.h" />
36 <ClInclude Include="thread.h" />
37 <ClInclude Include="thunk.h" />
38 <ClInclude Include="timer.h" />
39 <ClInclude Include="utf8.h" />
21 </ItemGroup> 40 </ItemGroup>
22 <ItemGroup> 41 <ItemGroup>
23 <ClInclude Include="src\atomic.h" /> 42 <ClCompile Include="break_points.cpp" />
24 <ClInclude Include="src\break_points.h" /> 43 <ClCompile Include="console_listener.cpp" />
25 <ClInclude Include="src\chunk_file.h" /> 44 <ClCompile Include="extended_trace.cpp" />
26 <ClInclude Include="src\common.h" /> 45 <ClCompile Include="file_search.cpp" />
27 <ClInclude Include="src\common_funcs.h" /> 46 <ClCompile Include="file_util.cpp" />
28 <ClInclude Include="src\common_paths.h" /> 47 <ClCompile Include="hash.cpp" />
29 <ClInclude Include="src\common_types.h" /> 48 <ClCompile Include="log_manager.cpp" />
30 <ClInclude Include="src\console_listener.h" /> 49 <ClCompile Include="math_util.cpp" />
31 <ClInclude Include="src\cpu_detect.h" /> 50 <ClCompile Include="mem_arena.cpp" />
32 <ClInclude Include="src\debug_interface.h" /> 51 <ClCompile Include="memory_util.cpp" />
33 <ClInclude Include="src\extended_trace.h" /> 52 <ClCompile Include="misc.cpp" />
34 <ClInclude Include="src\fifo_queue.h" /> 53 <ClCompile Include="msg_handler.cpp" />
35 <ClInclude Include="src\file_search.h" /> 54 <ClCompile Include="string_util.cpp" />
36 <ClInclude Include="src\file_util.h" /> 55 <ClCompile Include="thread.cpp" />
37 <ClInclude Include="src\fixed_size_queue.h" /> 56 <ClCompile Include="timer.cpp" />
38 <ClInclude Include="src\hash.h" /> 57 <ClCompile Include="utf8.cpp" />
39 <ClInclude Include="src\linear_disk_cache.h" /> 58 <ClCompile Include="version.cpp" />
40 <ClInclude Include="src\log.h" />
41 <ClInclude Include="src\log_manager.h" />
42 <ClInclude Include="src\math_util.h" />
43 <ClInclude Include="src\memory_util.h" />
44 <ClInclude Include="src\mem_arena.h" />
45 <ClInclude Include="src\msg_handler.h" />
46 <ClInclude Include="src\scm_rev.h" />
47 <ClInclude Include="src\std_condition_variable.h" />
48 <ClInclude Include="src\std_mutex.h" />
49 <ClInclude Include="src\std_thread.h" />
50 <ClInclude Include="src\string_util.h" />
51 <ClInclude Include="src\thread.h" />
52 <ClInclude Include="src\thunk.h" />
53 <ClInclude Include="src\timer.h" />
54 <ClInclude Include="src\atomic_gcc.h" />
55 <ClInclude Include="src\atomic_win32.h" />
56 <ClInclude Include="src\emu_window.h" />
57 <ClInclude Include="src\platform.h" />
58 <ClInclude Include="src\swap.h" />
59 <ClInclude Include="src\utf8.h" />
60 </ItemGroup> 59 </ItemGroup>
61 <ItemGroup> 60 <ItemGroup>
62 <None Include="CMakeLists.txt" /> 61 <Text Include="CMakeLists.txt" />
63 </ItemGroup> 62 </ItemGroup>
64</Project> \ No newline at end of file 63</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 @@
6#define _COMMON_PATHS_H_ 6#define _COMMON_PATHS_H_
7 7
8// Make sure we pick up USER_DIR if set in config.h 8// Make sure we pick up USER_DIR if set in config.h
9#include "common.h" 9#include "common/common.h"
10 10
11// Directory seperators, do we need this? 11// Directory seperators, do we need this?
12#define DIR_SEP "/" 12#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
62typedef float f32; ///< 32-bit floating point 62typedef float f32; ///< 32-bit floating point
63typedef double f64; ///< 64-bit floating point 63typedef double f64; ///< 64-bit floating point
64 64
65#include "swap.h" 65#include "common/swap.h"
66 66
67/// Union for fast 16-bit type casting 67/// Union for fast 16-bit type casting
68union t16 { 68union 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 @@
13#include <stdarg.h> 13#include <stdarg.h>
14#endif 14#endif
15 15
16#include "common.h" 16#include "common/common.h"
17#include "log_manager.h" // Common 17#include "common/log_manager.h" // Common
18#include "console_listener.h" // Common 18#include "common/console_listener.h" // Common
19 19
20ConsoleListener::ConsoleListener() 20ConsoleListener::ConsoleListener()
21{ 21{
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 @@
5#ifndef _CONSOLELISTENER_H 5#ifndef _CONSOLELISTENER_H
6#define _CONSOLELISTENER_H 6#define _CONSOLELISTENER_H
7 7
8#include "log_manager.h" 8#include "common/log_manager.h"
9 9
10#ifdef _WIN32 10#ifdef _WIN32
11#include <windows.h> 11#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 @@
25#ifndef CORE_EMUWINDOW_H_ 25#ifndef CORE_EMUWINDOW_H_
26#define CORE_EMUWINDOW_H_ 26#define CORE_EMUWINDOW_H_
27 27
28#include "common.h" 28#include "common/common.h"
29 29
30//namespace input_common 30//namespace input_common
31//{ 31//{
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 @@
16 16
17#include <windows.h> 17#include <windows.h>
18#include <stdio.h> 18#include <stdio.h>
19#include "extended_trace.h" 19#include "common/extended_trace.h"
20#include "string_util.h" 20#include "common/string_util.h"
21using namespace std; 21using namespace std;
22 22
23#include <tchar.h> 23#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 @@
5// a simple lockless thread-safe, 5// a simple lockless thread-safe,
6// single reader, single writer queue 6// single reader, single writer queue
7 7
8#include "atomic.h" 8#include "common/atomic.h"
9 9
10namespace Common 10namespace Common
11{ 11{
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 @@
3// Refer to the license.txt file included. 3// Refer to the license.txt file included.
4 4
5 5
6#include "common.h" 6#include "common/common.h"
7#include "common_paths.h" 7#include "common/common_paths.h"
8#ifndef _WIN32 8#ifndef _WIN32
9#include <sys/types.h> 9#include <sys/types.h>
10#include <dirent.h> 10#include <dirent.h>
@@ -15,9 +15,8 @@
15#include <string> 15#include <string>
16#include <algorithm> 16#include <algorithm>
17 17
18#include "file_search.h" 18#include "common/file_search.h"
19 19#include "common/string_util.h"
20#include "string_util.h"
21 20
22 21
23CFileSearch::CFileSearch(const CFileSearch::XStringVector& _rSearchStrings, const CFileSearch::XStringVector& _rDirectories) 22CFileSearch::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 @@
3// Refer to the license.txt file included. 3// Refer to the license.txt file included.
4 4
5 5
6#include "common.h" 6#include "common/common.h"
7#include "common_paths.h" 7#include "common/common_paths.h"
8#include "file_util.h" 8#include "common/file_util.h"
9#include "string_util.h" 9#include "common/string_util.h"
10 10
11#ifdef _WIN32 11#ifdef _WIN32
12#include <windows.h> 12#include <windows.h>
@@ -32,7 +32,7 @@
32#include <algorithm> 32#include <algorithm>
33#include <sys/stat.h> 33#include <sys/stat.h>
34 34
35#include "string_util.h" 35#include "common/string_util.h"
36 36
37#ifndef S_ISDIR 37#ifndef S_ISDIR
38#define S_ISDIR(m) (((m)&S_IFMT) == S_IFDIR) 38#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 @@
12#include <vector> 12#include <vector>
13#include <string.h> 13#include <string.h>
14 14
15#include "common.h" 15#include "common/common.h"
16#include "string_util.h" 16#include "common/string_util.h"
17 17
18// User directory indices for GetUserPath 18// User directory indices for GetUserPath
19enum { 19enum {
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 @@
3// Refer to the license.txt file included. 3// Refer to the license.txt file included.
4 4
5 5
6#include "hash.h" 6#include "common/hash.h"
7#if _M_SSE >= 0x402 7#if _M_SSE >= 0x402
8#include "cpu_detect.h" 8#include "common/cpu_detect.h"
9#include <nmmintrin.h> 9#include <nmmintrin.h>
10#endif 10#endif
11 11
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 @@
6#ifndef _HASH_H_ 6#ifndef _HASH_H_
7#define _HASH_H_ 7#define _HASH_H_
8 8
9#include "common.h" 9#include "common/common.h"
10 10
11u32 HashFletcher(const u8* data_u8, size_t length); // FAST. Length & 1 == 0. 11u32 HashFletcher(const u8* data_u8, size_t length); // FAST. Length & 1 == 0.
12u32 HashAdler32(const u8* data, size_t len); // Fairly accurate, slightly slower 12u32 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 @@
6#ifndef _LINEAR_DISKCACHE 6#ifndef _LINEAR_DISKCACHE
7#define _LINEAR_DISKCACHE 7#define _LINEAR_DISKCACHE
8 8
9#include "common.h" 9#include "common/common.h"
10#include <fstream> 10#include <fstream>
11 11
12// defined in Version.cpp 12// 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 @@
4 4
5#include <algorithm> 5#include <algorithm>
6 6
7#ifdef ANDROID 7#include "common/log_manager.h"
8#include "Host.h" 8#include "common/console_listener.h"
9#endif 9#include "common/timer.h"
10#include "log_manager.h" 10#include "common/thread.h"
11#include "console_listener.h" 11#include "common/file_util.h"
12#include "timer.h"
13#include "thread.h"
14#include "file_util.h"
15 12
16void GenericLog(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type, 13void GenericLog(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type,
17 const char *file, int line, const char* fmt, ...) 14 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 @@
5#ifndef _LOGMANAGER_H_ 5#ifndef _LOGMANAGER_H_
6#define _LOGMANAGER_H_ 6#define _LOGMANAGER_H_
7 7
8#include "log.h" 8#include "common/log.h"
9#include "string_util.h" 9#include "common/string_util.h"
10#include "thread.h" 10#include "common/thread.h"
11#include "file_util.h" 11#include "common/file_util.h"
12 12
13#include <set> 13#include <set>
14#include <string.h> 14#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 @@
3// Refer to the license.txt file included. 3// Refer to the license.txt file included.
4 4
5 5
6#include "common.h" 6#include "common/common.h"
7#include "math_util.h" 7#include "common/math_util.h"
8 8
9#include <cmath> 9#include <cmath>
10#include <numeric> 10#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 @@
6#ifndef _MATH_UTIL_H_ 6#ifndef _MATH_UTIL_H_
7#define _MATH_UTIL_H_ 7#define _MATH_UTIL_H_
8 8
9#include "common.h" 9#include "common/common.h"
10 10
11#include <vector> 11#include <vector>
12 12
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 @@
17 17
18#include <string> 18#include <string>
19 19
20#include "memory_util.h" 20#include "common/memory_util.h"
21#include "mem_arena.h" 21#include "common/mem_arena.h"
22 22
23#ifdef _WIN32 23#ifndef _WIN32
24//#include "CommonWindows.h"
25#else
26#include <sys/stat.h> 24#include <sys/stat.h>
27#include <fcntl.h> 25#include <fcntl.h>
28#include <unistd.h> 26#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 @@
26#include <e32std.h> 26#include <e32std.h>
27#endif 27#endif
28 28
29#include "common.h" 29#include "common/common.h"
30 30
31// This class lets you create a block of anonymous RAM, and then arbitrarily map views into it. 31// This class lets you create a block of anonymous RAM, and then arbitrarily map views into it.
32// Multiple views can mirror the same section of the block, which makes it very convient for emulating 32// 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 @@
3// Refer to the license.txt file included. 3// Refer to the license.txt file included.
4 4
5 5
6#include "common.h" 6#include "common/common.h"
7#include "memory_util.h" 7#include "common/memory_util.h"
8#include "string_util.h" 8#include "common/string_util.h"
9 9
10#ifdef _WIN32 10#ifdef _WIN32
11#include <windows.h> 11#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 @@
2// Licensed under GPLv2 2// Licensed under GPLv2
3// Refer to the license.txt file included. 3// Refer to the license.txt file included.
4 4
5#include "common.h" 5#include "common/common.h"
6 6
7#ifdef _WIN32 7#ifdef _WIN32
8#include <windows.h> 8#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 @@
4 4
5#include <stdio.h> // System 5#include <stdio.h> // System
6 6
7#include "common.h" // Local 7#include "common/common.h" // Local
8#include "string_util.h" 8#include "common/string_util.h"
9 9
10bool DefaultMsgHandler(const char* caption, const char* text, bool yes_no, int Style); 10bool DefaultMsgHandler(const char* caption, const char* text, bool yes_no, int Style);
11static MsgAlertHandler msg_handler = DefaultMsgHandler; 11static 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 @@
25#ifndef COMMON_PLATFORM_H_ 25#ifndef COMMON_PLATFORM_H_
26#define COMMON_PLATFORM_H_ 26#define COMMON_PLATFORM_H_
27 27
28#include "common_types.h" 28#include "common/common_types.h"
29 29
30//////////////////////////////////////////////////////////////////////////////////////////////////// 30////////////////////////////////////////////////////////////////////////////////////////////////////
31// Platform definitions 31// 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 @@
19 </ProjectConfiguration> 19 </ProjectConfiguration>
20 </ItemGroup> 20 </ItemGroup>
21 <ItemGroup> 21 <ItemGroup>
22 <None Include="scm_rev_gen.js"> 22 <ClInclude Include="force_rebuild.h" />
23 </None> 23 <ClInclude Include="scm_rev.h" />
24 </ItemGroup> 24 </ItemGroup>
25 <ItemGroup> 25 <ItemGroup>
26 <ClInclude Include="force_rebuild.h" /> 26 <None Include="scm_rev_gen.js" />
27 <ClInclude Include="src\scm_rev.h" />
28 </ItemGroup> 27 </ItemGroup>
29 <PropertyGroup Label="Globals"> 28 <PropertyGroup Label="Globals">
30 <ProjectGuid>{69F00340-5C3D-449F-9A80-958435C6CF06}</ProjectGuid> 29 <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 @@
29 29
30// partial std::condition_variable implementation for win32/pthread 30// partial std::condition_variable implementation for win32/pthread
31 31
32#include "std_mutex.h" 32#include "common/std_mutex.h"
33 33
34#if (_MSC_VER >= 1600) || (GCC_VERSION >= GCC_VER(4,3,0) && __GXX_EXPERIMENTAL_CXX0X__) 34#if (_MSC_VER >= 1600) || (GCC_VERSION >= GCC_VER(4,3,0) && __GXX_EXPERIMENTAL_CXX0X__)
35#define USE_RVALUE_REFERENCES 35#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 @@
6#include <stdio.h> 6#include <stdio.h>
7#include <algorithm> 7#include <algorithm>
8 8
9#include "common.h" 9#include "common/common.h"
10#include "common_paths.h" 10#include "common/common_paths.h"
11#include "string_util.h" 11#include "common/string_util.h"
12 12
13#ifdef _WIN32 13#ifdef _WIN32
14 #include <Windows.h> 14 #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 @@
12#include <sstream> 12#include <sstream>
13#include <iomanip> 13#include <iomanip>
14 14
15#include "common.h" 15#include "common/common.h"
16 16
17std::string StringFromFormat(const char* format, ...); 17std::string StringFromFormat(const char* format, ...);
18// Cheap! 18// 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 @@
2// Licensed under GPLv2 2// Licensed under GPLv2
3// Refer to the license.txt file included. 3// Refer to the license.txt file included.
4 4
5#include "thread.h" 5#include "common/thread.h"
6#include "common.h" 6#include "common/common.h"
7 7
8#ifdef __APPLE__ 8#ifdef __APPLE__
9#include <mach/mach.h> 9#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 @@
5#ifndef _THREAD_H_ 5#ifndef _THREAD_H_
6#define _THREAD_H_ 6#define _THREAD_H_
7 7
8#include "std_condition_variable.h" 8#include "common/std_condition_variable.h"
9#include "std_mutex.h" 9#include "common/std_mutex.h"
10#include "std_thread.h" 10#include "common/std_thread.h"
11 11
12// Don't include common.h here as it will break LogManager 12// Don't include common.h here as it will break LogManager
13#include "common_types.h" 13#include "common/common_types.h"
14#include <stdio.h> 14#include <stdio.h>
15#include <string.h> 15#include <string.h>
16 16
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 @@
7 7
8#include <map> 8#include <map>
9 9
10#include "common.h" 10#include "common/common.h"
11#include "x64Emitter.h"
12 11
13// This simple class creates a wrapper around a C/C++ function that saves all fp state 12// This simple class creates a wrapper around a C/C++ function that saves all fp state
14// before entering it, and restores it upon exit. This is required to be able to selectively 13// 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 @@
12#include <sys/time.h> 12#include <sys/time.h>
13#endif 13#endif
14 14
15#include "common.h" 15#include "common/common.h"
16#include "timer.h" 16#include "common/timer.h"
17#include "string_util.h" 17#include "common/string_util.h"
18 18
19namespace Common 19namespace Common
20{ 20{
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 @@
5#ifndef _TIMER_H_ 5#ifndef _TIMER_H_
6#define _TIMER_H_ 6#define _TIMER_H_
7 7
8#include "common.h" 8#include "common/common.h"
9#include <string> 9#include <string>
10 10
11namespace Common 11namespace 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 @@
26#include <algorithm> 26#include <algorithm>
27#include <string> 27#include <string>
28 28
29#include "common_types.h" 29#include "common/common_types.h"
30#include "utf8.h" 30#include "common/utf8.h"
31 31
32// is start of UTF sequence 32// is start of UTF sequence
33inline bool isutf(char c) { 33inline 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 @@
16 16
17#pragma once 17#pragma once
18 18
19#include "common_types.h" 19#include "common/common_types.h"
20#include <string> 20#include <string>
21 21
22u32 u8_nextchar(const char *s, int *i); 22u32 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 @@
2// Licensed under GPLv2 2// Licensed under GPLv2
3// Refer to the license.txt file included. 3// Refer to the license.txt file included.
4 4
5#include "common.h" 5#include "common/common.h"
6#include "scm_rev.h" 6#include "common/scm_rev.h"
7 7
8#ifdef _DEBUG 8#ifdef _DEBUG
9 #define BUILD_TYPE_STR "Debug " 9 #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 @@
4 4
5#pragma once 5#pragma once
6 6
7#include "common.h" 7#include "common/common.h"
8#include "common_types.h" 8#include "common/common_types.h"
9 9
10/// Generic ARM11 CPU interface 10/// Generic ARM11 CPU interface
11class ARM_Interface { 11class 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 @@
2 2
3#include <stdio.h> 3#include <stdio.h>
4#include <string.h> 4#include <string.h>
5#include "arm_disasm.h" 5
6#include "core/arm/disassembler/arm_disasm.h"
6 7
7static const char *cond_names[] = { 8static const char *cond_names[] = {
8 "eq", 9 "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 @@
24 24
25#pragma once 25#pragma once
26 26
27#include "common.h" 27#include "common/common.h"
28#include "common_types.h"
29#include "arm/arm_interface.h"
30 28
31#include "arm/interpreter/armdefs.h" 29#include "core/arm/arm_interface.h"
32#include "arm/interpreter/armemu.h" 30#include "core/arm/interpreter/armdefs.h"
31#include "core/arm/interpreter/armemu.h"
33 32
34class ARM_Interpreter : virtual public ARM_Interface { 33class ARM_Interpreter : virtual public ARM_Interface {
35public: 34public:
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 @@
28#include <stddef.h> 28#include <stddef.h>
29#include <stdio.h> 29#include <stdio.h>
30 30
31#include "thread.h" 31#include "common/thread.h"
32 32
33 33
34typedef struct ARM_CPU_State_s { 34typedef 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 @@
32//#include "portable/mman.h" 32//#include "portable/mman.h"
33 33
34#include "arm_regformat.h" 34#include "arm_regformat.h"
35#include "platform.h" 35#include "common/platform.h"
36#include "skyeye_defs.h" 36#include "skyeye_defs.h"
37 37
38//AJ2D-------------------------------------------------------------------------- 38//AJ2D--------------------------------------------------------------------------
@@ -82,7 +82,7 @@
82//teawater add DBCT_TEST_SPEED 2005.10.04--------------------------------------- 82//teawater add DBCT_TEST_SPEED 2005.10.04---------------------------------------
83#include <signal.h> 83#include <signal.h>
84 84
85#include "platform.h" 85#include "common/platform.h"
86 86
87#if EMU_PLATFORM == PLATFORM_LINUX 87#if EMU_PLATFORM == PLATFORM_LINUX
88#include <sys/time.h> 88#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 @@
17#ifndef __ARMEMU_H__ 17#ifndef __ARMEMU_H__
18#define __ARMEMU_H__ 18#define __ARMEMU_H__
19 19
20#include "common.h" 20#include "common/common.h"
21#include "armdefs.h" 21#include "armdefs.h"
22//#include "skyeye.h" 22//#include "skyeye.h"
23 23
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 @@
16 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ 16 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
17 17
18 18
19#include "platform.h" 19#include "common/platform.h"
20#if EMU_PLATFORM == PLATFORM_LINUX 20#if EMU_PLATFORM == PLATFORM_LINUX
21#include <unistd.h> 21#include <unistd.h>
22#endif 22#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
172} mmu_ops_t; 172} mmu_ops_t;
173 173
174 174
175#include "arm/mmu/tlb.h" 175#include "core/arm/mmu/tlb.h"
176#include "arm/mmu/rb.h" 176#include "core/arm/mmu/rb.h"
177#include "arm/mmu/wb.h" 177#include "core/arm/mmu/wb.h"
178#include "arm/mmu/cache.h" 178#include "core/arm/mmu/cache.h"
179 179
180/*special process mmu.h*/ 180/*special process mmu.h*/
181//#include "arm/mmu/sa_mmu.h" 181//#include "core/arm/mmu/sa_mmu.h"
182//#include "arm/mmu/arm7100_mmu.h" 182//#include "core/arm/mmu/arm7100_mmu.h"
183//#include "arm/mmu/arm920t_mmu.h" 183//#include "core/arm/mmu/arm920t_mmu.h"
184//#include "arm/mmu/arm926ejs_mmu.h" 184//#include "core/arm/mmu/arm926ejs_mmu.h"
185#include "arm/mmu/arm1176jzf_s_mmu.h" 185#include "core/arm/mmu/arm1176jzf_s_mmu.h"
186//#include "arm/mmu/cortex_a9_mmu.h" 186//#include "core/arm/mmu/cortex_a9_mmu.h"
187 187
188typedef struct mmu_state_t 188typedef struct mmu_state_t
189{ 189{
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 @@
1#ifndef CORE_ARM_SKYEYE_DEFS_H_ 1#ifndef CORE_ARM_SKYEYE_DEFS_H_
2#define CORE_ARM_SKYEYE_DEFS_H_ 2#define CORE_ARM_SKYEYE_DEFS_H_
3 3
4#include "common.h" 4#include "common/common.h"
5 5
6#define MODE32 6#define MODE32
7#define MODET 7#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 @@
22#include <string.h> 22#include <string.h>
23#include <stdint.h> 23#include <stdint.h>
24 24
25#include "mem_map.h" 25#include "core/mem_map.h"
26 26
27#include "arm/interpreter/skyeye_defs.h" 27#include "core/arm/interpreter/skyeye_defs.h"
28 28
29#include "arm/interpreter/armdefs.h" 29#include "core/arm/interpreter/armdefs.h"
30//#include "bank_defs.h" 30//#include "bank_defs.h"
31#if 0 31#if 0
32#define TLB_SIZE 1024 * 1024 32#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 @@
2// Licensed under GPLv2 2// Licensed under GPLv2
3// Refer to the license.txt file included. 3// Refer to the license.txt file included.
4 4
5#include "log.h" 5#include "common/common_types.h"
6#include "core.h" 6#include "common/log.h"
7#include "mem_map.h" 7#include "core/core.h"
8#include "hw/hw.h" 8
9#include "arm/disassembler/arm_disasm.h" 9#include "core/mem_map.h"
10#include "arm/interpreter/arm_interpreter.h" 10#include "core/hw/hw.h"
11#include "core/arm/disassembler/arm_disasm.h"
12#include "core/arm/interpreter/arm_interpreter.h"
11 13
12namespace Core { 14namespace Core {
13 15
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 @@
4 4
5#pragma once 5#pragma once
6 6
7#include "arm/arm_interface.h" 7#include "core/arm/arm_interface.h"
8#include "arm/interpreter/armdefs.h" 8#include "core/arm/interpreter/armdefs.h"
9 9
10//////////////////////////////////////////////////////////////////////////////////////////////////// 10////////////////////////////////////////////////////////////////////////////////////////////////////
11 11
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 @@
137 </ProjectReference> 137 </ProjectReference>
138 </ItemGroup> 138 </ItemGroup>
139 <ItemGroup> 139 <ItemGroup>
140 <ClCompile Include="src\arm\disassembler\arm_disasm.cpp" /> 140 <ClCompile Include="arm\disassembler\arm_disasm.cpp" />
141 <ClCompile Include="src\arm\interpreter\armemu.cpp" /> 141 <ClCompile Include="arm\interpreter\armemu.cpp" />
142 <ClCompile Include="src\arm\interpreter\arminit.cpp" /> 142 <ClCompile Include="arm\interpreter\arminit.cpp" />
143 <ClCompile Include="src\arm\interpreter\armmmu.cpp" /> 143 <ClCompile Include="arm\interpreter\armmmu.cpp" />
144 <ClCompile Include="src\arm\interpreter\armos.cpp" /> 144 <ClCompile Include="arm\interpreter\armos.cpp" />
145 <ClCompile Include="src\arm\interpreter\armsupp.cpp" /> 145 <ClCompile Include="arm\interpreter\armsupp.cpp" />
146 <ClCompile Include="src\arm\interpreter\armvirt.cpp" /> 146 <ClCompile Include="arm\interpreter\armvirt.cpp" />
147 <ClCompile Include="src\arm\interpreter\arm_interpreter.cpp" /> 147 <ClCompile Include="arm\interpreter\arm_interpreter.cpp" />
148 <ClCompile Include="src\arm\interpreter\thumbemu.cpp" /> 148 <ClCompile Include="arm\interpreter\thumbemu.cpp" />
149 <ClCompile Include="src\arm\mmu\arm1176jzf_s_mmu.cpp" /> 149 <ClCompile Include="arm\mmu\arm1176jzf_s_mmu.cpp" />
150 <ClCompile Include="src\core.cpp" /> 150 <ClCompile Include="core.cpp" />
151 <ClCompile Include="src\core_timing.cpp" /> 151 <ClCompile Include="core_timing.cpp" />
152 <ClCompile Include="src\elf\elf_reader.cpp" /> 152 <ClCompile Include="elf\elf_reader.cpp" />
153 <ClCompile Include="src\file_sys\directory_file_system.cpp" /> 153 <ClCompile Include="file_sys\directory_file_system.cpp" />
154 <ClCompile Include="src\file_sys\meta_file_system.cpp" /> 154 <ClCompile Include="file_sys\meta_file_system.cpp" />
155 <ClCompile Include="src\hw\hw.cpp" /> 155 <ClCompile Include="hw\hw.cpp" />
156 <ClCompile Include="src\hw\hw_lcd.cpp" /> 156 <ClCompile Include="hw\hw_lcd.cpp" />
157 <ClCompile Include="src\loader.cpp" /> 157 <ClCompile Include="loader.cpp" />
158 <ClCompile Include="src\mem_map.cpp" /> 158 <ClCompile Include="mem_map.cpp" />
159 <ClCompile Include="src\mem_map_funcs.cpp" /> 159 <ClCompile Include="mem_map_funcs.cpp" />
160 <ClCompile Include="src\system.cpp" /> 160 <ClCompile Include="system.cpp" />
161 </ItemGroup> 161 </ItemGroup>
162 <ItemGroup> 162 <ItemGroup>
163 <ClInclude Include="src\arm\arm_interface.h" /> 163 <ClInclude Include="arm\arm_interface.h" />
164 <ClInclude Include="src\arm\disassembler\arm_disasm.h" /> 164 <ClInclude Include="arm\disassembler\arm_disasm.h" />
165 <ClInclude Include="src\arm\interpreter\armcpu.h" /> 165 <ClInclude Include="arm\interpreter\armcpu.h" />
166 <ClInclude Include="src\arm\interpreter\armdefs.h" /> 166 <ClInclude Include="arm\interpreter\armdefs.h" />
167 <ClInclude Include="src\arm\interpreter\armemu.h" /> 167 <ClInclude Include="arm\interpreter\armemu.h" />
168 <ClInclude Include="src\arm\interpreter\armmmu.h" /> 168 <ClInclude Include="arm\interpreter\armmmu.h" />
169 <ClInclude Include="src\arm\interpreter\armos.h" /> 169 <ClInclude Include="arm\interpreter\armos.h" />
170 <ClInclude Include="src\arm\interpreter\arm_interpreter.h" /> 170 <ClInclude Include="arm\interpreter\arm_interpreter.h" />
171 <ClInclude Include="src\arm\interpreter\arm_regformat.h" /> 171 <ClInclude Include="arm\interpreter\arm_regformat.h" />
172 <ClInclude Include="src\arm\interpreter\skyeye_defs.h" /> 172 <ClInclude Include="arm\interpreter\skyeye_defs.h" />
173 <ClInclude Include="src\arm\mmu\arm1176jzf_s_mmu.h" /> 173 <ClInclude Include="arm\mmu\arm1176jzf_s_mmu.h" />
174 <ClInclude Include="src\arm\mmu\cache.h" /> 174 <ClInclude Include="arm\mmu\cache.h" />
175 <ClInclude Include="src\arm\mmu\rb.h" /> 175 <ClInclude Include="arm\mmu\rb.h" />
176 <ClInclude Include="src\arm\mmu\tlb.h" /> 176 <ClInclude Include="arm\mmu\tlb.h" />
177 <ClInclude Include="src\arm\mmu\wb.h" /> 177 <ClInclude Include="arm\mmu\wb.h" />
178 <ClInclude Include="src\core.h" /> 178 <ClInclude Include="core.h" />
179 <ClInclude Include="src\core_timing.h" /> 179 <ClInclude Include="core_timing.h" />
180 <ClInclude Include="src\elf\elf_reader.h" /> 180 <ClInclude Include="elf\elf_reader.h" />
181 <ClInclude Include="src\elf\elf_types.h" /> 181 <ClInclude Include="elf\elf_types.h" />
182 <ClInclude Include="src\file_sys\directory_file_system.h" /> 182 <ClInclude Include="file_sys\directory_file_system.h" />
183 <ClInclude Include="src\file_sys\file_sys.h" /> 183 <ClInclude Include="file_sys\file_sys.h" />
184 <ClInclude Include="src\file_sys\meta_file_system.h" /> 184 <ClInclude Include="file_sys\meta_file_system.h" />
185 <ClInclude Include="src\hw\hw.h" /> 185 <ClInclude Include="hw\hw.h" />
186 <ClInclude Include="src\hw\hw_lcd.h" /> 186 <ClInclude Include="hw\hw_lcd.h" />
187 <ClInclude Include="src\loader.h" /> 187 <ClInclude Include="loader.h" />
188 <ClInclude Include="src\mem_map.h" /> 188 <ClInclude Include="mem_map.h" />
189 <ClInclude Include="src\system.h" /> 189 <ClInclude Include="system.h" />
190 </ItemGroup> 190 </ItemGroup>
191 <ItemGroup> 191 <ItemGroup>
192 <None Include="CMakeLists.txt" /> 192 <Text Include="CMakeLists.txt" />
193 </ItemGroup> 193 </ItemGroup>
194 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> 194 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
195 <ImportGroup Label="ExtensionTargets"> 195 <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 @@
1<?xml version="1.0" encoding="utf-8"?> 1<?xml version="1.0" encoding="utf-8"?>
2<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 2<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3 <ItemGroup> 3 <ItemGroup>
4 <ClCompile Include="src\core.cpp" /> 4 <Filter Include="arm">
5 <ClCompile Include="src\arm\disassembler\arm_disasm.cpp"> 5 <UniqueIdentifier>{b84ab55c-588b-45f0-a5ba-f9ebb0442f13}</UniqueIdentifier>
6 </Filter>
7 <Filter Include="arm\disassembler">
8 <UniqueIdentifier>{61100188-a726-4024-ab16-95ee242b446e}</UniqueIdentifier>
9 </Filter>
10 <Filter Include="arm\mmu">
11 <UniqueIdentifier>{a64d3c8a-747a-491b-b782-6e2622bedf24}</UniqueIdentifier>
12 </Filter>
13 <Filter Include="file_sys">
14 <UniqueIdentifier>{7f618562-73d1-4f55-9628-887497c27654}</UniqueIdentifier>
15 </Filter>
16 <Filter Include="arm\interpreter">
17 <UniqueIdentifier>{cca8b763-8a80-4478-9bcc-3c979293c357}</UniqueIdentifier>
18 </Filter>
19 <Filter Include="hw">
20 <UniqueIdentifier>{d1158fc4-3e0f-431f-9d3b-f30bbfeb4ad5}</UniqueIdentifier>
21 </Filter>
22 <Filter Include="elf">
23 <UniqueIdentifier>{7ae34319-6d72-4d12-bc62-9b438ba9241f}</UniqueIdentifier>
24 </Filter>
25 </ItemGroup>
26 <ItemGroup>
27 <ClCompile Include="arm\disassembler\arm_disasm.cpp">
6 <Filter>arm\disassembler</Filter> 28 <Filter>arm\disassembler</Filter>
7 </ClCompile> 29 </ClCompile>
8 <ClCompile Include="src\mem_map.cpp" /> 30 <ClCompile Include="arm\interpreter\arm_interpreter.cpp">
9 <ClCompile Include="src\mem_map_funcs.cpp" />
10 <ClCompile Include="src\loader.cpp" />
11 <ClCompile Include="src\file_sys\directory_file_system.cpp">
12 <Filter>file_sys</Filter>
13 </ClCompile>
14 <ClCompile Include="src\file_sys\meta_file_system.cpp">
15 <Filter>file_sys</Filter>
16 </ClCompile>
17 <ClCompile Include="src\system.cpp" />
18 <ClCompile Include="src\core_timing.cpp" />
19 <ClCompile Include="src\elf\elf_reader.cpp">
20 <Filter>elf</Filter>
21 </ClCompile>
22 <ClCompile Include="src\arm\mmu\arm1176jzf_s_mmu.cpp">
23 <Filter>arm\mmu</Filter>
24 </ClCompile>
25 <ClCompile Include="src\arm\interpreter\armemu.cpp">
26 <Filter>arm\interpreter</Filter> 31 <Filter>arm\interpreter</Filter>
27 </ClCompile> 32 </ClCompile>
28 <ClCompile Include="src\arm\interpreter\arminit.cpp"> 33 <ClCompile Include="arm\interpreter\armemu.cpp">
29 <Filter>arm\interpreter</Filter> 34 <Filter>arm\interpreter</Filter>
30 </ClCompile> 35 </ClCompile>
31 <ClCompile Include="src\arm\interpreter\armmmu.cpp"> 36 <ClCompile Include="arm\interpreter\arminit.cpp">
32 <Filter>arm\interpreter</Filter> 37 <Filter>arm\interpreter</Filter>
33 </ClCompile> 38 </ClCompile>
34 <ClCompile Include="src\arm\interpreter\armos.cpp"> 39 <ClCompile Include="arm\interpreter\armmmu.cpp">
35 <Filter>arm\interpreter</Filter> 40 <Filter>arm\interpreter</Filter>
36 </ClCompile> 41 </ClCompile>
37 <ClCompile Include="src\arm\interpreter\armsupp.cpp"> 42 <ClCompile Include="arm\interpreter\armos.cpp">
38 <Filter>arm\interpreter</Filter> 43 <Filter>arm\interpreter</Filter>
39 </ClCompile> 44 </ClCompile>
40 <ClCompile Include="src\arm\interpreter\armvirt.cpp"> 45 <ClCompile Include="arm\interpreter\armsupp.cpp">
41 <Filter>arm\interpreter</Filter> 46 <Filter>arm\interpreter</Filter>
42 </ClCompile> 47 </ClCompile>
43 <ClCompile Include="src\arm\interpreter\thumbemu.cpp"> 48 <ClCompile Include="arm\interpreter\armvirt.cpp">
44 <Filter>arm\interpreter</Filter> 49 <Filter>arm\interpreter</Filter>
45 </ClCompile> 50 </ClCompile>
46 <ClCompile Include="src\arm\interpreter\arm_interpreter.cpp"> 51 <ClCompile Include="arm\interpreter\thumbemu.cpp">
47 <Filter>arm\interpreter</Filter> 52 <Filter>arm\interpreter</Filter>
48 </ClCompile> 53 </ClCompile>
49 <ClCompile Include="src\hw\hw.cpp"> 54 <ClCompile Include="arm\mmu\arm1176jzf_s_mmu.cpp">
55 <Filter>arm\mmu</Filter>
56 </ClCompile>
57 <ClCompile Include="file_sys\directory_file_system.cpp">
58 <Filter>file_sys</Filter>
59 </ClCompile>
60 <ClCompile Include="file_sys\meta_file_system.cpp">
61 <Filter>file_sys</Filter>
62 </ClCompile>
63 <ClCompile Include="hw\hw.cpp">
50 <Filter>hw</Filter> 64 <Filter>hw</Filter>
51 </ClCompile> 65 </ClCompile>
52 <ClCompile Include="src\hw\hw_lcd.cpp"> 66 <ClCompile Include="hw\hw_lcd.cpp">
53 <Filter>hw</Filter> 67 <Filter>hw</Filter>
54 </ClCompile> 68 </ClCompile>
69 <ClCompile Include="elf\elf_reader.cpp">
70 <Filter>elf</Filter>
71 </ClCompile>
72 <ClCompile Include="core.cpp" />
73 <ClCompile Include="loader.cpp" />
74 <ClCompile Include="mem_map.cpp" />
75 <ClCompile Include="mem_map_funcs.cpp" />
76 <ClCompile Include="system.cpp" />
77 <ClCompile Include="core_timing.cpp" />
55 </ItemGroup> 78 </ItemGroup>
56 <ItemGroup> 79 <ItemGroup>
57 <Filter Include="arm"> 80 <ClInclude Include="arm\disassembler\arm_disasm.h">
58 <UniqueIdentifier>{b84ab55c-588b-45f0-a5ba-f9ebb0442f13}</UniqueIdentifier>
59 </Filter>
60 <Filter Include="arm\disassembler">
61 <UniqueIdentifier>{61100188-a726-4024-ab16-95ee242b446e}</UniqueIdentifier>
62 </Filter>
63 <Filter Include="arm\mmu">
64 <UniqueIdentifier>{a64d3c8a-747a-491b-b782-6e2622bedf24}</UniqueIdentifier>
65 </Filter>
66 <Filter Include="file_sys">
67 <UniqueIdentifier>{7f618562-73d1-4f55-9628-887497c27654}</UniqueIdentifier>
68 </Filter>
69 <Filter Include="elf">
70 <UniqueIdentifier>{671d3218-3771-4218-b142-1f9a1cc24a51}</UniqueIdentifier>
71 </Filter>
72 <Filter Include="hle">
73 <UniqueIdentifier>{794616f8-739f-4643-9c3f-869e50831d4f}</UniqueIdentifier>
74 </Filter>
75 <Filter Include="arm\interpreter">
76 <UniqueIdentifier>{cca8b763-8a80-4478-9bcc-3c979293c357}</UniqueIdentifier>
77 </Filter>
78 <Filter Include="hw">
79 <UniqueIdentifier>{d1158fc4-3e0f-431f-9d3b-f30bbfeb4ad5}</UniqueIdentifier>
80 </Filter>
81 </ItemGroup>
82 <ItemGroup>
83 <ClInclude Include="src\arm\disassembler\arm_disasm.h">
84 <Filter>arm\disassembler</Filter> 81 <Filter>arm\disassembler</Filter>
85 </ClInclude> 82 </ClInclude>
86 <ClInclude Include="src\mem_map.h" /> 83 <ClInclude Include="arm\interpreter\arm_interpreter.h">
87 <ClInclude Include="src\core.h" /> 84 <Filter>arm\interpreter</Filter>
88 <ClInclude Include="src\arm\mmu\arm1176jzf_s_mmu.h"> 85 </ClInclude>
86 <ClInclude Include="arm\interpreter\arm_regformat.h">
87 <Filter>arm\interpreter</Filter>
88 </ClInclude>
89 <ClInclude Include="arm\interpreter\armcpu.h">
90 <Filter>arm\interpreter</Filter>
91 </ClInclude>
92 <ClInclude Include="arm\interpreter\armdefs.h">
93 <Filter>arm\interpreter</Filter>
94 </ClInclude>
95 <ClInclude Include="arm\interpreter\armemu.h">
96 <Filter>arm\interpreter</Filter>
97 </ClInclude>
98 <ClInclude Include="arm\interpreter\armmmu.h">
99 <Filter>arm\interpreter</Filter>
100 </ClInclude>
101 <ClInclude Include="arm\interpreter\armos.h">
102 <Filter>arm\interpreter</Filter>
103 </ClInclude>
104 <ClInclude Include="arm\interpreter\skyeye_defs.h">
105 <Filter>arm\interpreter</Filter>
106 </ClInclude>
107 <ClInclude Include="arm\mmu\arm1176jzf_s_mmu.h">
89 <Filter>arm\mmu</Filter> 108 <Filter>arm\mmu</Filter>
90 </ClInclude> 109 </ClInclude>
91 <ClInclude Include="src\arm\mmu\cache.h"> 110 <ClInclude Include="arm\mmu\cache.h">
92 <Filter>arm\mmu</Filter> 111 <Filter>arm\mmu</Filter>
93 </ClInclude> 112 </ClInclude>
94 <ClInclude Include="src\arm\mmu\rb.h"> 113 <ClInclude Include="arm\mmu\rb.h">
95 <Filter>arm\mmu</Filter> 114 <Filter>arm\mmu</Filter>
96 </ClInclude> 115 </ClInclude>
97 <ClInclude Include="src\arm\mmu\tlb.h"> 116 <ClInclude Include="arm\mmu\tlb.h">
98 <Filter>arm\mmu</Filter> 117 <Filter>arm\mmu</Filter>
99 </ClInclude> 118 </ClInclude>
100 <ClInclude Include="src\arm\mmu\wb.h"> 119 <ClInclude Include="arm\mmu\wb.h">
101 <Filter>arm\mmu</Filter> 120 <Filter>arm\mmu</Filter>
102 </ClInclude> 121 </ClInclude>
103 <ClInclude Include="src\loader.h" /> 122 <ClInclude Include="file_sys\directory_file_system.h">
104 <ClInclude Include="src\file_sys\file_sys.h">
105 <Filter>file_sys</Filter> 123 <Filter>file_sys</Filter>
106 </ClInclude> 124 </ClInclude>
107 <ClInclude Include="src\file_sys\directory_file_system.h"> 125 <ClInclude Include="file_sys\file_sys.h">
108 <Filter>file_sys</Filter> 126 <Filter>file_sys</Filter>
109 </ClInclude> 127 </ClInclude>
110 <ClInclude Include="src\file_sys\meta_file_system.h"> 128 <ClInclude Include="file_sys\meta_file_system.h">
111 <Filter>file_sys</Filter> 129 <Filter>file_sys</Filter>
112 </ClInclude> 130 </ClInclude>
113 <ClInclude Include="src\system.h" /> 131 <ClInclude Include="hw\hw.h">
114 <ClInclude Include="src\core_timing.h" /> 132 <Filter>hw</Filter>
115 <ClInclude Include="src\elf\elf_reader.h">
116 <Filter>elf</Filter>
117 </ClInclude>
118 <ClInclude Include="src\elf\elf_types.h">
119 <Filter>elf</Filter>
120 </ClInclude>
121 <ClInclude Include="src\arm\interpreter\arm_regformat.h">
122 <Filter>arm\interpreter</Filter>
123 </ClInclude>
124 <ClInclude Include="src\arm\interpreter\armcpu.h">
125 <Filter>arm\interpreter</Filter>
126 </ClInclude>
127 <ClInclude Include="src\arm\interpreter\armdefs.h">
128 <Filter>arm\interpreter</Filter>
129 </ClInclude>
130 <ClInclude Include="src\arm\interpreter\armemu.h">
131 <Filter>arm\interpreter</Filter>
132 </ClInclude> 133 </ClInclude>
133 <ClInclude Include="src\arm\interpreter\armmmu.h"> 134 <ClInclude Include="hw\hw_lcd.h">
134 <Filter>arm\interpreter</Filter> 135 <Filter>hw</Filter>
135 </ClInclude> 136 </ClInclude>
136 <ClInclude Include="src\arm\interpreter\armos.h"> 137 <ClInclude Include="elf\elf_reader.h">
137 <Filter>arm\interpreter</Filter> 138 <Filter>elf</Filter>
138 </ClInclude> 139 </ClInclude>
139 <ClInclude Include="src\arm\interpreter\skyeye_defs.h"> 140 <ClInclude Include="elf\elf_types.h">
140 <Filter>arm\interpreter</Filter> 141 <Filter>elf</Filter>
141 </ClInclude> 142 </ClInclude>
142 <ClInclude Include="src\arm\arm_interface.h"> 143 <ClInclude Include="arm\arm_interface.h">
143 <Filter>arm</Filter> 144 <Filter>arm</Filter>
144 </ClInclude> 145 </ClInclude>
145 <ClInclude Include="src\arm\interpreter\arm_interpreter.h"> 146 <ClInclude Include="core.h" />
146 <Filter>arm\interpreter</Filter> 147 <ClInclude Include="core_timing.h" />
147 </ClInclude> 148 <ClInclude Include="loader.h" />
148 <ClInclude Include="src\hw\hw.h"> 149 <ClInclude Include="mem_map.h" />
149 <Filter>hw</Filter> 150 <ClInclude Include="system.h" />
150 </ClInclude>
151 <ClInclude Include="src\hw\hw_lcd.h">
152 <Filter>hw</Filter>
153 </ClInclude>
154 </ItemGroup> 151 </ItemGroup>
155 <ItemGroup> 152 <ItemGroup>
156 <None Include="CMakeLists.txt" /> 153 <Text Include="CMakeLists.txt" />
157 </ItemGroup> 154 </ItemGroup>
158</Project> \ No newline at end of file 155</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 @@
5#include <vector> 5#include <vector>
6#include <cstdio> 6#include <cstdio>
7 7
8#include "msg_handler.h" 8#include "common/msg_handler.h"
9#include "std_mutex.h" 9#include "common/std_mutex.h"
10#include "atomic.h" 10#include "common/atomic.h"
11#include "core_timing.h" 11#include "common/chunk_file.h"
12#include "core.h" 12
13#include "chunk_file.h" 13#include "core/core_timing.h"
14#include "core/core.h"
14 15
15int g_clock_rate_arm11 = 268123480; 16int g_clock_rate_arm11 = 268123480;
16 17
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 @@
17// inside callback: 17// inside callback:
18// ScheduleEvent(periodInCycles - cyclesLate, callback, "whatever") 18// ScheduleEvent(periodInCycles - cyclesLate, callback, "whatever")
19 19
20#include "common.h" 20#include "common/common.h"
21 21
22class PointerWrap; 22class PointerWrap;
23 23
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 @@
4 4
5#include <string> 5#include <string>
6 6
7#include "common.h" 7#include "common/common.h"
8#include "mem_map.h" 8
9#include "core/mem_map.h"
10#include "core/elf/elf_reader.h"
9 11
10#include "elf/elf_reader.h"
11//#include "Core/Debugger/Debugger_SymbolMap.h" 12//#include "Core/Debugger/Debugger_SymbolMap.h"
12//#include "Core/HW/Memmap.h" 13//#include "Core/HW/Memmap.h"
13//#include "Core/PowerPC/PPCSymbolDB.h" 14//#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 @@
4 4
5#pragma once 5#pragma once
6 6
7#include "elf/elf_types.h" 7#include "core/elf/elf_types.h"
8 8
9enum KnownElfTypes 9enum KnownElfTypes
10{ 10{
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 @@
15// Official git repository and contact information can be found at 15// Official git repository and contact information can be found at
16// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. 16// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
17 17
18#include "chunk_file.h" 18#include "common/chunk_file.h"
19#include "file_util.h" 19#include "common/file_util.h"
20#include "directory_file_system.h" 20#include "common/utf8.h"
21//#include "ISOFileSystem.h" 21
22//#include "Core/HLE/sceKernel.h" 22#include "core/file_sys/directory_file_system.h"
23//#include "file/zip_read.h"
24#include "utf8.h"
25 23
26#if EMU_PLATFORM == PLATFORM_WINDOWS 24#if EMU_PLATFORM == PLATFORM_WINDOWS
27#include <windows.h> 25#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 @@
15// Official git repository and contact information can be found at 15// Official git repository and contact information can be found at
16// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. 16// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
17 17
18#ifndef CORE_FILE_SYS_DIRECTORY_H_ 18#pragma once
19#define CORE_FILE_SYS_DIRECTORY_H_
20 19
21// TODO: Remove the Windows-specific code, FILE is fine there too. 20// TODO: Remove the Windows-specific code, FILE is fine there too.
22 21
23#include <map> 22#include <map>
24 23
25#include "file_sys.h" 24#include "core/file_sys/file_sys.h"
26 25
27#ifdef _WIN32 26#ifdef _WIN32
28typedef void * HANDLE; 27typedef void * HANDLE;
@@ -154,5 +153,3 @@ private:
154 153
155 std::string GetLocalPath(std::string localpath); 154 std::string GetLocalPath(std::string localpath);
156}; 155};
157
158#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 @@
17 17
18#pragma once 18#pragma once
19 19
20#include "common.h" 20#include "common/common.h"
21#include "chunk_file.h" 21#include "common/chunk_file.h"
22 22
23enum FileAccess { 23enum FileAccess {
24 FILEACCESS_NONE=0, 24 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 @@
17 17
18#include <set> 18#include <set>
19#include <algorithm> 19#include <algorithm>
20#include "string_util.h" 20
21#include "file_sys/meta_file_system.h" 21#include "common/string_util.h"
22//#include "Core/HLE/sceKernelThread.h" 22#include "core/file_sys/meta_file_system.h"
23//#include "Core/Reporting.h"
24 23
25static bool ApplyPathStringToComponentsVector(std::vector<std::string> &vector, const std::string &pathString) 24static bool ApplyPathStringToComponentsVector(std::vector<std::string> &vector, const std::string &pathString)
26{ 25{
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 @@
17 17
18#pragma once 18#pragma once
19 19
20#include "std_mutex.h" 20#include "common/std_mutex.h"
21#include "file_sys.h" 21
22#include "core/file_sys/file_sys.h"
22 23
23class MetaFileSystem : public IHandleAllocator, public IFileSystem 24class MetaFileSystem : public IHandleAllocator, public IFileSystem
24{ 25{
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 @@
2// Licensed under GPLv2 2// Licensed under GPLv2
3// Refer to the license.txt file included. 3// Refer to the license.txt file included.
4 4
5#include "log.h" 5#include "common/common_types.h"
6#include "hw/hw.h" 6#include "common/log.h"
7#include "hw/hw_lcd.h" 7
8#include "core/hw/hw.h"
9#include "core/hw/hw_lcd.h"
8 10
9namespace HW { 11namespace HW {
10 12
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 @@
4 4
5#pragma once 5#pragma once
6 6
7#include "common_types.h" 7#include "common/common_types.h"
8 8
9namespace HW { 9namespace HW {
10 10
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 @@
2// Licensed under GPLv2 2// Licensed under GPLv2
3// Refer to the license.txt file included. 3// Refer to the license.txt file included.
4 4
5#include "log.h" 5#include "common/common_types.h"
6#include "core.h" 6#include "common/log.h"
7#include "hw_lcd.h" 7
8#include "video_core.h" 8#include "core/core.h"
9#include "core/hw/hw_lcd.h"
10
11#include "video_core/video_core.h"
9 12
10namespace LCD { 13namespace LCD {
11 14
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 @@
4 4
5#pragma once 5#pragma once
6 6
7#include "common_types.h" 7#include "common/common_types.h"
8 8
9namespace LCD { 9namespace LCD {
10 10
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 @@
2// Licensed under GPLv2 2// Licensed under GPLv2
3// Refer to the license.txt file included. 3// Refer to the license.txt file included.
4 4
5#include "file_util.h" 5#include "common/common_types.h"
6#include "loader.h" 6#include "common/file_util.h"
7#include "system.h" 7
8#include "core.h" 8#include "core/loader.h"
9#include "file_sys/directory_file_system.h" 9#include "core/system.h"
10#include "elf/elf_reader.h" 10#include "core/core.h"
11#include "core/file_sys/directory_file_system.h"
12#include "core/elf/elf_reader.h"
11 13
12//////////////////////////////////////////////////////////////////////////////////////////////////// 14////////////////////////////////////////////////////////////////////////////////////////////////////
13 15
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 @@
4 4
5#pragma once 5#pragma once
6 6
7#include "common.h" 7#include "common/common.h"
8 8
9//////////////////////////////////////////////////////////////////////////////////////////////////// 9////////////////////////////////////////////////////////////////////////////////////////////////////
10 10
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 @@
2// Licensed under GPLv2 2// Licensed under GPLv2
3// Refer to the license.txt file included. 3// Refer to the license.txt file included.
4 4
5#include "common.h" 5#include "common/common.h"
6#include "mem_arena.h" 6#include "common/mem_arena.h"
7 7
8#include "mem_map.h" 8#include "core/mem_map.h"
9#include "core.h" 9#include "core/core.h"
10 10
11//////////////////////////////////////////////////////////////////////////////////////////////////// 11////////////////////////////////////////////////////////////////////////////////////////////////////
12 12
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 @@
6 6
7//////////////////////////////////////////////////////////////////////////////////////////////////// 7////////////////////////////////////////////////////////////////////////////////////////////////////
8 8
9#include "common.h" 9#include "common/common.h"
10#include "common_types.h" 10#include "common/common_types.h"
11 11
12//////////////////////////////////////////////////////////////////////////////////////////////////// 12////////////////////////////////////////////////////////////////////////////////////////////////////
13 13
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 @@
2// Licensed under GPLv2 2// Licensed under GPLv2
3// Refer to the license.txt file included. 3// Refer to the license.txt file included.
4 4
5#include "common.h" 5#include "common/common.h"
6 6
7#include "mem_map.h" 7#include "core/mem_map.h"
8#include "hw/hw.h" 8#include "core/hw/hw.h"
9 9
10namespace Memory { 10namespace Memory {
11 11
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 @@
2// Licensed under GPLv2 2// Licensed under GPLv2
3// Refer to the license.txt file included. 3// Refer to the license.txt file included.
4 4
5#include "core.h" 5#include "core/core.h"
6#include "hw/hw.h" 6#include "core/core_timing.h"
7#include "core_timing.h" 7#include "core/mem_map.h"
8#include "mem_map.h" 8#include "core/system.h"
9#include "system.h" 9#include "core/hw/hw.h"
10#include "video_core.h" 10
11#include "video_core/video_core.h"
11 12
12namespace System { 13namespace System {
13 14
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 @@
4 4
5#pragma once 5#pragma once
6 6
7#include "emu_window.h" 7#include "common/emu_window.h"
8#include "file_sys/meta_file_system.h" 8#include "core/file_sys/meta_file_system.h"
9 9
10//////////////////////////////////////////////////////////////////////////////////////////////////// 10////////////////////////////////////////////////////////////////////////////////////////////////////
11 11
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 @@
4 4
5#pragma once 5#pragma once
6 6
7#include "common.h" 7#include "common/common.h"
8#include "hash.h"
9 8
10class RendererBase { 9class RendererBase {
11public: 10public:
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 @@
2// Licensed under GPLv2 2// Licensed under GPLv2
3// Refer to the license.txt file included. 3// Refer to the license.txt file included.
4 4
5#include "mem_map.h" 5#include "video_core/video_core.h"
6#include "video_core.h" 6#include "video_core/renderer_opengl/renderer_opengl.h"
7#include "renderer_opengl/renderer_opengl.h" 7
8#include "core/mem_map.h"
8 9
9 10
10/// RendererOpenGL constructor 11/// 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 @@
6 6
7#include <GL/glew.h> 7#include <GL/glew.h>
8 8
9#include "common.h" 9#include "common/common.h"
10#include "emu_window.h" 10#include "common/emu_window.h"
11 11
12#include "renderer_base.h" 12#include "video_core/renderer_base.h"
13 13
14 14
15class RendererOpenGL : virtual public RendererBase { 15class 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 @@
5#include <stdio.h> 5#include <stdio.h>
6#include <string.h> 6#include <string.h>
7 7
8#include "utils.h" 8#include "video_core/utils.h"
9 9
10namespace VideoCore { 10namespace VideoCore {
11 11
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 @@
6 6
7#include <string> 7#include <string>
8 8
9#include "common_types.h" 9#include "common/common_types.h"
10 10
11namespace FormatPrecision { 11namespace FormatPrecision {
12 12
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 @@
2// Licensed under GPLv2 2// Licensed under GPLv2
3// Refer to the license.txt file included. 3// Refer to the license.txt file included.
4 4
5#include "common.h" 5#include "common/common.h"
6#include "emu_window.h" 6#include "common/emu_window.h"
7#include "log.h" 7#include "common/log.h"
8 8
9#include "core.h" 9#include "core/core.h"
10 10
11#include "video_core.h" 11#include "video_core/video_core.h"
12#include "renderer_base.h" 12#include "video_core/renderer_base.h"
13#include "renderer_opengl/renderer_opengl.h" 13#include "video_core/renderer_opengl/renderer_opengl.h"
14 14
15//////////////////////////////////////////////////////////////////////////////////////////////////// 15////////////////////////////////////////////////////////////////////////////////////////////////////
16// Video Core namespace 16// 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 @@
4 4
5#pragma once 5#pragma once
6 6
7#include "common.h" 7#include "common/common.h"
8#include "emu_window.h" 8#include "common/emu_window.h"
9
9#include "renderer_base.h" 10#include "renderer_base.h"
10 11
11//////////////////////////////////////////////////////////////////////////////////////////////////// 12////////////////////////////////////////////////////////////////////////////////////////////////////
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 @@
19 </ProjectConfiguration> 19 </ProjectConfiguration>
20 </ItemGroup> 20 </ItemGroup>
21 <ItemGroup> 21 <ItemGroup>
22 <ClCompile Include="src\renderer_opengl\renderer_opengl.cpp" /> 22 <ClCompile Include="renderer_opengl\renderer_opengl.cpp" />
23 <ClCompile Include="src\utils.cpp" /> 23 <ClCompile Include="utils.cpp" />
24 <ClCompile Include="src\video_core.cpp" /> 24 <ClCompile Include="video_core.cpp" />
25 </ItemGroup> 25 </ItemGroup>
26 <ItemGroup> 26 <ItemGroup>
27 <ClInclude Include="src\renderer_base.h" /> 27 <ClInclude Include="renderer_base.h" />
28 <ClInclude Include="src\renderer_opengl\renderer_opengl.h" /> 28 <ClInclude Include="renderer_opengl\renderer_opengl.h" />
29 <ClInclude Include="src\utils.h" /> 29 <ClInclude Include="utils.h" />
30 <ClInclude Include="src\video_core.h" /> 30 <ClInclude Include="video_core.h" />
31 </ItemGroup> 31 </ItemGroup>
32 <ItemGroup> 32 <ItemGroup>
33 <Text Include="CMakeLists.txt" /> 33 <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 @@
1<?xml version="1.0" encoding="utf-8"?> 1<?xml version="1.0" encoding="utf-8"?>
2<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 2<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3 <ItemGroup> 3 <ItemGroup>
4 <ClCompile Include="src\video_core.cpp" /> 4 <Filter Include="renderer_opengl">
5 <ClCompile Include="src\utils.cpp" /> 5 <UniqueIdentifier>{e0245557-dbd4-423e-9399-513d5e99f1e4}</UniqueIdentifier>
6 <ClCompile Include="src\renderer_opengl\renderer_opengl.cpp"> 6 </Filter>
7 </ItemGroup>
8 <ItemGroup>
9 <ClCompile Include="renderer_opengl\renderer_opengl.cpp">
7 <Filter>renderer_opengl</Filter> 10 <Filter>renderer_opengl</Filter>
8 </ClCompile> 11 </ClCompile>
12 <ClCompile Include="utils.cpp" />
13 <ClCompile Include="video_core.cpp" />
9 </ItemGroup> 14 </ItemGroup>
10 <ItemGroup> 15 <ItemGroup>
11 <ClInclude Include="src\renderer_base.h" /> 16 <ClInclude Include="renderer_opengl\renderer_opengl.h">
12 <ClInclude Include="src\video_core.h" />
13 <ClInclude Include="src\utils.h" />
14 <ClInclude Include="src\renderer_opengl\renderer_opengl.h">
15 <Filter>renderer_opengl</Filter> 17 <Filter>renderer_opengl</Filter>
16 </ClInclude> 18 </ClInclude>
19 <ClInclude Include="renderer_base.h" />
20 <ClInclude Include="utils.h" />
21 <ClInclude Include="video_core.h" />
17 </ItemGroup> 22 </ItemGroup>
18 <ItemGroup> 23 <ItemGroup>
19 <Text Include="CMakeLists.txt" /> 24 <Text Include="CMakeLists.txt" />
20 </ItemGroup> 25 </ItemGroup>
21 <ItemGroup>
22 <Filter Include="renderer_opengl">
23 <UniqueIdentifier>{e0245557-dbd4-423e-9399-513d5e99f1e4}</UniqueIdentifier>
24 </Filter>
25 </ItemGroup>
26</Project> \ No newline at end of file 26</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 @@
12 <StructMemberAlignment>16Bytes</StructMemberAlignment> 12 <StructMemberAlignment>16Bytes</StructMemberAlignment>
13 <FunctionLevelLinking>true</FunctionLevelLinking> 13 <FunctionLevelLinking>true</FunctionLevelLinking>
14 <MultiProcessorCompilation>true</MultiProcessorCompilation> 14 <MultiProcessorCompilation>true</MultiProcessorCompilation>
15 <AdditionalIncludeDirectories>$(SolutionDir)src\common\src;$(SolutionDir)src\core\src;$(SolutionDir)src\video_core\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 15 <AdditionalIncludeDirectories>$(SolutionDir)src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
16 <PreprocessorDefinitions> 16 <PreprocessorDefinitions>
17 </PreprocessorDefinitions> 17 </PreprocessorDefinitions>
18 <RuntimeTypeInfo>false</RuntimeTypeInfo> 18 <RuntimeTypeInfo>false</RuntimeTypeInfo>
HIC SVNT DRACONES