summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
Diffstat (limited to 'src/core')
-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
34 files changed, 255 insertions, 251 deletions
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
HIC SVNT DRACONES