From 45976da975a21359cfcc9a05c575ed8b07575612 Mon Sep 17 00:00:00 2001
From: Yuri Kunde Schlesner <yuriks@yuriks.net>
Date: Sat, 23 Aug 2014 22:22:05 -0300
Subject: CMake cleanup

Several cleanups to the buildsystem:
 - Do better factoring of common libs between platforms.
 - Add support to building on Windows.
 - Remove Qt4 support.
 - Re-sort file lists and add missing headers.
---
 src/core/CMakeLists.txt | 103 ++++++++++++++++++++++++++----------------------
 1 file changed, 56 insertions(+), 47 deletions(-)

(limited to 'src/core')

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 207f39707..1f358ec8d 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -1,14 +1,18 @@
-set(SRCS    core.cpp
-            core_timing.cpp
-            loader/elf.cpp
-            loader/loader.cpp
-            loader/ncch.cpp
-            mem_map.cpp
-            mem_map_funcs.cpp
-            system.cpp
+set(SRCS
             arm/disassembler/arm_disasm.cpp
             arm/disassembler/load_symbol_map.cpp
-            file_sys/archive_romfs.cpp
+            arm/interpreter/mmu/arm1176jzf_s_mmu.cpp
+            arm/interpreter/mmu/cache.cpp
+            arm/interpreter/mmu/maverick.cpp
+            arm/interpreter/mmu/rb.cpp
+            arm/interpreter/mmu/sa_mmu.cpp
+            arm/interpreter/mmu/tlb.cpp
+            arm/interpreter/mmu/wb.cpp
+            arm/interpreter/mmu/xscale_copro.cpp
+            arm/interpreter/vfp/vfp.cpp
+            arm/interpreter/vfp/vfpdouble.cpp
+            arm/interpreter/vfp/vfpinstr.cpp
+            arm/interpreter/vfp/vfpsingle.cpp
             arm/interpreter/arm_interpreter.cpp
             arm/interpreter/armcopro.cpp
             arm/interpreter/armemu.cpp
@@ -18,22 +22,7 @@ set(SRCS    core.cpp
             arm/interpreter/armsupp.cpp
             arm/interpreter/armvirt.cpp
             arm/interpreter/thumbemu.cpp
-            arm/interpreter/vfp/vfp.cpp
-            arm/interpreter/vfp/vfpdouble.cpp
-            arm/interpreter/vfp/vfpinstr.cpp
-            arm/interpreter/vfp/vfpsingle.cpp
-            arm/interpreter/mmu/arm1176jzf_s_mmu.cpp
-            arm/interpreter/mmu/cache.cpp
-            arm/interpreter/mmu/maverick.cpp
-            arm/interpreter/mmu/rb.cpp
-            arm/interpreter/mmu/sa_mmu.cpp
-            arm/interpreter/mmu/tlb.cpp
-            arm/interpreter/mmu/wb.cpp
-            arm/interpreter/mmu/xscale_copro.cpp
-            hle/hle.cpp
-            hle/config_mem.cpp
-            hle/coprocessor.cpp
-            hle/svc.cpp
+            file_sys/archive_romfs.cpp
             hle/kernel/address_arbiter.cpp
             hle/kernel/archive.cpp
             hle/kernel/event.cpp
@@ -48,27 +37,26 @@ set(SRCS    core.cpp
             hle/service/ndm.cpp
             hle/service/service.cpp
             hle/service/srv.cpp
+            hle/config_mem.cpp
+            hle/coprocessor.cpp
+            hle/hle.cpp
+            hle/svc.cpp
             hw/gpu.cpp
             hw/hw.cpp
-            hw/ndma.cpp)
+            hw/ndma.cpp
+            loader/elf.cpp
+            loader/loader.cpp
+            loader/ncch.cpp
+            core.cpp
+            core_timing.cpp
+            mem_map.cpp
+            mem_map_funcs.cpp
+            system.cpp
+            )
 
-set(HEADERS core.h
-            core_timing.h
-            loader/elf.h
-            loader/loader.h
-            loader/ncch.h
-            mem_map.h
-            system.h
+set(HEADERS
             arm/disassembler/arm_disasm.h
             arm/disassembler/load_symbol_map.h
-            arm/interpreter/arm_interpreter.h
-            arm/interpreter/arm_regformat.h
-            arm/interpreter/armcpu.h
-            arm/interpreter/armdefs.h
-            arm/interpreter/armemu.h
-            arm/interpreter/armmmu.h
-            arm/interpreter/armos.h
-            arm/interpreter/skyeye_defs.h
             arm/interpreter/mmu/arm1176jzf_s_mmu.h
             arm/interpreter/mmu/cache.h
             arm/interpreter/mmu/rb.h
@@ -78,27 +66,48 @@ set(HEADERS core.h
             arm/interpreter/vfp/asm_vfp.h
             arm/interpreter/vfp/vfp.h
             arm/interpreter/vfp/vfp_helper.h
+            arm/interpreter/arm_interpreter.h
+            arm/interpreter/arm_regformat.h
+            arm/interpreter/armcpu.h
+            arm/interpreter/armdefs.h
+            arm/interpreter/armemu.h
+            arm/interpreter/armmmu.h
+            arm/interpreter/armos.h
+            arm/interpreter/skyeye_defs.h
+            arm/arm_interface.h
             file_sys/archive.h
             file_sys/archive_romfs.h
-            hle/config_mem.h
-            hle/coprocessor.h
-            hle/hle.h
-            hle/svc.h
             hle/kernel/address_arbiter.h
             hle/kernel/archive.h
+            hle/kernel/event.h
             hle/kernel/kernel.h
             hle/kernel/mutex.h
             hle/kernel/shared_memory.h
             hle/kernel/thread.h
-            hle/function_wrappers.h
             hle/service/apt.h
             hle/service/fs.h
             hle/service/gsp.h
             hle/service/hid.h
+            hle/service/ndm.h
             hle/service/service.h
             hle/service/srv.h
+            hle/config_mem.h
+            hle/coprocessor.h
+            hle/function_wrappers.h
+            hle/hle.h
+            hle/svc.h
             hw/gpu.h
             hw/hw.h
-            hw/ndma.h)
+            hw/ndma.h
+            loader/elf.h
+            loader/loader.h
+            loader/ncch.h
+            core.h
+            core_timing.h
+            mem_map.h
+            system.h
+            )
+
+create_directory_groups(${SRCS} ${HEADERS})
 
 add_library(core STATIC ${SRCS} ${HEADERS})
-- 
cgit v1.2.3


From c57de3e4046c662c5179d3b55340361a046a57ff Mon Sep 17 00:00:00 2001
From: Yuri Kunde Schlesner <yuriks@yuriks.net>
Date: Mon, 1 Sep 2014 18:04:07 -0300
Subject: Remove hand-crafted Visual Studio solution.

---
 src/core/core.vcxproj         | 253 -------------------------------
 src/core/core.vcxproj.filters | 339 ------------------------------------------
 2 files changed, 592 deletions(-)
 delete mode 100644 src/core/core.vcxproj
 delete mode 100644 src/core/core.vcxproj.filters

(limited to 'src/core')

diff --git a/src/core/core.vcxproj b/src/core/core.vcxproj
deleted file mode 100644
index ddc174c2c..000000000
--- a/src/core/core.vcxproj
+++ /dev/null
@@ -1,253 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{8AEA7F29-3466-4786-A10D-6A4BD0610977}</ProjectGuid>
-    <RootNamespace>core</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\vsprops\base.props" />
-    <Import Project="..\..\vsprops\externals.props" />
-    <Import Project="..\..\vsprops\code_generation_debug.props" />
-    <Import Project="..\..\vsprops\optimization_debug.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\vsprops\base.props" />
-    <Import Project="..\..\vsprops\externals.props" />
-    <Import Project="..\..\vsprops\code_generation_debug.props" />
-    <Import Project="..\..\vsprops\optimization_debug.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\vsprops\base.props" />
-    <Import Project="..\..\vsprops\externals.props" />
-    <Import Project="..\..\vsprops\code_generation_release.props" />
-    <Import Project="..\..\vsprops\optimization_release.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\vsprops\base.props" />
-    <Import Project="..\..\vsprops\externals.props" />
-    <Import Project="..\..\vsprops\code_generation_release.props" />
-    <Import Project="..\..\vsprops\optimization_release.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <CustomBuildBeforeTargets>
-    </CustomBuildBeforeTargets>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <CustomBuildBeforeTargets />
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <CustomBuildBeforeTargets>
-    </CustomBuildBeforeTargets>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <CustomBuildBeforeTargets />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile />
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-    <ClCompile />
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile />
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-    <ClCompile />
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile />
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-    <ClCompile />
-    <ClCompile />
-    <ClCompile>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile />
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-    <ClCompile />
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\common\common.vcxproj">
-      <Project>{dfe335fc-755d-4baa-8452-94434f8a1edb}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="arm\disassembler\arm_disasm.cpp" />
-    <ClCompile Include="arm\disassembler\load_symbol_map.cpp" />
-    <ClCompile Include="arm\interpreter\armcopro.cpp" />
-    <ClCompile Include="arm\interpreter\armemu.cpp" />
-    <ClCompile Include="arm\interpreter\arminit.cpp" />
-    <ClCompile Include="arm\interpreter\armmmu.cpp" />
-    <ClCompile Include="arm\interpreter\armos.cpp" />
-    <ClCompile Include="arm\interpreter\armsupp.cpp" />
-    <ClCompile Include="arm\interpreter\armvirt.cpp" />
-    <ClCompile Include="arm\interpreter\arm_interpreter.cpp" />
-    <ClCompile Include="arm\interpreter\mmu\arm1176jzf_s_mmu.cpp" />
-    <ClCompile Include="arm\interpreter\mmu\cache.cpp" />
-    <ClCompile Include="arm\interpreter\mmu\maverick.cpp" />
-    <ClCompile Include="arm\interpreter\mmu\rb.cpp" />
-    <ClCompile Include="arm\interpreter\mmu\sa_mmu.cpp" />
-    <ClCompile Include="arm\interpreter\mmu\tlb.cpp" />
-    <ClCompile Include="arm\interpreter\mmu\wb.cpp" />
-    <ClCompile Include="arm\interpreter\mmu\xscale_copro.cpp" />
-    <ClCompile Include="arm\interpreter\thumbemu.cpp" />
-    <ClCompile Include="arm\interpreter\vfp\vfp.cpp" />
-    <ClCompile Include="arm\interpreter\vfp\vfpdouble.cpp" />
-    <ClCompile Include="arm\interpreter\vfp\vfpinstr.cpp" />
-    <ClCompile Include="arm\interpreter\vfp\vfpsingle.cpp" />
-    <ClCompile Include="core.cpp" />
-    <ClCompile Include="core_timing.cpp" />
-    <ClCompile Include="file_sys\archive_romfs.cpp" />
-    <ClCompile Include="hle\config_mem.cpp" />
-    <ClCompile Include="hle\coprocessor.cpp" />
-    <ClCompile Include="hle\hle.cpp" />
-    <ClCompile Include="hle\kernel\address_arbiter.cpp" />
-    <ClCompile Include="hle\kernel\archive.cpp" />
-    <ClCompile Include="hle\kernel\event.cpp" />
-    <ClCompile Include="hle\kernel\kernel.cpp" />
-    <ClCompile Include="hle\kernel\mutex.cpp" />
-    <ClCompile Include="hle\kernel\shared_memory.cpp" />
-    <ClCompile Include="hle\kernel\thread.cpp" />
-    <ClCompile Include="hle\service\apt.cpp" />
-    <ClCompile Include="hle\service\fs.cpp" />
-    <ClCompile Include="hle\service\gsp.cpp" />
-    <ClCompile Include="hle\service\hid.cpp" />
-    <ClCompile Include="hle\service\ndm.cpp" />
-    <ClCompile Include="hle\service\service.cpp" />
-    <ClCompile Include="hle\service\srv.cpp" />
-    <ClCompile Include="hle\svc.cpp" />
-    <ClCompile Include="hw\gpu.cpp" />
-    <ClCompile Include="hw\hw.cpp" />
-    <ClCompile Include="hw\ndma.cpp" />
-    <ClCompile Include="loader\elf.cpp" />
-    <ClCompile Include="loader\loader.cpp" />
-    <ClCompile Include="loader\ncch.cpp" />
-    <ClCompile Include="mem_map.cpp" />
-    <ClCompile Include="mem_map_funcs.cpp" />
-    <ClCompile Include="system.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="arm\arm_interface.h" />
-    <ClInclude Include="arm\disassembler\arm_disasm.h" />
-    <ClInclude Include="arm\disassembler\load_symbol_map.h" />
-    <ClInclude Include="arm\interpreter\armcpu.h" />
-    <ClInclude Include="arm\interpreter\armdefs.h" />
-    <ClInclude Include="arm\interpreter\armemu.h" />
-    <ClInclude Include="arm\interpreter\armmmu.h" />
-    <ClInclude Include="arm\interpreter\armos.h" />
-    <ClInclude Include="arm\interpreter\arm_interpreter.h" />
-    <ClInclude Include="arm\interpreter\arm_regformat.h" />
-    <ClInclude Include="arm\interpreter\mmu\arm1176jzf_s_mmu.h" />
-    <ClInclude Include="arm\interpreter\mmu\cache.h" />
-    <ClInclude Include="arm\interpreter\mmu\rb.h" />
-    <ClInclude Include="arm\interpreter\mmu\sa_mmu.h" />
-    <ClInclude Include="arm\interpreter\mmu\tlb.h" />
-    <ClInclude Include="arm\interpreter\mmu\wb.h" />
-    <ClInclude Include="arm\interpreter\skyeye_defs.h" />
-    <ClInclude Include="arm\interpreter\vfp\asm_vfp.h" />
-    <ClInclude Include="arm\interpreter\vfp\vfp.h" />
-    <ClInclude Include="arm\interpreter\vfp\vfp_helper.h" />
-    <ClInclude Include="core.h" />
-    <ClInclude Include="core_timing.h" />
-    <ClInclude Include="file_sys\archive.h" />
-    <ClInclude Include="file_sys\archive_romfs.h" />
-    <ClInclude Include="hle\config_mem.h" />
-    <ClInclude Include="hle\coprocessor.h" />
-    <ClInclude Include="hle\function_wrappers.h" />
-    <ClInclude Include="hle\hle.h" />
-    <ClInclude Include="hle\kernel\address_arbiter.h" />
-    <ClInclude Include="hle\kernel\archive.h" />
-    <ClInclude Include="hle\kernel\event.h" />
-    <ClInclude Include="hle\kernel\kernel.h" />
-    <ClInclude Include="hle\kernel\mutex.h" />
-    <ClInclude Include="hle\kernel\shared_memory.h" />
-    <ClInclude Include="hle\kernel\thread.h" />
-    <ClInclude Include="hle\service\apt.h" />
-    <ClInclude Include="hle\service\fs.h" />
-    <ClInclude Include="hle\service\gsp.h" />
-    <ClInclude Include="hle\service\hid.h" />
-    <ClInclude Include="hle\service\ndm.h" />
-    <ClInclude Include="hle\service\service.h" />
-    <ClInclude Include="hle\service\srv.h" />
-    <ClInclude Include="hle\svc.h" />
-    <ClInclude Include="hw\gpu.h" />
-    <ClInclude Include="hw\hw.h" />
-    <ClInclude Include="hw\ndma.h" />
-    <ClInclude Include="loader\elf.h" />
-    <ClInclude Include="loader\loader.h" />
-    <ClInclude Include="loader\ncch.h" />
-    <ClInclude Include="mem_map.h" />
-    <ClInclude Include="system.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <Text Include="CMakeLists.txt" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/src/core/core.vcxproj.filters b/src/core/core.vcxproj.filters
deleted file mode 100644
index 68ba9e50b..000000000
--- a/src/core/core.vcxproj.filters
+++ /dev/null
@@ -1,339 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="arm">
-      <UniqueIdentifier>{b84ab55c-588b-45f0-a5ba-f9ebb0442f13}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="arm\disassembler">
-      <UniqueIdentifier>{61100188-a726-4024-ab16-95ee242b446e}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="file_sys">
-      <UniqueIdentifier>{7f618562-73d1-4f55-9628-887497c27654}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="arm\interpreter">
-      <UniqueIdentifier>{cca8b763-8a80-4478-9bcc-3c979293c357}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="hw">
-      <UniqueIdentifier>{d1158fc4-3e0f-431f-9d3b-f30bbfeb4ad5}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="hle">
-      <UniqueIdentifier>{8b62769e-3e2a-4a57-a7bc-b3b2933c2bc7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="hle\service">
-      <UniqueIdentifier>{812c5189-ca49-4704-b842-3ffad09092d3}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="arm\interpreter\vfp">
-      <UniqueIdentifier>{de62238f-a28e-4a33-8495-23fed6784588}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="arm\interpreter\mmu">
-      <UniqueIdentifier>{13ef9860-2ba0-47e9-a93d-b4052adab269}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="hle\kernel">
-      <UniqueIdentifier>{8089d94b-5faa-43dc-854b-ffd2fa2e7fe3}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="loader">
-      <UniqueIdentifier>{491d5558-5f3a-4283-8ba4-0a58b1984e37}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="arm\disassembler\arm_disasm.cpp">
-      <Filter>arm\disassembler</Filter>
-    </ClCompile>
-    <ClCompile Include="arm\interpreter\arm_interpreter.cpp">
-      <Filter>arm\interpreter</Filter>
-    </ClCompile>
-    <ClCompile Include="arm\interpreter\armemu.cpp">
-      <Filter>arm\interpreter</Filter>
-    </ClCompile>
-    <ClCompile Include="arm\interpreter\arminit.cpp">
-      <Filter>arm\interpreter</Filter>
-    </ClCompile>
-    <ClCompile Include="arm\interpreter\armmmu.cpp">
-      <Filter>arm\interpreter</Filter>
-    </ClCompile>
-    <ClCompile Include="arm\interpreter\armos.cpp">
-      <Filter>arm\interpreter</Filter>
-    </ClCompile>
-    <ClCompile Include="arm\interpreter\armsupp.cpp">
-      <Filter>arm\interpreter</Filter>
-    </ClCompile>
-    <ClCompile Include="arm\interpreter\armvirt.cpp">
-      <Filter>arm\interpreter</Filter>
-    </ClCompile>
-    <ClCompile Include="arm\interpreter\thumbemu.cpp">
-      <Filter>arm\interpreter</Filter>
-    </ClCompile>
-    <ClCompile Include="hw\hw.cpp">
-      <Filter>hw</Filter>
-    </ClCompile>
-    <ClCompile Include="core.cpp" />
-    <ClCompile Include="mem_map.cpp" />
-    <ClCompile Include="mem_map_funcs.cpp" />
-    <ClCompile Include="system.cpp" />
-    <ClCompile Include="core_timing.cpp" />
-    <ClCompile Include="hle\hle.cpp">
-      <Filter>hle</Filter>
-    </ClCompile>
-    <ClCompile Include="hle\service\service.cpp">
-      <Filter>hle\service</Filter>
-    </ClCompile>
-    <ClCompile Include="hle\service\apt.cpp">
-      <Filter>hle\service</Filter>
-    </ClCompile>
-    <ClCompile Include="hle\service\srv.cpp">
-      <Filter>hle\service</Filter>
-    </ClCompile>
-    <ClCompile Include="hle\service\gsp.cpp">
-      <Filter>hle\service</Filter>
-    </ClCompile>
-    <ClCompile Include="hle\service\hid.cpp">
-      <Filter>hle\service</Filter>
-    </ClCompile>
-    <ClCompile Include="hw\ndma.cpp">
-      <Filter>hw</Filter>
-    </ClCompile>
-    <ClCompile Include="hw\gpu.cpp">
-      <Filter>hw</Filter>
-    </ClCompile>
-    <ClCompile Include="arm\disassembler\load_symbol_map.cpp">
-      <Filter>arm\disassembler</Filter>
-    </ClCompile>
-    <ClCompile Include="hle\coprocessor.cpp">
-      <Filter>hle</Filter>
-    </ClCompile>
-    <ClCompile Include="hle\config_mem.cpp">
-      <Filter>hle</Filter>
-    </ClCompile>
-    <ClCompile Include="arm\interpreter\vfp\vfp.cpp">
-      <Filter>arm\interpreter\vfp</Filter>
-    </ClCompile>
-    <ClCompile Include="arm\interpreter\vfp\vfpinstr.cpp">
-      <Filter>arm\interpreter\vfp</Filter>
-    </ClCompile>
-    <ClCompile Include="arm\interpreter\vfp\vfpdouble.cpp">
-      <Filter>arm\interpreter\vfp</Filter>
-    </ClCompile>
-    <ClCompile Include="arm\interpreter\vfp\vfpsingle.cpp">
-      <Filter>arm\interpreter\vfp</Filter>
-    </ClCompile>
-    <ClCompile Include="arm\interpreter\mmu\arm1176jzf_s_mmu.cpp">
-      <Filter>arm\interpreter\mmu</Filter>
-    </ClCompile>
-    <ClCompile Include="arm\interpreter\mmu\xscale_copro.cpp">
-      <Filter>arm\interpreter\mmu</Filter>
-    </ClCompile>
-    <ClCompile Include="arm\interpreter\mmu\sa_mmu.cpp">
-      <Filter>arm\interpreter\mmu</Filter>
-    </ClCompile>
-    <ClCompile Include="arm\interpreter\mmu\cache.cpp">
-      <Filter>arm\interpreter\mmu</Filter>
-    </ClCompile>
-    <ClCompile Include="arm\interpreter\mmu\rb.cpp">
-      <Filter>arm\interpreter\mmu</Filter>
-    </ClCompile>
-    <ClCompile Include="arm\interpreter\mmu\tlb.cpp">
-      <Filter>arm\interpreter\mmu</Filter>
-    </ClCompile>
-    <ClCompile Include="arm\interpreter\mmu\wb.cpp">
-      <Filter>arm\interpreter\mmu</Filter>
-    </ClCompile>
-    <ClCompile Include="arm\interpreter\mmu\maverick.cpp">
-      <Filter>arm\interpreter\mmu</Filter>
-    </ClCompile>
-    <ClCompile Include="hle\kernel\kernel.cpp">
-      <Filter>hle\kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="hle\kernel\thread.cpp">
-      <Filter>hle\kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="hle\svc.cpp">
-      <Filter>hle</Filter>
-    </ClCompile>
-    <ClCompile Include="hle\kernel\mutex.cpp">
-      <Filter>hle\kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="arm\interpreter\armcopro.cpp">
-      <Filter>arm\interpreter</Filter>
-    </ClCompile>
-    <ClCompile Include="hle\kernel\event.cpp">
-      <Filter>hle\kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="hle\service\ndm.cpp">
-      <Filter>hle\service</Filter>
-    </ClCompile>
-    <ClCompile Include="loader\loader.cpp">
-      <Filter>loader</Filter>
-    </ClCompile>
-    <ClCompile Include="loader\ncch.cpp">
-      <Filter>loader</Filter>
-    </ClCompile>
-    <ClCompile Include="loader\elf.cpp">
-      <Filter>loader</Filter>
-    </ClCompile>
-    <ClCompile Include="hle\kernel\archive.cpp">
-      <Filter>hle\kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="hle\service\fs.cpp">
-      <Filter>hle\service</Filter>
-    </ClCompile>
-    <ClCompile Include="file_sys\archive_romfs.cpp">
-      <Filter>file_sys</Filter>
-    </ClCompile>
-    <ClCompile Include="hle\kernel\shared_memory.cpp">
-      <Filter>hle\kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="hle\kernel\address_arbiter.cpp">
-      <Filter>hle\kernel</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="arm\disassembler\arm_disasm.h">
-      <Filter>arm\disassembler</Filter>
-    </ClInclude>
-    <ClInclude Include="arm\interpreter\arm_interpreter.h">
-      <Filter>arm\interpreter</Filter>
-    </ClInclude>
-    <ClInclude Include="arm\interpreter\arm_regformat.h">
-      <Filter>arm\interpreter</Filter>
-    </ClInclude>
-    <ClInclude Include="arm\interpreter\armcpu.h">
-      <Filter>arm\interpreter</Filter>
-    </ClInclude>
-    <ClInclude Include="arm\interpreter\armdefs.h">
-      <Filter>arm\interpreter</Filter>
-    </ClInclude>
-    <ClInclude Include="arm\interpreter\armemu.h">
-      <Filter>arm\interpreter</Filter>
-    </ClInclude>
-    <ClInclude Include="arm\interpreter\armmmu.h">
-      <Filter>arm\interpreter</Filter>
-    </ClInclude>
-    <ClInclude Include="arm\interpreter\armos.h">
-      <Filter>arm\interpreter</Filter>
-    </ClInclude>
-    <ClInclude Include="arm\interpreter\skyeye_defs.h">
-      <Filter>arm\interpreter</Filter>
-    </ClInclude>
-    <ClInclude Include="hw\hw.h">
-      <Filter>hw</Filter>
-    </ClInclude>
-    <ClInclude Include="arm\arm_interface.h">
-      <Filter>arm</Filter>
-    </ClInclude>
-    <ClInclude Include="core.h" />
-    <ClInclude Include="core_timing.h" />
-    <ClInclude Include="mem_map.h" />
-    <ClInclude Include="system.h" />
-    <ClInclude Include="hle\hle.h">
-      <Filter>hle</Filter>
-    </ClInclude>
-    <ClInclude Include="hle\function_wrappers.h">
-      <Filter>hle</Filter>
-    </ClInclude>
-    <ClInclude Include="hle\service\service.h">
-      <Filter>hle\service</Filter>
-    </ClInclude>
-    <ClInclude Include="hle\service\apt.h">
-      <Filter>hle\service</Filter>
-    </ClInclude>
-    <ClInclude Include="hle\service\srv.h">
-      <Filter>hle\service</Filter>
-    </ClInclude>
-    <ClInclude Include="hle\service\gsp.h">
-      <Filter>hle\service</Filter>
-    </ClInclude>
-    <ClInclude Include="hle\service\hid.h">
-      <Filter>hle\service</Filter>
-    </ClInclude>
-    <ClInclude Include="hw\ndma.h">
-      <Filter>hw</Filter>
-    </ClInclude>
-    <ClInclude Include="hw\gpu.h">
-      <Filter>hw</Filter>
-    </ClInclude>
-    <ClInclude Include="arm\disassembler\load_symbol_map.h">
-      <Filter>arm\disassembler</Filter>
-    </ClInclude>
-    <ClInclude Include="hle\coprocessor.h">
-      <Filter>hle</Filter>
-    </ClInclude>
-    <ClInclude Include="hle\config_mem.h">
-      <Filter>hle</Filter>
-    </ClInclude>
-    <ClInclude Include="arm\interpreter\vfp\asm_vfp.h">
-      <Filter>arm\interpreter\vfp</Filter>
-    </ClInclude>
-    <ClInclude Include="arm\interpreter\vfp\vfp.h">
-      <Filter>arm\interpreter\vfp</Filter>
-    </ClInclude>
-    <ClInclude Include="arm\interpreter\vfp\vfp_helper.h">
-      <Filter>arm\interpreter\vfp</Filter>
-    </ClInclude>
-    <ClInclude Include="arm\interpreter\mmu\arm1176jzf_s_mmu.h">
-      <Filter>arm\interpreter\mmu</Filter>
-    </ClInclude>
-    <ClInclude Include="arm\interpreter\mmu\cache.h">
-      <Filter>arm\interpreter\mmu</Filter>
-    </ClInclude>
-    <ClInclude Include="arm\interpreter\mmu\rb.h">
-      <Filter>arm\interpreter\mmu</Filter>
-    </ClInclude>
-    <ClInclude Include="arm\interpreter\mmu\tlb.h">
-      <Filter>arm\interpreter\mmu</Filter>
-    </ClInclude>
-    <ClInclude Include="arm\interpreter\mmu\wb.h">
-      <Filter>arm\interpreter\mmu</Filter>
-    </ClInclude>
-    <ClInclude Include="arm\interpreter\mmu\sa_mmu.h">
-      <Filter>arm\interpreter\mmu</Filter>
-    </ClInclude>
-    <ClInclude Include="hle\kernel\kernel.h">
-      <Filter>hle\kernel</Filter>
-    </ClInclude>
-    <ClInclude Include="hle\kernel\thread.h">
-      <Filter>hle\kernel</Filter>
-    </ClInclude>
-    <ClInclude Include="hle\svc.h">
-      <Filter>hle</Filter>
-    </ClInclude>
-    <ClInclude Include="hle\kernel\mutex.h">
-      <Filter>hle\kernel</Filter>
-    </ClInclude>
-    <ClInclude Include="hle\kernel\event.h">
-      <Filter>hle\kernel</Filter>
-    </ClInclude>
-    <ClInclude Include="hle\service\ndm.h">
-      <Filter>hle\service</Filter>
-    </ClInclude>
-    <ClInclude Include="loader\loader.h">
-      <Filter>loader</Filter>
-    </ClInclude>
-    <ClInclude Include="loader\ncch.h">
-      <Filter>loader</Filter>
-    </ClInclude>
-    <ClInclude Include="loader\elf.h">
-      <Filter>loader</Filter>
-    </ClInclude>
-    <ClInclude Include="hle\kernel\archive.h">
-      <Filter>hle\kernel</Filter>
-    </ClInclude>
-    <ClInclude Include="hle\service\fs.h">
-      <Filter>hle\service</Filter>
-    </ClInclude>
-    <ClInclude Include="file_sys\archive.h">
-      <Filter>file_sys</Filter>
-    </ClInclude>
-    <ClInclude Include="file_sys\archive_romfs.h">
-      <Filter>file_sys</Filter>
-    </ClInclude>
-    <ClInclude Include="hle\kernel\shared_memory.h">
-      <Filter>hle\kernel</Filter>
-    </ClInclude>
-    <ClInclude Include="hle\kernel\address_arbiter.h">
-      <Filter>hle\kernel</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Text Include="CMakeLists.txt" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
-- 
cgit v1.2.3