From 862eb7c48b2f02760968b08aceb9ebc7d7ec304b Mon Sep 17 00:00:00 2001
From: Nicholas <nicholas@zilsoft.com>
Date: Tue, 27 Jan 2015 16:07:44 +1100
Subject: [PATCH] Add support for Visual Studio 2013

---
 .gitignore                                    |   73 +-
 Project64.vs2010.sln => Project64.vs2013.sln  |    0
 PropertySheets/Debug.props                    |   32 +
 PropertySheets/Release.props                  |   30 +
 PropertySheets/Win32.Debug.props              |   13 +
 PropertySheets/Win32.Release.props            |   13 +
 PropertySheets/Win32.props                    |  193 +++
 Source/3rd Party/7zip/7zip.vcxproj            |   82 +
 Source/3rd Party/7zip/7zip.vcxproj.filters    |   83 +
 Source/3rd Party/WTL/WTL.vcxproj              |   68 +
 Source/3rd Party/WTL/WTL.vcxproj.filters      |   71 +
 Source/3rd Party/wx/include/wx/platform.h     |    2 +
 Source/3rd Party/wx/wx_base.vcxproj           |  399 +++++
 Source/3rd Party/wx/wx_base.vcxproj.filters   |  880 ++++++++++
 Source/3rd Party/wx/wx_core.vcxproj           |  631 +++++++
 Source/3rd Party/wx/wx_core.vcxproj.filters   | 1507 +++++++++++++++++
 Source/3rd Party/wx/wx_wxjpeg.vcxproj         |  114 ++
 Source/3rd Party/wx/wx_wxjpeg.vcxproj.filters |  148 ++
 Source/3rd Party/wx/wx_wxpng.vcxproj          |   84 +
 Source/3rd Party/wx/wx_wxpng.vcxproj.filters  |   55 +
 Source/3rd Party/wx/wx_wxzlib.vcxproj         |   77 +
 Source/3rd Party/wx/wx_wxzlib.vcxproj.filters |   46 +
 Source/3rd Party/zlib/zlib.vcxproj            |   98 ++
 Source/3rd Party/zlib/zlib.vcxproj.filters    |  138 ++
 Source/Common/Common.vcxproj                  |   75 +
 Source/Common/Common.vcxproj.filters          |   98 ++
 Source/Common/File Class.cpp                  |    5 +-
 Source/Common/md5.cpp                         |   10 +-
 Source/Common/path.cpp                        |   11 +-
 Source/Glide64/Glide64.vcxproj                |  189 +++
 Source/Glide64/Glide64.vcxproj.filters        |  191 +++
 Source/GlideHQ/GlideHQ.vcxproj                |  103 ++
 Source/GlideHQ/GlideHQ.vcxproj.filters        |  125 ++
 Source/Glitch64/Glitch64.vcxproj              |   73 +
 Source/Glitch64/Glitch64.vcxproj.filters      |   38 +
 Source/Installer/Installer.vcxproj            |   75 +
 Source/Installer/Installer.vcxproj.filters    |   27 +
 Source/Project64/N64 System/Cheat Class.cpp   |  104 +-
 Source/Project64/N64 System/Cheat Class.h     |   36 +-
 .../Debugger/Debugger - Memory Dump.cpp       |    8 +-
 .../N64 System/Debugger/Debugger - TLB.h      |   21 +-
 .../N64 System/Mips/Memory Virtual Mem.cpp    |    6 -
 Source/Project64/N64 System/N64 Class.cpp     |    6 +-
 Source/Project64/N64 System/N64 Class.h       |    6 +-
 .../N64 System/Rom Information Class.cpp      |    4 +-
 .../N64 System/Rom Information Class.h        |    4 +-
 Source/Project64/Plugins/GFX plugin.cpp       |    4 +-
 Source/Project64/Plugins/GFX plugin.h         |   14 +-
 Source/Project64/Plugins/RSP Plugin.h         |   10 +-
 Source/Project64/Project64.vcxproj            |  343 ++++
 Source/Project64/Project64.vcxproj.filters    |  843 +++++++++
 .../SettingsType-RomDatabaseSetting.cpp       |    8 +-
 Source/Project64/User Interface.h             |    9 +-
 Source/Project64/User Interface/Gui Class.cpp |   10 +-
 Source/Project64/User Interface/Gui Class.h   |    8 +-
 .../User Interface/Main Menu Class.cpp        |   10 +-
 .../User Interface/Main Menu Class.h          |    6 +-
 .../Project64/User Interface/Menu Class.cpp   |    6 +-
 Source/Project64/User Interface/Menu Class.h  |   10 +-
 .../User Interface/Rom Browser Class.cpp      |   11 +-
 Source/Project64/User Interface/Rom Browser.h |   12 +-
 Source/Project64/WTL App.h                    |    8 +-
 Source/RSP/RSP.vcxproj                        |  117 ++
 Source/RSP/RSP.vcxproj.filters                |  134 ++
 Source/RSP/X86.c                              |    6 +-
 Source/Settings/Settings.vcxproj              |   60 +
 Source/Settings/Settings.vcxproj.filters      |   23 +
 Source/SortRdb/SortRdb.vcxproj                |   71 +
 Source/SortRdb/SortRdb.vcxproj.filters        |   22 +
 Source/nragev20/NRage_Input_V2.vcxproj        |  104 ++
 .../nragev20/NRage_Input_V2.vcxproj.filters   |  103 ++
 71 files changed, 7780 insertions(+), 224 deletions(-)
 rename Project64.vs2010.sln => Project64.vs2013.sln (100%)
 create mode 100644 PropertySheets/Debug.props
 create mode 100644 PropertySheets/Release.props
 create mode 100644 PropertySheets/Win32.Debug.props
 create mode 100644 PropertySheets/Win32.Release.props
 create mode 100644 PropertySheets/Win32.props
 create mode 100644 Source/3rd Party/7zip/7zip.vcxproj
 create mode 100644 Source/3rd Party/7zip/7zip.vcxproj.filters
 create mode 100644 Source/3rd Party/WTL/WTL.vcxproj
 create mode 100644 Source/3rd Party/WTL/WTL.vcxproj.filters
 create mode 100644 Source/3rd Party/wx/wx_base.vcxproj
 create mode 100644 Source/3rd Party/wx/wx_base.vcxproj.filters
 create mode 100644 Source/3rd Party/wx/wx_core.vcxproj
 create mode 100644 Source/3rd Party/wx/wx_core.vcxproj.filters
 create mode 100644 Source/3rd Party/wx/wx_wxjpeg.vcxproj
 create mode 100644 Source/3rd Party/wx/wx_wxjpeg.vcxproj.filters
 create mode 100644 Source/3rd Party/wx/wx_wxpng.vcxproj
 create mode 100644 Source/3rd Party/wx/wx_wxpng.vcxproj.filters
 create mode 100644 Source/3rd Party/wx/wx_wxzlib.vcxproj
 create mode 100644 Source/3rd Party/wx/wx_wxzlib.vcxproj.filters
 create mode 100644 Source/3rd Party/zlib/zlib.vcxproj
 create mode 100644 Source/3rd Party/zlib/zlib.vcxproj.filters
 create mode 100644 Source/Common/Common.vcxproj
 create mode 100644 Source/Common/Common.vcxproj.filters
 create mode 100644 Source/Glide64/Glide64.vcxproj
 create mode 100644 Source/Glide64/Glide64.vcxproj.filters
 create mode 100644 Source/GlideHQ/GlideHQ.vcxproj
 create mode 100644 Source/GlideHQ/GlideHQ.vcxproj.filters
 create mode 100644 Source/Glitch64/Glitch64.vcxproj
 create mode 100644 Source/Glitch64/Glitch64.vcxproj.filters
 create mode 100644 Source/Installer/Installer.vcxproj
 create mode 100644 Source/Installer/Installer.vcxproj.filters
 create mode 100644 Source/Project64/Project64.vcxproj
 create mode 100644 Source/Project64/Project64.vcxproj.filters
 create mode 100644 Source/RSP/RSP.vcxproj
 create mode 100644 Source/RSP/RSP.vcxproj.filters
 create mode 100644 Source/Settings/Settings.vcxproj
 create mode 100644 Source/Settings/Settings.vcxproj.filters
 create mode 100644 Source/SortRdb/SortRdb.vcxproj
 create mode 100644 Source/SortRdb/SortRdb.vcxproj.filters
 create mode 100644 Source/nragev20/NRage_Input_V2.vcxproj
 create mode 100644 Source/nragev20/NRage_Input_V2.vcxproj.filters

diff --git a/.gitignore b/.gitignore
index 26938d1ac..24ec1ab77 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,31 +1,7 @@
 *.user
-/Bin/Debug/SyncPlugin
-/Bin/Debug/lib
-/Bin/Debug/Logs
-/Bin/Debug/map
-/Bin/Debug/pdb
-/Bin/Debug/Save
-/Bin/Debug/Screenshots
-/Project64.ncb
-/Project64.suo
-/Save
-/build
-/Bin/Release/Project64.exe
-/Bin/Release/lib
-/Bin/Release/Logs
-/Bin/Release/map
-/Bin/Release/pdb
-/Bin/Release/Save
-/Bin/Release/Screenshots
-/Bin/Release/SyncPlugin
-/Bin/Release/d3d syslog.txt
-/Bin/Release/d3d syslog.txt.bak
-/Plugin/RSP/RSP_d 1.7.dll
-/Plugin/RSP/lib
-/Plugin/RSP/map
-/Plugin/RSP/pdb
-/Plugin/RSP/RSP 1.7.dll
-/Source/Project64/User Interface/UI Resources.aps
+/*.opensdf
+/*.sdf
+/*.suo
 /Bin/Beta Release/Config/Project64.cache3
 /Bin/Beta Release/Config/Project64.cfg
 /Bin/Beta Release/Config/Project64.cht
@@ -34,16 +10,23 @@
 /Bin/Beta Release/Config/Project64.rdx
 /Bin/Beta Release/Config/Project64.zcache
 /Bin/Beta Release/Logs/Project64.log
-/Bin/Beta Release/Project64.exe
 /Bin/Beta Release/map/Project64.map
 /Bin/Beta Release/pdb/Project64.pdb
+/Bin/Beta Release/Project64.exe
 /Bin/Debug/Config/Project64.cache3
 /Bin/Debug/Config/Project64.cht
 /Bin/Debug/Config/Project64.rdb
 /Bin/Debug/Config/Project64.rdn
 /Bin/Debug/Config/Project64.rdx
 /Bin/Debug/Config/Project64.zcache
+/Bin/Debug/lib
+/Bin/Debug/Logs
+/Bin/Debug/map
+/Bin/Debug/pdb
 /Bin/Debug/Project64.exe
+/Bin/Debug/Save
+/Bin/Debug/Screenshots
+/Bin/Debug/SyncPlugin
 /Bin/External Release/Config/Project64.cache3
 /Bin/External Release/Config/Project64.cfg
 /Bin/External Release/Config/Project64.cht
@@ -51,14 +34,25 @@
 /Bin/External Release/Config/Project64.rdn
 /Bin/External Release/Config/Project64.rdx
 /Bin/External Release/Config/Project64.zcache
+/Bin/External Release/d3d syslog.txt
 /Bin/External Release/Logs/CPUoutput.log
 /Bin/External Release/Logs/Project64.log
 /Bin/External Release/Logs/RSP_x86Log.txt
 /Bin/External Release/Project64.exe
-/Bin/External Release/d3d syslog.txt
-/Source/3rd Party/wx/lib/vc_lib/mswud/wx/msw/rcdefs.h
-/Plugin/GFX/PJ64Glide64.dll
-/Plugin/GFX/PJ64Glide64_d.dll
+/Bin/Release/d3d syslog.txt
+/Bin/Release/d3d syslog.txt.bak
+/Bin/Release/lib
+/Bin/Release/Logs
+/Bin/Release/map
+/Bin/Release/pdb
+/Bin/Release/Project64.exe
+/Bin/Release/Save
+/Bin/Release/Screenshots
+/Bin/Release/Setup Project64*.exe
+/Bin/Release/SyncPlugin
+/build
+/Config/Project64.cfg
+/ipch
 /Plugin/GFX/lib/PJ64Glide64.exp
 /Plugin/GFX/lib/PJ64Glide64.lib
 /Plugin/GFX/lib/PJ64Glide64_d.exp
@@ -67,5 +61,18 @@
 /Plugin/GFX/map/PJ64Glide64_d.map
 /Plugin/GFX/pdb/PJ64Glide64.pdb
 /Plugin/GFX/pdb/PJ64Glide64_d.pdb
+/Plugin/GFX/PJ64Glide64.dll
+/Plugin/GFX/PJ64Glide64_d.dll
+/Plugin/RSP/lib
+/Plugin/RSP/map
+/Plugin/RSP/pdb
+/Plugin/RSP/RSP 1.7.dll
+/Plugin/RSP/RSP_d 1.7.dll
+/Project64.ncb
+/Project64.suo
+/Save
+/Source/3rd Party/wx/lib/vc_lib/mswu/wx/msw/rcdefs.h
+/Source/3rd Party/wx/lib/vc_lib/mswud/wx/msw/rcdefs.h
 /Source/Glide64/Glide64.aps
-/Textures
+/Source/Project64/User Interface/UI Resources.aps
+/Textures
\ No newline at end of file
diff --git a/Project64.vs2010.sln b/Project64.vs2013.sln
similarity index 100%
rename from Project64.vs2010.sln
rename to Project64.vs2013.sln
diff --git a/PropertySheets/Debug.props b/PropertySheets/Debug.props
new file mode 100644
index 000000000..b2812cc1e
--- /dev/null
+++ b/PropertySheets/Debug.props
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PreprocessorDefinitions>_DEBUG;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Optimization>Disabled</Optimization>
+      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+      <IntrinsicFunctions>false</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
+      <OmitFramePointers>false</OmitFramePointers>
+      <EnableFiberSafeOptimizations>false</EnableFiberSafeOptimizations>
+      <WholeProgramOptimization>false</WholeProgramOptimization>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <SmallerTypeCheck>true</SmallerTypeCheck>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <ProfileGuidedDatabase />
+    </Link>
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </Midl>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup />
+</Project>
\ No newline at end of file
diff --git a/PropertySheets/Release.props b/PropertySheets/Release.props
new file mode 100644
index 000000000..b22c81a3e
--- /dev/null
+++ b/PropertySheets/Release.props
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <Optimization>MinSpace</Optimization>
+      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+      <IntrinsicFunctions>false</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
+      <OmitFramePointers>false</OmitFramePointers>
+      <EnableFiberSafeOptimizations>false</EnableFiberSafeOptimizations>
+      <WholeProgramOptimization>false</WholeProgramOptimization>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SmallerTypeCheck>false</SmallerTypeCheck>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <ProfileGuidedDatabase />
+    </Link>
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </Midl>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup />
+</Project>
\ No newline at end of file
diff --git a/PropertySheets/Win32.Debug.props b/PropertySheets/Win32.Debug.props
new file mode 100644
index 000000000..16f18ab90
--- /dev/null
+++ b/PropertySheets/Win32.Debug.props
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets">
+    <Import Project="Win32.props" />
+    <Import Project="Debug.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>
+  </PropertyGroup>
+  <ItemDefinitionGroup />
+  <ItemGroup />
+</Project>
\ No newline at end of file
diff --git a/PropertySheets/Win32.Release.props b/PropertySheets/Win32.Release.props
new file mode 100644
index 000000000..75f0422da
--- /dev/null
+++ b/PropertySheets/Win32.Release.props
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets">
+    <Import Project="Win32.props" />
+    <Import Project="Release.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>
+  </PropertyGroup>
+  <ItemDefinitionGroup />
+  <ItemGroup />
+</Project>
\ No newline at end of file
diff --git a/PropertySheets/Win32.props b/PropertySheets/Win32.props
new file mode 100644
index 000000000..a6d0c781e
--- /dev/null
+++ b/PropertySheets/Win32.props
@@ -0,0 +1,193 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)build\$(Configuration)\$(ProjectName)\</IntDir>
+    <ExtensionsToDeleteOnClean>*.obj;*.ilk;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;*.meta;$(TargetPath);$(ExtensionsToDeleteOnClean)</ExtensionsToDeleteOnClean>
+    <IgnoreImportLibrary>false</IgnoreImportLibrary>
+    <LinkIncremental>false</LinkIncremental>
+    <LinkDelaySign>false</LinkDelaySign>
+    <EmbedManifest>true</EmbedManifest>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(ConfigurationType)'=='StaticLibrary'" >
+    <OutDir>$(SolutionDir)bin\$(Configuration)\lib\</OutDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PreprocessorDefinitions>WIN32;_WIN32;_WINDOWS;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <PropertyGroup Label="UserMacros">
+    <ROOT>$(SolutionDir)</ROOT>
+    <SRC>$(ROOT)Source\</SRC>
+  </PropertyGroup>
+  <ItemGroup>
+    <BuildMacro Include="ROOT">
+      <Value>$(ROOT)</Value>
+    </BuildMacro>
+    <BuildMacro Include="SRC">
+      <Value>$(SRC)</Value>
+    </BuildMacro>
+  </ItemGroup>
+  <PropertyGroup Label="UserMacros" />
+  <ItemDefinitionGroup>
+    <BuildLog>
+      <Path>$(IntDir)BuildLog.htm</Path>
+    </BuildLog>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(OutDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+    <ClCompile>
+      <AdditionalIncludeDirectories>.\;..\;..\3rd Party;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <IgnoreStandardIncludePath>false</IgnoreStandardIncludePath>
+      <PreprocessToFile>false</PreprocessToFile>
+      <PreprocessSuppressLineNumbers>false</PreprocessSuppressLineNumbers>
+      <PreprocessKeepComments>false</PreprocessKeepComments>
+      <StringPooling>true</StringPooling>
+      <MinimalRebuild>true</MinimalRebuild>
+      <ExceptionHandling>Async</ExceptionHandling>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+      <SmallerTypeCheck>false</SmallerTypeCheck>
+      <StructMemberAlignment>Default</StructMemberAlignment>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
+      <FloatingPointModel>Precise</FloatingPointModel>
+      <FloatingPointExceptions>false</FloatingPointExceptions>
+      <DisableLanguageExtensions>false</DisableLanguageExtensions>
+      <AdditionalOptions />
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      <OpenMPSupport>false</OpenMPSupport>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>StdAfx.h</PrecompiledHeaderFile>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile>
+      <ExpandAttributedSource>false</ExpandAttributedSource>
+      <AssemblerOutput />
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)vc90.pdb</ProgramDataBaseFileName>
+      <GenerateXMLDocumentationFiles>false</GenerateXMLDocumentationFiles>
+      <XMLDocumentationFileName>$(IntDir)</XMLDocumentationFileName>
+      <BrowseInformation />
+      <BrowseInformationFile>$(IntDir)</BrowseInformationFile>
+      <WarningLevel>Level4</WarningLevel>
+      <TreatWarningAsError>false</TreatWarningAsError>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CallingConvention>Cdecl</CallingConvention>
+      <CompileAs>Default</CompileAs>
+      <ShowIncludes>false</ShowIncludes>
+      <UndefineAllPreprocessorDefinitions>false</UndefineAllPreprocessorDefinitions>
+      <EnablePREfast>false</EnablePREfast>
+      <UseFullPaths>false</UseFullPaths>
+      <OmitDefaultLibName>false</OmitDefaultLibName>
+      <ErrorReporting>Prompt</ErrorReporting>
+    </ClCompile>
+    <Lib>
+      <OutputFile>$(OutDir)$(ProjectName).lib</OutputFile>
+      <UseUnicodeResponseFiles>true</UseUnicodeResponseFiles>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+    </Lib>
+    <ProjectReference>
+      <LinkLibraryDependencies>true</LinkLibraryDependencies>
+      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
+    </ProjectReference>
+    <Link>
+      <RegisterOutput>false</RegisterOutput>
+      <PerUserRedirection>false</PerUserRedirection>
+      <AdditionalOptions>/IGNORE:4199 /OPT:ICF=3 %(AdditionalOptions)</AdditionalOptions>
+      <ShowProgress>NotSet</ShowProgress>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ManifestFile>$(IntDir)$(TargetFileName).intermediate.manifest</ManifestFile>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <ModuleDefinitionFile />
+      <DelayLoadDLLs>advapi32.dll;userenv.dll;shell32.dll;shlwapi.dll;ws2_32.dll;version.dll;wtsapi32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+      <IgnoreEmbeddedIDL>false</IgnoreEmbeddedIDL>
+      <TypeLibraryResourceID>1</TypeLibraryResourceID>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AssemblyDebug />
+      <ProgramDatabaseFile>$(TargetDir)pdb/$(TargetName).pdb</ProgramDatabaseFile>
+      <GenerateMapFile>true</GenerateMapFile>
+      <MapFileName>$(TargetDir)map/$(TargetName).map</MapFileName>
+      <MapExports>false</MapExports>
+      <HeapReserveSize>0</HeapReserveSize>
+      <HeapCommitSize>0</HeapCommitSize>
+      <StackReserveSize>0</StackReserveSize>
+      <StackCommitSize>0</StackCommitSize>
+      <LargeAddressAware />
+      <TerminalServerAware />
+      <SwapRunFromCD>false</SwapRunFromCD>
+      <SwapRunFromNET>false</SwapRunFromNET>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <ProfileGuidedDatabase />
+      <NoEntryPoint>false</NoEntryPoint>
+      <SetChecksum>false</SetChecksum>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <FixedBaseAddress>false</FixedBaseAddress>
+      <DataExecutionPrevention />
+      <TurnOffAssemblyGeneration>false</TurnOffAssemblyGeneration>
+      <SupportUnloadOfDelayLoadedDLL>false</SupportUnloadOfDelayLoadedDLL>
+      <ImportLibrary>$(TargetDir)lib/$(TargetName).lib</ImportLibrary>
+      <Profile>false</Profile>
+      <CLRThreadAttribute>DefaultThreadingAttribute</CLRThreadAttribute>
+      <CLRImageType>Default</CLRImageType>
+      <LinkErrorReporting>PromptImmediately</LinkErrorReporting>
+      <CLRUnmanagedCodeCheck>false</CLRUnmanagedCodeCheck>
+    </Link>
+    <Midl>
+      <AdditionalIncludeDirectories>.;$(SRC);$(SRC)\3rd Party;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <IgnoreStandardIncludePath>false</IgnoreStandardIncludePath>
+      <MkTypLibCompatible>false</MkTypLibCompatible>
+      <WarningLevel>3</WarningLevel>
+      <WarnAsError>false</WarnAsError>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DefaultCharType>Unsigned</DefaultCharType>
+      <GenerateStublessProxies>true</GenerateStublessProxies>
+      <GenerateTypeLibrary>true</GenerateTypeLibrary>
+      <TypeLibraryName>$(IntDir)%(Filename).tlb</TypeLibraryName>
+      <HeaderFileName>%(Filename)_h.h</HeaderFileName>
+      <DllDataFileName />
+      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
+      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
+      <EnableErrorChecks>All</EnableErrorChecks>
+      <ErrorCheckAllocations>false</ErrorCheckAllocations>
+      <ErrorCheckBounds>false</ErrorCheckBounds>
+      <ErrorCheckEnumRange>false</ErrorCheckEnumRange>
+      <ErrorCheckRefPointers>false</ErrorCheckRefPointers>
+      <ErrorCheckStubData>false</ErrorCheckStubData>
+      <ValidateAllParameters>true</ValidateAllParameters>
+      <StructMemberAlignment>NotSet</StructMemberAlignment>
+    </Midl>
+    <ResourceCompile>
+      <Culture>0x0000</Culture>
+      <IgnoreStandardIncludePath>false</IgnoreStandardIncludePath>
+      <ShowProgress>false</ShowProgress>
+      <ResourceOutputFileName>$(IntDir)%(Filename).res</ResourceOutputFileName>
+    </ResourceCompile>
+    <Manifest>
+      <OutputManifestFile>$(IntDir)$(TargetFileName).embed.manifest</OutputManifestFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <VerboseOutput>false</VerboseOutput>
+      <GenerateCatalogFiles>false</GenerateCatalogFiles>
+      <UpdateFileHashes>false</UpdateFileHashes>
+    </Manifest>
+    <ManifestResourceCompile>
+      <ResourceOutputFileName>$(IntDir)$(TargetFileName).embed.manifest.res</ResourceOutputFileName>
+    </ManifestResourceCompile>
+    <Xdcmake>
+      <DocumentLibraryDependencies>true</DocumentLibraryDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(TargetDir)$(TargetName).xml</OutputFile>
+    </Xdcmake>
+  </ItemDefinitionGroup>
+  <ItemGroup />
+</Project>
\ No newline at end of file
diff --git a/Source/3rd Party/7zip/7zip.vcxproj b/Source/3rd Party/7zip/7zip.vcxproj
new file mode 100644
index 000000000..2dd6532b9
--- /dev/null
+++ b/Source/3rd Party/7zip/7zip.vcxproj	
@@ -0,0 +1,82 @@
+<?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="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{3326E128-33AF-422C-BB7C-67CC6B915610}</ProjectGuid>
+    <RootNamespace>7zip</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(SolutionDir)PropertySheets/Win32.Release.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(SolutionDir)PropertySheets/Win32.Debug.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader />
+      <DisableSpecificWarnings>4127;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PrecompiledHeader />
+      <DisableSpecificWarnings>4127;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="7zAlloc.c" />
+    <ClCompile Include="7zBuffer.c" />
+    <ClCompile Include="7zCrc.c" />
+    <ClCompile Include="7zDecode.c" />
+    <ClCompile Include="7zExtract.c" />
+    <ClCompile Include="7zHeader.c" />
+    <ClCompile Include="7zIn.c" />
+    <ClCompile Include="7zItem.c" />
+    <ClCompile Include="7zMethodID.c" />
+    <ClCompile Include="Compress\LzmaDecode.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="7zAlloc.h" />
+    <ClInclude Include="7zBuffer.h" />
+    <ClInclude Include="7zCrc.h" />
+    <ClInclude Include="7zDecode.h" />
+    <ClInclude Include="7zExtract.h" />
+    <ClInclude Include="7zHeader.h" />
+    <ClInclude Include="7zIn.h" />
+    <ClInclude Include="7zItem.h" />
+    <ClInclude Include="7zMethodID.h" />
+    <ClInclude Include="7zTypes.h" />
+    <ClInclude Include="Compress\LzmaDecode.h" />
+    <ClInclude Include="status.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/Source/3rd Party/7zip/7zip.vcxproj.filters b/Source/3rd Party/7zip/7zip.vcxproj.filters
new file mode 100644
index 000000000..bd2cf11a6
--- /dev/null
+++ b/Source/3rd Party/7zip/7zip.vcxproj.filters	
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{5eb82abf-a87d-43e6-b765-7e70ec0a5df0}</UniqueIdentifier>
+      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{a0c6ef27-6c55-4c16-99d4-e912bc363ca5}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="7zAlloc.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="7zBuffer.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="7zCrc.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="7zDecode.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="7zExtract.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="7zHeader.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="7zIn.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="7zItem.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="7zMethodID.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Compress\LzmaDecode.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="7zAlloc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="7zBuffer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="7zCrc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="7zDecode.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="7zExtract.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="7zHeader.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="7zIn.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="7zItem.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="7zMethodID.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="7zTypes.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Compress\LzmaDecode.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="status.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Source/3rd Party/WTL/WTL.vcxproj b/Source/3rd Party/WTL/WTL.vcxproj
new file mode 100644
index 000000000..0de52d925
--- /dev/null
+++ b/Source/3rd Party/WTL/WTL.vcxproj	
@@ -0,0 +1,68 @@
+<?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="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{4BC6906B-213E-40D7-9FC7-1A93E228393D}</ProjectGuid>
+    <RootNamespace>WTL</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(SolutionDir)PropertySheets/Win32.Release.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(SolutionDir)PropertySheets/Win32.Debug.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="atlapp.h" />
+    <ClInclude Include="atlcrack.h" />
+    <ClInclude Include="atlctrls.h" />
+    <ClInclude Include="atlctrlw.h" />
+    <ClInclude Include="atlctrlx.h" />
+    <ClInclude Include="atlddx.h" />
+    <ClInclude Include="atldlgs.h" />
+    <ClInclude Include="atlfind.h" />
+    <ClInclude Include="atlframe.h" />
+    <ClInclude Include="atlgdi.h" />
+    <ClInclude Include="atlmisc.h" />
+    <ClInclude Include="atlprint.h" />
+    <ClInclude Include="atlres.h" />
+    <ClInclude Include="atlresce.h" />
+    <ClInclude Include="atlscrl.h" />
+    <ClInclude Include="atlsplit.h" />
+    <ClInclude Include="atltheme.h" />
+    <ClInclude Include="atluser.h" />
+    <ClInclude Include="atlwince.h" />
+    <ClInclude Include="atlwinx.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/Source/3rd Party/WTL/WTL.vcxproj.filters b/Source/3rd Party/WTL/WTL.vcxproj.filters
new file mode 100644
index 000000000..5d4419ade
--- /dev/null
+++ b/Source/3rd Party/WTL/WTL.vcxproj.filters	
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{571df6bb-e450-49dc-8f57-3492a402bff7}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="atlapp.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="atlcrack.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="atlctrls.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="atlctrlw.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="atlctrlx.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="atlddx.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="atldlgs.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="atlfind.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="atlframe.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="atlgdi.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="atlmisc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="atlprint.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="atlres.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="atlresce.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="atlscrl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="atlsplit.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="atltheme.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="atluser.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="atlwince.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="atlwinx.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Source/3rd Party/wx/include/wx/platform.h b/Source/3rd Party/wx/include/wx/platform.h
index 9f3971a83..05b132af1 100644
--- a/Source/3rd Party/wx/include/wx/platform.h	
+++ b/Source/3rd Party/wx/include/wx/platform.h	
@@ -436,6 +436,8 @@
 #       define __VISUALC10__
 #   elif __VISUALC__ < 1800
 #       define __VISUALC11__
+#   elif __VISUALC__ < 1900
+# define __VISUALC12__
 #   else
 #       pragma message("Please update wx/platform.h to recognize this VC++ version")
 #   endif
diff --git a/Source/3rd Party/wx/wx_base.vcxproj b/Source/3rd Party/wx/wx_base.vcxproj
new file mode 100644
index 000000000..acc0a30c2
--- /dev/null
+++ b/Source/3rd Party/wx/wx_base.vcxproj	
@@ -0,0 +1,399 @@
+<?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="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>base</ProjectName>
+    <ProjectGuid>{427F1DCD-3BED-4010-9322-077A4C06D871}</ProjectGuid>
+    <RootNamespace>base</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v120_xp</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(SolutionDir)PropertySheets/Win32.Release.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(SolutionDir)PropertySheets/Win32.Debug.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <TargetName>wxbase29d</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <TargetName>wxbase29</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>lib\vc_lib\mswud;include;src\tiff\libtiff;src\jpeg;src\png;src\zlib;src\regex;src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;__WXMSW__;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>
+      <DisableSpecificWarnings>4005;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Lib>
+      <OutputFile>$(OutDir)wxbase29d.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>lib\vc_lib\mswu;include;src\tiff\libtiff;src\jpeg;src\png;src\zlib;src\regex;src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;__WXMSW__;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>
+      <DisableSpecificWarnings>4005;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Lib>
+      <OutputFile>$(OutDir)wxbase29.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="src\common\any.cpp" />
+    <ClCompile Include="src\common\appbase.cpp" />
+    <ClCompile Include="src\common\arcall.cpp" />
+    <ClCompile Include="src\common\arcfind.cpp" />
+    <ClCompile Include="src\common\archive.cpp" />
+    <ClCompile Include="src\common\arrstr.cpp" />
+    <ClCompile Include="src\common\base64.cpp" />
+    <ClCompile Include="src\common\clntdata.cpp" />
+    <ClCompile Include="src\common\cmdline.cpp" />
+    <ClCompile Include="src\common\config.cpp" />
+    <ClCompile Include="src\common\convauto.cpp" />
+    <ClCompile Include="src\common\datetime.cpp" />
+    <ClCompile Include="src\common\datetimefmt.cpp" />
+    <ClCompile Include="src\common\datstrm.cpp" />
+    <ClCompile Include="src\common\dircmn.cpp" />
+    <ClCompile Include="src\common\dummy.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="src\common\dynarray.cpp" />
+    <ClCompile Include="src\common\dynlib.cpp" />
+    <ClCompile Include="src\common\dynload.cpp" />
+    <ClCompile Include="src\common\encconv.cpp" />
+    <ClCompile Include="src\common\event.cpp" />
+    <ClCompile Include="src\common\evtloopcmn.cpp" />
+    <ClCompile Include="src\common\extended.c">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+      </PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+      </PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="src\common\ffile.cpp" />
+    <ClCompile Include="src\common\file.cpp" />
+    <ClCompile Include="src\common\fileback.cpp" />
+    <ClCompile Include="src\common\fileconf.cpp" />
+    <ClCompile Include="src\common\filefn.cpp" />
+    <ClCompile Include="src\common\filename.cpp" />
+    <ClCompile Include="src\common\filesys.cpp" />
+    <ClCompile Include="src\common\filtall.cpp" />
+    <ClCompile Include="src\common\filtfind.cpp" />
+    <ClCompile Include="src\common\fmapbase.cpp" />
+    <ClCompile Include="src\common\fs_arc.cpp" />
+    <ClCompile Include="src\common\fs_filter.cpp" />
+    <ClCompile Include="src\common\fs_mem.cpp" />
+    <ClCompile Include="src\common\fswatchercmn.cpp" />
+    <ClCompile Include="src\common\hash.cpp" />
+    <ClCompile Include="src\common\hashmap.cpp" />
+    <ClCompile Include="src\common\init.cpp" />
+    <ClCompile Include="src\common\intl.cpp" />
+    <ClCompile Include="src\common\ipcbase.cpp" />
+    <ClCompile Include="src\common\languageinfo.cpp" />
+    <ClCompile Include="src\common\list.cpp" />
+    <ClCompile Include="src\common\log.cpp" />
+    <ClCompile Include="src\common\longlong.cpp" />
+    <ClCompile Include="src\common\memory.cpp" />
+    <ClCompile Include="src\common\mimecmn.cpp" />
+    <ClCompile Include="src\common\module.cpp" />
+    <ClCompile Include="src\common\msgout.cpp" />
+    <ClCompile Include="src\common\mstream.cpp" />
+    <ClCompile Include="src\common\numformatter.cpp" />
+    <ClCompile Include="src\common\object.cpp" />
+    <ClCompile Include="src\common\platinfo.cpp" />
+    <ClCompile Include="src\common\powercmn.cpp" />
+    <ClCompile Include="src\common\process.cpp" />
+    <ClCompile Include="src\common\regex.cpp" />
+    <ClCompile Include="src\common\sstream.cpp" />
+    <ClCompile Include="src\common\stdpbase.cpp" />
+    <ClCompile Include="src\common\stdstream.cpp" />
+    <ClCompile Include="src\common\stopwatch.cpp" />
+    <ClCompile Include="src\common\strconv.cpp" />
+    <ClCompile Include="src\common\stream.cpp" />
+    <ClCompile Include="src\common\string.cpp" />
+    <ClCompile Include="src\common\stringimpl.cpp" />
+    <ClCompile Include="src\common\stringops.cpp" />
+    <ClCompile Include="src\common\strvararg.cpp" />
+    <ClCompile Include="src\common\sysopt.cpp" />
+    <ClCompile Include="src\common\tarstrm.cpp" />
+    <ClCompile Include="src\common\textbuf.cpp" />
+    <ClCompile Include="src\common\textfile.cpp" />
+    <ClCompile Include="src\common\time.cpp" />
+    <ClCompile Include="src\common\timercmn.cpp" />
+    <ClCompile Include="src\common\timerimpl.cpp" />
+    <ClCompile Include="src\common\tokenzr.cpp" />
+    <ClCompile Include="src\common\translation.cpp" />
+    <ClCompile Include="src\common\txtstrm.cpp" />
+    <ClCompile Include="src\common\unichar.cpp" />
+    <ClCompile Include="src\common\uri.cpp" />
+    <ClCompile Include="src\common\ustring.cpp" />
+    <ClCompile Include="src\common\utilscmn.cpp" />
+    <ClCompile Include="src\common\variant.cpp" />
+    <ClCompile Include="src\common\wfstream.cpp" />
+    <ClCompile Include="src\common\wxcrt.cpp" />
+    <ClCompile Include="src\common\wxprintf.cpp" />
+    <ClCompile Include="src\common\xlocale.cpp" />
+    <ClCompile Include="src\common\xti.cpp" />
+    <ClCompile Include="src\common\xtistrm.cpp" />
+    <ClCompile Include="src\common\zipstrm.cpp" />
+    <ClCompile Include="src\common\zstream.cpp" />
+    <ClCompile Include="src\msw\basemsw.cpp" />
+    <ClCompile Include="src\msw\crashrpt.cpp" />
+    <ClCompile Include="src\msw\dde.cpp" />
+    <ClCompile Include="src\msw\debughlp.cpp" />
+    <ClCompile Include="src\msw\dir.cpp" />
+    <ClCompile Include="src\msw\dlmsw.cpp" />
+    <ClCompile Include="src\msw\evtloop.cpp" />
+    <ClCompile Include="src\msw\fswatcher.cpp" />
+    <ClCompile Include="src\msw\main.cpp" />
+    <ClCompile Include="src\msw\mimetype.cpp" />
+    <ClCompile Include="src\msw\mslu.cpp" />
+    <ClCompile Include="src\msw\power.cpp" />
+    <ClCompile Include="src\msw\regconf.cpp" />
+    <ClCompile Include="src\msw\registry.cpp" />
+    <ClCompile Include="src\msw\snglinst.cpp" />
+    <ClCompile Include="src\msw\stackwalk.cpp" />
+    <ClCompile Include="src\msw\stdpaths.cpp" />
+    <ClCompile Include="src\msw\thread.cpp" />
+    <ClCompile Include="src\msw\timer.cpp" />
+    <ClCompile Include="src\msw\utils.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+      </PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+      </PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="src\msw\utilsexc.cpp" />
+    <ClCompile Include="src\msw\volume.cpp" />
+    <ClCompile Include="src\generic\fswatcherg.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="src\msw\version.rc">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\wxWidgets-2.9.4\src\msw;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\wxWidgets-2.9.4\src\msw;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="include\wx\msw\setup.h">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Creating lib\vc_lib\mswud\wx\setup.h</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy "%(FullPath)" lib\vc_lib\mswud\wx\setup.h
+</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">lib\vc_lib\mswud\wx\setup.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Creating lib\vc_lib\mswu\wx\setup.h</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy "%(FullPath)" lib\vc_lib\mswu\wx\setup.h
+</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">lib\vc_lib\mswu\wx\setup.h;%(Outputs)</Outputs>
+    </CustomBuild>
+    <ClInclude Include="include\wx\msw\apptbase.h" />
+    <ClInclude Include="include\wx\msw\apptrait.h" />
+    <ClInclude Include="include\wx\msw\chkconf.h" />
+    <ClInclude Include="include\wx\msw\crashrpt.h" />
+    <ClInclude Include="include\wx\msw\dde.h" />
+    <ClInclude Include="include\wx\msw\debughlp.h" />
+    <ClInclude Include="include\wx\msw\fswatcher.h" />
+    <CustomBuild Include="include\wx\msw\genrcdefs.h">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Creating lib\vc_lib\mswud\wx\msw\rcdefs.h</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cl /EP /nologo "%(FullPath)" &gt; "lib\vc_lib\mswud\wx\msw\rcdefs.h"
+</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">lib\vc_lib\mswud\wx\msw\rcdefs.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Creating lib\vc_lib\mswu\wx\msw\rcdefs.h</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cl /EP /nologo "%(FullPath)" &gt; "lib\vc_lib\mswu\wx\msw\rcdefs.h"
+</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">lib\vc_lib\mswu\wx\msw\rcdefs.h;%(Outputs)</Outputs>
+    </CustomBuild>
+    <ClInclude Include="include\wx\msw\libraries.h" />
+    <ClInclude Include="include\wx\msw\mimetype.h" />
+    <ClInclude Include="include\wx\msw\mslu.h" />
+    <ClInclude Include="include\wx\msw\private.h" />
+    <ClInclude Include="include\wx\msw\regconf.h" />
+    <ClInclude Include="include\wx\msw\registry.h" />
+    <ClInclude Include="include\wx\msw\seh.h" />
+    <ClInclude Include="include\wx\msw\stackwalk.h" />
+    <ClInclude Include="include\wx\msw\stdpaths.h" />
+    <ClInclude Include="include\wx\msw\winundef.h" />
+    <ClInclude Include="include\wx\msw\wrapcctl.h" />
+    <ClInclude Include="include\wx\msw\wrapcdlg.h" />
+    <ClInclude Include="include\wx\msw\wrapwin.h" />
+    <ClInclude Include="include\wx\generic\fswatcher.h" />
+    <ClInclude Include="include\wx\afterstd.h" />
+    <ClInclude Include="include\wx\any.h" />
+    <ClInclude Include="include\wx\anystr.h" />
+    <ClInclude Include="include\wx\app.h" />
+    <ClInclude Include="include\wx\apptrait.h" />
+    <ClInclude Include="include\wx\archive.h" />
+    <ClInclude Include="include\wx\arrstr.h" />
+    <ClInclude Include="include\wx\atomic.h" />
+    <ClInclude Include="include\wx\base64.h" />
+    <ClInclude Include="include\wx\beforestd.h" />
+    <ClInclude Include="include\wx\buffer.h" />
+    <ClInclude Include="include\wx\build.h" />
+    <ClInclude Include="include\wx\chartype.h" />
+    <ClInclude Include="include\wx\checkeddelete.h" />
+    <ClInclude Include="include\wx\chkconf.h" />
+    <ClInclude Include="include\wx\clntdata.h" />
+    <ClInclude Include="include\wx\cmdargs.h" />
+    <ClInclude Include="include\wx\cmdline.h" />
+    <ClInclude Include="include\wx\confbase.h" />
+    <ClInclude Include="include\wx\config.h" />
+    <ClInclude Include="include\wx\containr.h" />
+    <ClInclude Include="include\wx\convauto.h" />
+    <ClInclude Include="include\wx\meta\convertible.h" />
+    <ClInclude Include="include\wx\cpp.h" />
+    <ClInclude Include="include\wx\crt.h" />
+    <ClInclude Include="include\wx\datetime.h" />
+    <ClInclude Include="include\wx\datstrm.h" />
+    <ClInclude Include="include\wx\dde.h" />
+    <ClInclude Include="include\wx\debug.h" />
+    <ClInclude Include="include\wx\defs.h" />
+    <ClInclude Include="include\wx\dir.h" />
+    <ClInclude Include="include\wx\dlimpexp.h" />
+    <ClInclude Include="include\wx\dlist.h" />
+    <ClInclude Include="include\wx\dynarray.h" />
+    <ClInclude Include="include\wx\dynlib.h" />
+    <ClInclude Include="include\wx\dynload.h" />
+    <ClInclude Include="include\wx\encconv.h" />
+    <ClInclude Include="include\wx\event.h" />
+    <ClInclude Include="include\wx\eventfilter.h" />
+    <ClInclude Include="include\wx\evtloop.h" />
+    <ClInclude Include="include\wx\except.h" />
+    <ClInclude Include="include\wx\features.h" />
+    <ClInclude Include="include\wx\ffile.h" />
+    <ClInclude Include="include\wx\file.h" />
+    <ClInclude Include="include\wx\fileconf.h" />
+    <ClInclude Include="include\wx\filefn.h" />
+    <ClInclude Include="include\wx\filename.h" />
+    <ClInclude Include="include\wx\filesys.h" />
+    <ClInclude Include="include\wx\flags.h" />
+    <ClInclude Include="include\wx\fontenc.h" />
+    <ClInclude Include="include\wx\fontmap.h" />
+    <ClInclude Include="include\wx\fs_arc.h" />
+    <ClInclude Include="include\wx\fs_filter.h" />
+    <ClInclude Include="include\wx\fs_mem.h" />
+    <ClInclude Include="include\wx\fswatcher.h" />
+    <ClInclude Include="include\wx\hash.h" />
+    <ClInclude Include="include\wx\hashmap.h" />
+    <ClInclude Include="include\wx\hashset.h" />
+    <ClInclude Include="include\wx\iconloc.h" />
+    <ClInclude Include="include\wx\meta\if.h" />
+    <ClInclude Include="include\wx\meta\implicitconversion.h" />
+    <ClInclude Include="include\wx\init.h" />
+    <ClInclude Include="include\wx\meta\int2type.h" />
+    <ClInclude Include="include\wx\intl.h" />
+    <ClInclude Include="include\wx\iosfwrap.h" />
+    <ClInclude Include="include\wx\ioswrap.h" />
+    <ClInclude Include="include\wx\ipcbase.h" />
+    <ClInclude Include="include\wx\kbdstate.h" />
+    <ClInclude Include="include\wx\language.h" />
+    <ClInclude Include="include\wx\list.h" />
+    <ClInclude Include="include\wx\log.h" />
+    <ClInclude Include="include\wx\longlong.h" />
+    <ClInclude Include="include\wx\math.h" />
+    <ClInclude Include="include\wx\memconf.h" />
+    <ClInclude Include="include\wx\memory.h" />
+    <ClInclude Include="include\wx\memtext.h" />
+    <ClInclude Include="include\wx\mimetype.h" />
+    <ClInclude Include="include\wx\module.h" />
+    <ClInclude Include="include\wx\mousestate.h" />
+    <ClInclude Include="include\wx\meta\movable.h" />
+    <ClInclude Include="include\wx\msgout.h" />
+    <ClInclude Include="include\wx\mstream.h" />
+    <ClInclude Include="include\wx\numformatter.h" />
+    <ClInclude Include="include\wx\object.h" />
+    <ClInclude Include="include\wx\platform.h" />
+    <ClInclude Include="include\wx\platinfo.h" />
+    <ClInclude Include="include\wx\meta\pod.h" />
+    <ClInclude Include="include\wx\power.h" />
+    <ClInclude Include="include\wx\process.h" />
+    <ClInclude Include="include\wx\ptr_scpd.h" />
+    <ClInclude Include="include\wx\recguard.h" />
+    <ClInclude Include="include\wx\regex.h" />
+    <ClInclude Include="include\wx\rtti.h" />
+    <ClInclude Include="include\wx\scopedarray.h" />
+    <ClInclude Include="include\wx\scopedptr.h" />
+    <ClInclude Include="include\wx\scopeguard.h" />
+    <ClInclude Include="include\wx\sharedptr.h" />
+    <ClInclude Include="include\wx\snglinst.h" />
+    <ClInclude Include="include\wx\sstream.h" />
+    <ClInclude Include="include\wx\stack.h" />
+    <ClInclude Include="include\wx\stackwalk.h" />
+    <ClInclude Include="include\wx\stdpaths.h" />
+    <ClInclude Include="include\wx\stdstream.h" />
+    <ClInclude Include="include\wx\stockitem.h" />
+    <ClInclude Include="include\wx\stopwatch.h" />
+    <ClInclude Include="include\wx\strconv.h" />
+    <ClInclude Include="include\wx\stream.h" />
+    <ClInclude Include="include\wx\string.h" />
+    <ClInclude Include="include\wx\stringimpl.h" />
+    <ClInclude Include="include\wx\stringops.h" />
+    <ClInclude Include="include\wx\strvararg.h" />
+    <ClInclude Include="include\wx\sysopt.h" />
+    <ClInclude Include="include\wx\tarstrm.h" />
+    <ClInclude Include="include\wx\textbuf.h" />
+    <ClInclude Include="include\wx\textfile.h" />
+    <ClInclude Include="include\wx\thread.h" />
+    <ClInclude Include="include\wx\time.h" />
+    <ClInclude Include="include\wx\timer.h" />
+    <ClInclude Include="include\wx\tls.h" />
+    <ClInclude Include="include\wx\tokenzr.h" />
+    <ClInclude Include="include\wx\tracker.h" />
+    <ClInclude Include="include\wx\translation.h" />
+    <ClInclude Include="include\wx\txtstrm.h" />
+    <ClInclude Include="include\wx\typeinfo.h" />
+    <ClInclude Include="include\wx\unichar.h" />
+    <ClInclude Include="include\wx\uri.h" />
+    <ClInclude Include="include\wx\ustring.h" />
+    <ClInclude Include="include\wx\utils.h" />
+    <ClInclude Include="include\wx\variant.h" />
+    <ClInclude Include="include\wx\vector.h" />
+    <ClInclude Include="include\wx\version.h" />
+    <ClInclude Include="include\wx\versioninfo.h" />
+    <ClInclude Include="include\wx\volume.h" />
+    <ClInclude Include="include\wx\weakref.h" />
+    <ClInclude Include="include\wx\wfstream.h" />
+    <ClInclude Include="include\wx\wx.h" />
+    <ClInclude Include="include\wx\wxcrt.h" />
+    <ClInclude Include="include\wx\wxcrtbase.h" />
+    <ClInclude Include="include\wx\wxcrtvararg.h" />
+    <ClInclude Include="include\wx\wxprec.h" />
+    <ClInclude Include="include\wx\xlocale.h" />
+    <ClInclude Include="include\wx\xti.h" />
+    <ClInclude Include="include\wx\xti2.h" />
+    <ClInclude Include="include\wx\zipstrm.h" />
+    <ClInclude Include="include\wx\zstream.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="wx_core.vcxproj">
+      <Project>{93447136-facd-4740-8f35-fc46fb4a9e82}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/Source/3rd Party/wx/wx_base.vcxproj.filters b/Source/3rd Party/wx/wx_base.vcxproj.filters
new file mode 100644
index 000000000..0652ad22f
--- /dev/null
+++ b/Source/3rd Party/wx/wx_base.vcxproj.filters	
@@ -0,0 +1,880 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Common Sources">
+      <UniqueIdentifier>{c47f3dca-3d23-41cc-bd84-4adfbdc7757a}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="MSW Sources">
+      <UniqueIdentifier>{58ad57de-3105-49e4-8e4c-eddb8cd5bc2e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Generic Sources">
+      <UniqueIdentifier>{c46d9455-113a-4716-8e37-b801e5b378bc}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Setup Headers">
+      <UniqueIdentifier>{cbe58bbf-0605-4d87-9484-3ecae0288c7f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="MSW Headers">
+      <UniqueIdentifier>{32a9afd0-b6a3-483a-bbdd-304067d12b94}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Generic Headers">
+      <UniqueIdentifier>{0633f4e8-69d6-4e8c-b39d-7f02816de34e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Common Headers">
+      <UniqueIdentifier>{afed9fae-e417-4025-982b-37f89ac0d87e}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="src\common\any.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\appbase.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\arcall.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\arcfind.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\archive.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\arrstr.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\base64.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\clntdata.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\cmdline.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\config.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\convauto.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\datetime.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\datetimefmt.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\datstrm.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\dircmn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\dummy.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\dynarray.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\dynlib.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\dynload.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\encconv.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\event.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\evtloopcmn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\extended.c">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\ffile.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\file.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\fileback.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\fileconf.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\filefn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\filename.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\filesys.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\filtall.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\filtfind.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\fmapbase.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\fs_arc.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\fs_filter.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\fs_mem.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\fswatchercmn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\hash.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\hashmap.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\init.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\intl.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\ipcbase.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\languageinfo.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\list.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\log.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\longlong.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\memory.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\mimecmn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\module.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\msgout.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\mstream.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\numformatter.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\object.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\platinfo.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\powercmn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\process.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\regex.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\sstream.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\stdpbase.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\stdstream.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\stopwatch.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\strconv.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\stream.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\string.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\stringimpl.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\stringops.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\strvararg.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\sysopt.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\tarstrm.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\textbuf.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\textfile.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\time.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\timercmn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\timerimpl.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\tokenzr.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\translation.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\txtstrm.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\unichar.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\uri.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\ustring.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\utilscmn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\variant.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\wfstream.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\wxcrt.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\wxprintf.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\xlocale.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\xti.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\xtistrm.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\zipstrm.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\zstream.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\basemsw.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\crashrpt.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\dde.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\debughlp.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\dir.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\dlmsw.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\evtloop.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\fswatcher.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\main.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\mimetype.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\mslu.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\power.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\regconf.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\registry.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\snglinst.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\stackwalk.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\stdpaths.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\thread.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\timer.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\utils.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\utilsexc.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\volume.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\generic\fswatcherg.cpp">
+      <Filter>Generic Sources</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="src\msw\version.rc">
+      <Filter>MSW Sources</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="include\wx\msw\apptbase.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\apptrait.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\chkconf.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\crashrpt.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\dde.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\debughlp.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\fswatcher.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\libraries.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\mimetype.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\mslu.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\private.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\regconf.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\registry.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\seh.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\stackwalk.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\stdpaths.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\winundef.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\wrapcctl.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\wrapcdlg.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\wrapwin.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\generic\fswatcher.h">
+      <Filter>Generic Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\afterstd.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\any.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\anystr.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\app.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\apptrait.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\archive.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\arrstr.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\atomic.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\base64.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\beforestd.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\buffer.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\build.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\chartype.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\checkeddelete.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\chkconf.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\clntdata.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\cmdargs.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\cmdline.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\confbase.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\config.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\containr.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\convauto.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\meta\convertible.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\cpp.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\crt.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\datetime.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\datstrm.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\dde.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\debug.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\defs.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\dir.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\dlimpexp.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\dlist.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\dynarray.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\dynlib.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\dynload.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\encconv.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\event.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\eventfilter.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\evtloop.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\except.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\features.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\ffile.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\file.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\fileconf.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\filefn.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\filename.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\filesys.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\flags.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\fontenc.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\fontmap.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\fs_arc.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\fs_filter.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\fs_mem.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\fswatcher.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\hash.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\hashmap.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\hashset.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\iconloc.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\meta\if.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\meta\implicitconversion.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\init.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\meta\int2type.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\intl.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\iosfwrap.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\ioswrap.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\ipcbase.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\kbdstate.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\language.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\list.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\log.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\longlong.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\math.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\memconf.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\memory.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\memtext.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\mimetype.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\module.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\mousestate.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\meta\movable.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msgout.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\mstream.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\numformatter.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\object.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\platform.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\platinfo.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\meta\pod.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\power.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\process.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\ptr_scpd.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\recguard.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\regex.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\rtti.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\scopedarray.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\scopedptr.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\scopeguard.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\sharedptr.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\snglinst.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\sstream.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\stack.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\stackwalk.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\stdpaths.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\stdstream.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\stockitem.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\stopwatch.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\strconv.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\stream.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\string.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\stringimpl.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\stringops.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\strvararg.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\sysopt.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\tarstrm.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\textbuf.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\textfile.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\thread.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\time.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\timer.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\tls.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\tokenzr.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\tracker.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\translation.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\txtstrm.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\typeinfo.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\unichar.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\uri.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\ustring.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\utils.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\variant.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\vector.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\version.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\versioninfo.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\volume.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\weakref.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\wfstream.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\wx.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\wxcrt.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\wxcrtbase.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\wxcrtvararg.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\wxprec.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\xlocale.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\xti.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\xti2.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\zipstrm.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\zstream.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="include\wx\msw\setup.h">
+      <Filter>Setup Headers</Filter>
+    </CustomBuild>
+    <CustomBuild Include="include\wx\msw\genrcdefs.h">
+      <Filter>MSW Headers</Filter>
+    </CustomBuild>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Source/3rd Party/wx/wx_core.vcxproj b/Source/3rd Party/wx/wx_core.vcxproj
new file mode 100644
index 000000000..53f75d19b
--- /dev/null
+++ b/Source/3rd Party/wx/wx_core.vcxproj	
@@ -0,0 +1,631 @@
+<?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="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>core</ProjectName>
+    <ProjectGuid>{93447136-FACD-4740-8F35-FC46FB4A9E82}</ProjectGuid>
+    <RootNamespace>core</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v120_xp</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(SolutionDir)PropertySheets/Win32.Release.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(SolutionDir)PropertySheets/Win32.Debug.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <TargetName>wxmsw29d_core</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <TargetName>wxmsw29_core</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>lib\vc_lib\mswu;include;src\tiff\libtiff;src\jpeg;src\png;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;__WXMSW__;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>
+      <DisableSpecificWarnings>4005;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Lib>
+      <OutputFile>$(OutDir)wxmsw29d_core.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>lib\vc_lib\mswu;include;src\tiff\libtiff;src\jpeg;src\png;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;__WXMSW__;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>
+      <DisableSpecificWarnings>4005;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Lib>
+      <OutputFile>$(OutDir)wxmsw29_core.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="src\common\accelcmn.cpp" />
+    <ClCompile Include="src\common\accesscmn.cpp" />
+    <ClCompile Include="src\common\affinematrix2d.cpp" />
+    <ClCompile Include="src\common\anidecod.cpp" />
+    <ClCompile Include="src\common\appcmn.cpp" />
+    <ClCompile Include="src\common\artprov.cpp" />
+    <ClCompile Include="src\common\artstd.cpp" />
+    <ClCompile Include="src\common\arttango.cpp" />
+    <ClCompile Include="src\common\bmpbase.cpp" />
+    <ClCompile Include="src\common\bmpbtncmn.cpp" />
+    <ClCompile Include="src\common\bookctrl.cpp" />
+    <ClCompile Include="src\common\btncmn.cpp" />
+    <ClCompile Include="src\common\cairo.cpp" />
+    <ClCompile Include="src\common\checkboxcmn.cpp" />
+    <ClCompile Include="src\common\checklstcmn.cpp" />
+    <ClCompile Include="src\common\choiccmn.cpp" />
+    <ClCompile Include="src\common\clipcmn.cpp" />
+    <ClCompile Include="src\common\clrpickercmn.cpp" />
+    <ClCompile Include="src\common\cmdproc.cpp" />
+    <ClCompile Include="src\common\cmndata.cpp" />
+    <ClCompile Include="src\common\colourcmn.cpp" />
+    <ClCompile Include="src\common\colourdata.cpp" />
+    <ClCompile Include="src\common\combocmn.cpp" />
+    <ClCompile Include="src\common\containr.cpp" />
+    <ClCompile Include="src\common\cshelp.cpp" />
+    <ClCompile Include="src\common\ctrlcmn.cpp" />
+    <ClCompile Include="src\common\ctrlsub.cpp" />
+    <ClCompile Include="src\common\dcbase.cpp" />
+    <ClCompile Include="src\common\dcbufcmn.cpp" />
+    <ClCompile Include="src\common\dcgraph.cpp" />
+    <ClCompile Include="src\common\dcsvg.cpp" />
+    <ClCompile Include="src\common\dirctrlcmn.cpp" />
+    <ClCompile Include="src\common\dlgcmn.cpp" />
+    <ClCompile Include="src\common\dndcmn.cpp" />
+    <ClCompile Include="src\common\dobjcmn.cpp" />
+    <ClCompile Include="src\common\docmdi.cpp" />
+    <ClCompile Include="src\common\docview.cpp" />
+    <ClCompile Include="src\common\dpycmn.cpp" />
+    <ClCompile Include="src\common\dseldlg.cpp" />
+    <ClCompile Include="src\common\dummy.cpp">
+      <PrecompiledHeader>Create</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="src\common\effects.cpp" />
+    <ClCompile Include="src\common\event.cpp" />
+    <ClCompile Include="src\common\fddlgcmn.cpp" />
+    <ClCompile Include="src\common\filectrlcmn.cpp" />
+    <ClCompile Include="src\common\filehistorycmn.cpp" />
+    <ClCompile Include="src\common\filepickercmn.cpp" />
+    <ClCompile Include="src\common\fldlgcmn.cpp" />
+    <ClCompile Include="src\common\fontcmn.cpp" />
+    <ClCompile Include="src\common\fontdata.cpp" />
+    <ClCompile Include="src\common\fontenumcmn.cpp" />
+    <ClCompile Include="src\common\fontmap.cpp" />
+    <ClCompile Include="src\common\fontpickercmn.cpp" />
+    <ClCompile Include="src\common\fontutilcmn.cpp" />
+    <ClCompile Include="src\common\framecmn.cpp" />
+    <ClCompile Include="src\common\fs_mem.cpp" />
+    <ClCompile Include="src\common\gaugecmn.cpp" />
+    <ClCompile Include="src\common\gbsizer.cpp" />
+    <ClCompile Include="src\common\gdicmn.cpp" />
+    <ClCompile Include="src\common\geometry.cpp" />
+    <ClCompile Include="src\common\gifdecod.cpp" />
+    <ClCompile Include="src\common\graphcmn.cpp" />
+    <ClCompile Include="src\common\headercolcmn.cpp" />
+    <ClCompile Include="src\common\headerctrlcmn.cpp" />
+    <ClCompile Include="src\common\helpbase.cpp" />
+    <ClCompile Include="src\common\iconbndl.cpp" />
+    <ClCompile Include="src\common\imagall.cpp" />
+    <ClCompile Include="src\common\imagbmp.cpp" />
+    <ClCompile Include="src\common\image.cpp" />
+    <ClCompile Include="src\common\imagfill.cpp" />
+    <ClCompile Include="src\common\imaggif.cpp" />
+    <ClCompile Include="src\common\imagiff.cpp" />
+    <ClCompile Include="src\common\imagjpeg.cpp" />
+    <ClCompile Include="src\common\imagpcx.cpp" />
+    <ClCompile Include="src\common\imagpng.cpp" />
+    <ClCompile Include="src\common\imagpnm.cpp" />
+    <ClCompile Include="src\common\imagtga.cpp" />
+    <ClCompile Include="src\common\imagtiff.cpp" />
+    <ClCompile Include="src\common\imagxpm.cpp" />
+    <ClCompile Include="src\common\layout.cpp" />
+    <ClCompile Include="src\common\lboxcmn.cpp" />
+    <ClCompile Include="src\common\listctrlcmn.cpp" />
+    <ClCompile Include="src\common\markupparser.cpp" />
+    <ClCompile Include="src\common\matrix.cpp" />
+    <ClCompile Include="src\common\menucmn.cpp" />
+    <ClCompile Include="src\common\mousemanager.cpp" />
+    <ClCompile Include="src\common\msgout.cpp" />
+    <ClCompile Include="src\common\nbkbase.cpp" />
+    <ClCompile Include="src\common\overlaycmn.cpp" />
+    <ClCompile Include="src\common\ownerdrwcmn.cpp" />
+    <ClCompile Include="src\common\panelcmn.cpp" />
+    <ClCompile Include="src\common\paper.cpp" />
+    <ClCompile Include="src\common\persist.cpp" />
+    <ClCompile Include="src\common\pickerbase.cpp" />
+    <ClCompile Include="src\common\popupcmn.cpp" />
+    <ClCompile Include="src\common\prntbase.cpp" />
+    <ClCompile Include="src\common\quantize.cpp" />
+    <ClCompile Include="src\common\radiobtncmn.cpp" />
+    <ClCompile Include="src\common\radiocmn.cpp" />
+    <ClCompile Include="src\common\rearrangectrl.cpp" />
+    <ClCompile Include="src\common\rendcmn.cpp" />
+    <ClCompile Include="src\common\rgncmn.cpp" />
+    <ClCompile Include="src\common\scrolbarcmn.cpp" />
+    <ClCompile Include="src\common\settcmn.cpp" />
+    <ClCompile Include="src\common\sizer.cpp" />
+    <ClCompile Include="src\common\slidercmn.cpp" />
+    <ClCompile Include="src\common\spinbtncmn.cpp" />
+    <ClCompile Include="src\common\spinctrlcmn.cpp" />
+    <ClCompile Include="src\common\srchcmn.cpp" />
+    <ClCompile Include="src\common\statbar.cpp" />
+    <ClCompile Include="src\common\statbmpcmn.cpp" />
+    <ClCompile Include="src\common\statboxcmn.cpp" />
+    <ClCompile Include="src\common\statlinecmn.cpp" />
+    <ClCompile Include="src\common\stattextcmn.cpp" />
+    <ClCompile Include="src\common\stockitem.cpp" />
+    <ClCompile Include="src\common\tbarbase.cpp" />
+    <ClCompile Include="src\common\textcmn.cpp" />
+    <ClCompile Include="src\common\textentrycmn.cpp" />
+    <ClCompile Include="src\common\toplvcmn.cpp" />
+    <ClCompile Include="src\common\treebase.cpp" />
+    <ClCompile Include="src\common\uiactioncmn.cpp" />
+    <ClCompile Include="src\common\utilscmn.cpp" />
+    <ClCompile Include="src\common\valgen.cpp" />
+    <ClCompile Include="src\common\validate.cpp" />
+    <ClCompile Include="src\common\valnum.cpp" />
+    <ClCompile Include="src\common\valtext.cpp" />
+    <ClCompile Include="src\common\wincmn.cpp" />
+    <ClCompile Include="src\common\windowid.cpp" />
+    <ClCompile Include="src\common\wrapsizer.cpp" />
+    <ClCompile Include="src\common\xpmdecod.cpp" />
+    <ClCompile Include="src\msw\accel.cpp" />
+    <ClCompile Include="src\msw\ole\access.cpp" />
+    <ClCompile Include="src\msw\ole\activex.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+      </PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+      </PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="src\msw\anybutton.cpp" />
+    <ClCompile Include="src\msw\app.cpp" />
+    <ClCompile Include="src\msw\artmsw.cpp" />
+    <ClCompile Include="src\msw\ole\automtn.cpp" />
+    <ClCompile Include="src\msw\bitmap.cpp" />
+    <ClCompile Include="src\msw\bmpbuttn.cpp" />
+    <ClCompile Include="src\msw\brush.cpp" />
+    <ClCompile Include="src\msw\button.cpp" />
+    <ClCompile Include="src\msw\caret.cpp" />
+    <ClCompile Include="src\msw\checkbox.cpp" />
+    <ClCompile Include="src\msw\checklst.cpp" />
+    <ClCompile Include="src\msw\choice.cpp" />
+    <ClCompile Include="src\msw\clipbrd.cpp" />
+    <ClCompile Include="src\msw\colordlg.cpp" />
+    <ClCompile Include="src\msw\colour.cpp" />
+    <ClCompile Include="src\msw\combo.cpp" />
+    <ClCompile Include="src\msw\combobox.cpp" />
+    <ClCompile Include="src\msw\control.cpp" />
+    <ClCompile Include="src\msw\cursor.cpp" />
+    <ClCompile Include="src\msw\data.cpp" />
+    <ClCompile Include="src\msw\ole\dataobj.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+      </PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+      </PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="src\msw\dc.cpp" />
+    <ClCompile Include="src\msw\dcclient.cpp" />
+    <ClCompile Include="src\msw\dcmemory.cpp" />
+    <ClCompile Include="src\msw\dcprint.cpp" />
+    <ClCompile Include="src\msw\dcscreen.cpp" />
+    <ClCompile Include="src\msw\dialog.cpp" />
+    <ClCompile Include="src\msw\dialup.cpp" />
+    <ClCompile Include="src\msw\dib.cpp" />
+    <ClCompile Include="src\msw\dirdlg.cpp" />
+    <ClCompile Include="src\msw\display.cpp" />
+    <ClCompile Include="src\msw\dragimag.cpp" />
+    <ClCompile Include="src\msw\ole\dropsrc.cpp" />
+    <ClCompile Include="src\msw\ole\droptgt.cpp" />
+    <ClCompile Include="src\msw\enhmeta.cpp" />
+    <ClCompile Include="src\msw\evtloop.cpp" />
+    <ClCompile Include="src\msw\fdrepdlg.cpp" />
+    <ClCompile Include="src\msw\filedlg.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+      </PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+      </PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="src\msw\font.cpp" />
+    <ClCompile Include="src\msw\fontdlg.cpp" />
+    <ClCompile Include="src\msw\fontenum.cpp" />
+    <ClCompile Include="src\msw\fontutil.cpp" />
+    <ClCompile Include="src\msw\frame.cpp" />
+    <ClCompile Include="src\msw\gauge.cpp" />
+    <ClCompile Include="src\msw\gdiimage.cpp" />
+    <ClCompile Include="src\msw\gdiobj.cpp" />
+    <ClCompile Include="src\msw\gdiplus.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+      </PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+      </PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="src\msw\graphics.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+      </PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+      </PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="src\msw\headerctrl.cpp" />
+    <ClCompile Include="src\msw\helpchm.cpp" />
+    <ClCompile Include="src\msw\helpwin.cpp" />
+    <ClCompile Include="src\msw\icon.cpp" />
+    <ClCompile Include="src\msw\imaglist.cpp" />
+    <ClCompile Include="src\msw\iniconf.cpp" />
+    <ClCompile Include="src\msw\listbox.cpp" />
+    <ClCompile Include="src\msw\listctrl.cpp" />
+    <ClCompile Include="src\msw\main.cpp" />
+    <ClCompile Include="src\msw\mdi.cpp" />
+    <ClCompile Include="src\msw\menu.cpp" />
+    <ClCompile Include="src\msw\menuitem.cpp" />
+    <ClCompile Include="src\msw\metafile.cpp" />
+    <ClCompile Include="src\msw\minifram.cpp" />
+    <ClCompile Include="src\msw\msgdlg.cpp" />
+    <ClCompile Include="src\msw\mslu.cpp" />
+    <ClCompile Include="src\msw\nativdlg.cpp" />
+    <ClCompile Include="src\msw\nativewin.cpp" />
+    <ClCompile Include="src\msw\nonownedwnd.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+      </PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+      </PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="src\msw\notebook.cpp" />
+    <ClCompile Include="src\msw\ole\oleutils.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+      </PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+      </PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="src\msw\ownerdrw.cpp" />
+    <ClCompile Include="src\msw\palette.cpp" />
+    <ClCompile Include="src\msw\panel.cpp" />
+    <ClCompile Include="src\msw\pen.cpp" />
+    <ClCompile Include="src\msw\popupwin.cpp" />
+    <ClCompile Include="src\msw\printdlg.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+      </PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+      </PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="src\msw\printwin.cpp" />
+    <ClCompile Include="src\msw\progdlg.cpp" />
+    <ClCompile Include="src\msw\radiobox.cpp" />
+    <ClCompile Include="src\msw\radiobut.cpp" />
+    <ClCompile Include="src\msw\region.cpp" />
+    <ClCompile Include="src\msw\renderer.cpp" />
+    <ClCompile Include="src\msw\richmsgdlg.cpp" />
+    <ClCompile Include="src\msw\scrolbar.cpp" />
+    <ClCompile Include="src\msw\settings.cpp" />
+    <ClCompile Include="src\msw\slider.cpp" />
+    <ClCompile Include="src\msw\spinbutt.cpp" />
+    <ClCompile Include="src\msw\spinctrl.cpp" />
+    <ClCompile Include="src\msw\statbmp.cpp" />
+    <ClCompile Include="src\msw\statbox.cpp" />
+    <ClCompile Include="src\msw\statline.cpp" />
+    <ClCompile Include="src\msw\stattext.cpp" />
+    <ClCompile Include="src\msw\statusbar.cpp" />
+    <ClCompile Include="src\msw\textctrl.cpp" />
+    <ClCompile Include="src\msw\textentry.cpp" />
+    <ClCompile Include="src\msw\tglbtn.cpp" />
+    <ClCompile Include="src\msw\toolbar.cpp" />
+    <ClCompile Include="src\msw\tooltip.cpp" />
+    <ClCompile Include="src\msw\toplevel.cpp" />
+    <ClCompile Include="src\msw\treectrl.cpp" />
+    <ClCompile Include="src\msw\uiaction.cpp" />
+    <ClCompile Include="src\msw\utilsgui.cpp" />
+    <ClCompile Include="src\msw\ole\uuid.cpp" />
+    <ClCompile Include="src\msw\uxtheme.cpp" />
+    <ClCompile Include="src\msw\volume.cpp" />
+    <ClCompile Include="src\msw\window.cpp" />
+    <ClCompile Include="src\generic\busyinfo.cpp" />
+    <ClCompile Include="src\generic\buttonbar.cpp" />
+    <ClCompile Include="src\generic\choicbkg.cpp" />
+    <ClCompile Include="src\generic\choicdgg.cpp" />
+    <ClCompile Include="src\generic\clrpickerg.cpp" />
+    <ClCompile Include="src\generic\collpaneg.cpp" />
+    <ClCompile Include="src\generic\combog.cpp" />
+    <ClCompile Include="src\generic\dcpsg.cpp" />
+    <ClCompile Include="src\generic\dirctrlg.cpp" />
+    <ClCompile Include="src\generic\dragimgg.cpp" />
+    <ClCompile Include="src\generic\filectrlg.cpp" />
+    <ClCompile Include="src\generic\filepickerg.cpp" />
+    <ClCompile Include="src\generic\fontpickerg.cpp" />
+    <ClCompile Include="src\generic\graphicc.cpp" />
+    <ClCompile Include="src\generic\infobar.cpp" />
+    <ClCompile Include="src\generic\listbkg.cpp" />
+    <ClCompile Include="src\generic\logg.cpp" />
+    <ClCompile Include="src\generic\markuptext.cpp" />
+    <ClCompile Include="src\generic\msgdlgg.cpp" />
+    <ClCompile Include="src\generic\numdlgg.cpp" />
+    <ClCompile Include="src\generic\printps.cpp" />
+    <ClCompile Include="src\generic\prntdlgg.cpp" />
+    <ClCompile Include="src\generic\progdlgg.cpp" />
+    <ClCompile Include="src\generic\renderg.cpp" />
+    <ClCompile Include="src\generic\richmsgdlgg.cpp" />
+    <ClCompile Include="src\generic\scrlwing.cpp" />
+    <ClCompile Include="src\generic\selstore.cpp" />
+    <ClCompile Include="src\generic\spinctlg.cpp" />
+    <ClCompile Include="src\generic\splitter.cpp" />
+    <ClCompile Include="src\generic\srchctlg.cpp" />
+    <ClCompile Include="src\generic\statbmpg.cpp" />
+    <ClCompile Include="src\generic\stattextg.cpp" />
+    <ClCompile Include="src\generic\statusbr.cpp" />
+    <ClCompile Include="src\generic\textdlgg.cpp" />
+    <ClCompile Include="src\generic\tipwin.cpp" />
+    <ClCompile Include="src\generic\toolbkg.cpp" />
+    <ClCompile Include="src\generic\treebkg.cpp" />
+    <ClCompile Include="src\generic\treectlg.cpp" />
+    <ClCompile Include="src\generic\vlbox.cpp" />
+    <ClCompile Include="src\generic\vscroll.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="src\msw\version.rc">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\wxWidgets-2.9.4\src\msw;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\wxWidgets-2.9.4\src\msw;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="include\wx\msw\setup.h">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Creating lib\vc_lib\mswd\wx\setup.h</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy "%(FullPath)" lib\vc_lib\mswd\wx\setup.h
+</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">lib\vc_lib\mswd\wx\setup.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Creating lib\vc_lib\mswu\wx\setup.h</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy "%(FullPath)" lib\vc_lib\mswu\wx\setup.h
+</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">lib\vc_lib\mswu\wx\setup.h;%(Outputs)</Outputs>
+    </CustomBuild>
+    <ClInclude Include="include\wx\msw\accel.h" />
+    <ClInclude Include="include\wx\msw\ole\activex.h" />
+    <ClInclude Include="include\wx\msw\anybutton.h" />
+    <ClInclude Include="include\wx\msw\app.h" />
+    <ClInclude Include="include\wx\msw\ole\automtn.h" />
+    <ClInclude Include="include\wx\msw\bitmap.h" />
+    <ClInclude Include="include\wx\msw\bmpbuttn.h" />
+    <ClInclude Include="include\wx\msw\brush.h" />
+    <ClInclude Include="include\wx\msw\button.h" />
+    <ClInclude Include="include\wx\msw\caret.h" />
+    <ClInclude Include="include\wx\msw\checkbox.h" />
+    <ClInclude Include="include\wx\msw\checklst.h" />
+    <ClInclude Include="include\wx\msw\choice.h" />
+    <ClInclude Include="include\wx\msw\clipbrd.h" />
+    <ClInclude Include="include\wx\msw\colordlg.h" />
+    <ClInclude Include="include\wx\msw\colour.h" />
+    <ClInclude Include="include\wx\msw\combo.h" />
+    <ClInclude Include="include\wx\msw\combobox.h" />
+    <ClInclude Include="include\wx\msw\control.h" />
+    <ClInclude Include="include\wx\msw\ctrlsub.h" />
+    <ClInclude Include="include\wx\msw\cursor.h" />
+    <ClInclude Include="include\wx\msw\ole\dataform.h" />
+    <ClInclude Include="include\wx\msw\ole\dataobj.h" />
+    <ClInclude Include="include\wx\msw\ole\dataobj2.h" />
+    <ClInclude Include="include\wx\msw\dc.h" />
+    <ClInclude Include="include\wx\msw\dcclient.h" />
+    <ClInclude Include="include\wx\msw\dcmemory.h" />
+    <ClInclude Include="include\wx\msw\dcprint.h" />
+    <ClInclude Include="include\wx\msw\dcscreen.h" />
+    <ClInclude Include="include\wx\msw\dialog.h" />
+    <ClInclude Include="include\wx\msw\dib.h" />
+    <ClInclude Include="include\wx\msw\dirdlg.h" />
+    <ClInclude Include="include\wx\msw\dragimag.h" />
+    <ClInclude Include="include\wx\msw\ole\dropsrc.h" />
+    <ClInclude Include="include\wx\msw\ole\droptgt.h" />
+    <ClInclude Include="include\wx\msw\enhmeta.h" />
+    <ClInclude Include="include\wx\msw\evtloop.h" />
+    <ClInclude Include="include\wx\msw\fdrepdlg.h" />
+    <ClInclude Include="include\wx\msw\filedlg.h" />
+    <ClInclude Include="include\wx\msw\font.h" />
+    <ClInclude Include="include\wx\msw\fontdlg.h" />
+    <ClInclude Include="include\wx\msw\frame.h" />
+    <ClInclude Include="include\wx\msw\gauge.h" />
+    <ClInclude Include="include\wx\msw\gdiimage.h" />
+    <CustomBuild Include="include\wx\msw\genrcdefs.h">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Creating lib\vc_lib\mswud\wx\msw\rcdefs.h</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cl /EP /nologo "%(FullPath)" &gt; "lib\vc_lib\mswud\wx\msw\rcdefs.h"
+</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">lib\vc_lib\mswud\wx\msw\rcdefs.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Creating lib\vc_lib\mswu\wx\msw\rcdefs.h</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cl /EP /nologo "%(FullPath)" &gt; "lib\vc_lib\mswu\wx\msw\rcdefs.h"
+</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">lib\vc_lib\mswu\wx\msw\rcdefs.h;%(Outputs)</Outputs>
+    </CustomBuild>
+    <ClInclude Include="include\wx\msw\headerctrl.h" />
+    <ClInclude Include="include\wx\msw\helpchm.h" />
+    <ClInclude Include="include\wx\msw\helpwin.h" />
+    <ClInclude Include="include\wx\msw\htmlhelp.h" />
+    <ClInclude Include="include\wx\msw\icon.h" />
+    <ClInclude Include="include\wx\msw\imaglist.h" />
+    <ClInclude Include="include\wx\msw\init.h" />
+    <ClInclude Include="include\wx\msw\listbox.h" />
+    <ClInclude Include="include\wx\msw\listctrl.h" />
+    <ClInclude Include="include\wx\msw\mdi.h" />
+    <ClInclude Include="include\wx\msw\menu.h" />
+    <ClInclude Include="include\wx\msw\menuitem.h" />
+    <ClInclude Include="include\wx\msw\minifram.h" />
+    <ClInclude Include="include\wx\msw\missing.h" />
+    <ClInclude Include="include\wx\msw\msgdlg.h" />
+    <ClInclude Include="include\wx\msw\msvcrt.h" />
+    <ClInclude Include="include\wx\msw\nonownedwnd.h" />
+    <ClInclude Include="include\wx\msw\notebook.h" />
+    <ClInclude Include="include\wx\msw\ole\oleutils.h" />
+    <ClInclude Include="include\wx\msw\ownerdrw.h" />
+    <ClInclude Include="include\wx\msw\palette.h" />
+    <ClInclude Include="include\wx\msw\panel.h" />
+    <ClInclude Include="include\wx\msw\pen.h" />
+    <ClInclude Include="include\wx\msw\popupwin.h" />
+    <ClInclude Include="include\wx\msw\printdlg.h" />
+    <ClInclude Include="include\wx\msw\printwin.h" />
+    <ClInclude Include="include\wx\msw\progdlg.h" />
+    <ClInclude Include="include\wx\msw\radiobox.h" />
+    <ClInclude Include="include\wx\msw\radiobut.h" />
+    <ClInclude Include="include\wx\msw\region.h" />
+    <ClInclude Include="include\wx\msw\richmsgdlg.h" />
+    <ClInclude Include="include\wx\msw\scrolbar.h" />
+    <ClInclude Include="include\wx\msw\slider.h" />
+    <ClInclude Include="include\wx\msw\spinbutt.h" />
+    <ClInclude Include="include\wx\msw\spinctrl.h" />
+    <ClInclude Include="include\wx\msw\statbmp.h" />
+    <ClInclude Include="include\wx\msw\statbox.h" />
+    <ClInclude Include="include\wx\msw\statline.h" />
+    <ClInclude Include="include\wx\msw\stattext.h" />
+    <ClInclude Include="include\wx\msw\statusbar.h" />
+    <ClInclude Include="include\wx\msw\textctrl.h" />
+    <ClInclude Include="include\wx\msw\textentry.h" />
+    <ClInclude Include="include\wx\msw\tglbtn.h" />
+    <ClInclude Include="include\wx\msw\toolbar.h" />
+    <ClInclude Include="include\wx\msw\tooltip.h" />
+    <ClInclude Include="include\wx\msw\toplevel.h" />
+    <ClInclude Include="include\wx\msw\treectrl.h" />
+    <ClInclude Include="include\wx\msw\ole\uuid.h" />
+    <ClInclude Include="include\wx\msw\uxtheme.h" />
+    <ClInclude Include="include\wx\msw\uxthemep.h" />
+    <ClInclude Include="include\wx\msw\window.h" />
+    <ClInclude Include="include\wx\generic\busyinfo.h" />
+    <ClInclude Include="include\wx\generic\choicdgg.h" />
+    <ClInclude Include="include\wx\generic\clrpickerg.h" />
+    <ClInclude Include="include\wx\generic\collpaneg.h" />
+    <ClInclude Include="include\wx\generic\combo.h" />
+    <ClInclude Include="include\wx\generic\ctrlsub.h" />
+    <ClInclude Include="include\wx\generic\dirctrlg.h" />
+    <ClInclude Include="include\wx\generic\dragimgg.h" />
+    <ClInclude Include="include\wx\generic\filectrlg.h" />
+    <ClInclude Include="include\wx\generic\filepickerg.h" />
+    <ClInclude Include="include\wx\generic\fontpickerg.h" />
+    <ClInclude Include="include\wx\generic\infobar.h" />
+    <ClInclude Include="include\wx\generic\logg.h" />
+    <ClInclude Include="include\wx\generic\msgdlgg.h" />
+    <ClInclude Include="include\wx\generic\notebook.h" />
+    <ClInclude Include="include\wx\generic\numdlgg.h" />
+    <ClInclude Include="include\wx\generic\prntdlgg.h" />
+    <ClInclude Include="include\wx\generic\progdlgg.h" />
+    <ClInclude Include="include\wx\generic\richmsgdlgg.h" />
+    <ClInclude Include="include\wx\generic\scrolwin.h" />
+    <ClInclude Include="include\wx\generic\spinctlg.h" />
+    <ClInclude Include="include\wx\generic\splitter.h" />
+    <ClInclude Include="include\wx\generic\srchctlg.h" />
+    <ClInclude Include="include\wx\generic\statbmpg.h" />
+    <ClInclude Include="include\wx\generic\stattextg.h" />
+    <ClInclude Include="include\wx\generic\statusbr.h" />
+    <ClInclude Include="include\wx\generic\textdlgg.h" />
+    <ClInclude Include="include\wx\generic\treectlg.h" />
+    <ClInclude Include="include\wx\accel.h" />
+    <ClInclude Include="include\wx\affinematrix2d.h" />
+    <ClInclude Include="include\wx\affinematrix2dbase.h" />
+    <ClInclude Include="include\wx\anidecod.h" />
+    <ClInclude Include="include\wx\animdecod.h" />
+    <ClInclude Include="include\wx\anybutton.h" />
+    <ClInclude Include="include\wx\artprov.h" />
+    <ClInclude Include="include\wx\bitmap.h" />
+    <ClInclude Include="include\wx\bmpbuttn.h" />
+    <ClInclude Include="include\wx\bookctrl.h" />
+    <ClInclude Include="include\wx\brush.h" />
+    <ClInclude Include="include\wx\busyinfo.h" />
+    <ClInclude Include="include\wx\button.h" />
+    <ClInclude Include="include\wx\cairo.h" />
+    <ClInclude Include="include\wx\caret.h" />
+    <ClInclude Include="include\wx\checkbox.h" />
+    <ClInclude Include="include\wx\checklst.h" />
+    <ClInclude Include="include\wx\choicdlg.h" />
+    <ClInclude Include="include\wx\choice.h" />
+    <ClInclude Include="include\wx\choicebk.h" />
+    <ClInclude Include="include\wx\clipbrd.h" />
+    <ClInclude Include="include\wx\clrpicker.h" />
+    <ClInclude Include="include\wx\cmdproc.h" />
+    <ClInclude Include="include\wx\cmndata.h" />
+    <ClInclude Include="include\wx\collpane.h" />
+    <ClInclude Include="include\wx\colordlg.h" />
+    <ClInclude Include="include\wx\colour.h" />
+    <ClInclude Include="include\wx\colourdata.h" />
+    <ClInclude Include="include\wx\combo.h" />
+    <ClInclude Include="include\wx\combobox.h" />
+    <ClInclude Include="include\wx\compositewin.h" />
+    <ClInclude Include="include\wx\control.h" />
+    <ClInclude Include="include\wx\cshelp.h" />
+    <ClInclude Include="include\wx\ctrlsub.h" />
+    <ClInclude Include="include\wx\cursor.h" />
+    <ClInclude Include="include\wx\dataobj.h" />
+    <ClInclude Include="include\wx\dc.h" />
+    <ClInclude Include="include\wx\dcbuffer.h" />
+    <ClInclude Include="include\wx\dcclient.h" />
+    <ClInclude Include="include\wx\dcgraph.h" />
+    <ClInclude Include="include\wx\dcmemory.h" />
+    <ClInclude Include="include\wx\dcmirror.h" />
+    <ClInclude Include="include\wx\dcprint.h" />
+    <ClInclude Include="include\wx\dcscreen.h" />
+    <ClInclude Include="include\wx\dcsvg.h" />
+    <ClInclude Include="include\wx\dialog.h" />
+    <ClInclude Include="include\wx\dialup.h" />
+    <ClInclude Include="include\wx\dirdlg.h" />
+    <ClInclude Include="include\wx\display.h" />
+    <ClInclude Include="include\wx\display_impl.h" />
+    <ClInclude Include="include\wx\dnd.h" />
+    <ClInclude Include="include\wx\docmdi.h" />
+    <ClInclude Include="include\wx\docview.h" />
+    <ClInclude Include="include\wx\effects.h" />
+    <ClInclude Include="include\wx\encinfo.h" />
+    <ClInclude Include="include\wx\fdrepdlg.h" />
+    <ClInclude Include="include\wx\filectrl.h" />
+    <ClInclude Include="include\wx\filedlg.h" />
+    <ClInclude Include="include\wx\filehistory.h" />
+    <ClInclude Include="include\wx\filepicker.h" />
+    <ClInclude Include="include\wx\fmappriv.h" />
+    <ClInclude Include="include\wx\font.h" />
+    <ClInclude Include="include\wx\fontdata.h" />
+    <ClInclude Include="include\wx\fontdlg.h" />
+    <ClInclude Include="include\wx\fontenum.h" />
+    <ClInclude Include="include\wx\fontpicker.h" />
+    <ClInclude Include="include\wx\fontutil.h" />
+    <ClInclude Include="include\wx\frame.h" />
+    <ClInclude Include="include\wx\gauge.h" />
+    <ClInclude Include="include\wx\gbsizer.h" />
+    <ClInclude Include="include\wx\gdicmn.h" />
+    <ClInclude Include="include\wx\gdiobj.h" />
+    <ClInclude Include="include\wx\geometry.h" />
+    <ClInclude Include="include\wx\gifdecod.h" />
+    <ClInclude Include="include\wx\graphics.h" />
+    <ClInclude Include="include\wx\headercol.h" />
+    <ClInclude Include="include\wx\headerctrl.h" />
+    <ClInclude Include="include\wx\help.h" />
+    <ClInclude Include="include\wx\helpbase.h" />
+    <ClInclude Include="include\wx\icon.h" />
+    <ClInclude Include="include\wx\iconbndl.h" />
+    <ClInclude Include="include\wx\imagbmp.h" />
+    <ClInclude Include="include\wx\image.h" />
+    <ClInclude Include="include\wx\imaggif.h" />
+    <ClInclude Include="include\wx\imagiff.h" />
+    <ClInclude Include="include\wx\imagjpeg.h" />
+    <ClInclude Include="include\wx\imaglist.h" />
+    <ClInclude Include="include\wx\imagpcx.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/Source/3rd Party/wx/wx_core.vcxproj.filters b/Source/3rd Party/wx/wx_core.vcxproj.filters
new file mode 100644
index 000000000..9b0034a55
--- /dev/null
+++ b/Source/3rd Party/wx/wx_core.vcxproj.filters	
@@ -0,0 +1,1507 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Common Sources">
+      <UniqueIdentifier>{238bd9e7-3a90-41dd-890f-365a693b7ed7}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="MSW Sources">
+      <UniqueIdentifier>{906ff3ef-0c1c-4a78-bd1d-fd06f5e8d2b9}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Generic Sources">
+      <UniqueIdentifier>{54a674e6-3b50-4c0a-820b-49b82fb1fc79}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Setup Headers">
+      <UniqueIdentifier>{287b8cb7-e71f-4126-b0c7-e4f8c79642aa}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="MSW Headers">
+      <UniqueIdentifier>{69468513-6a58-46aa-9d14-e6603fa5feaf}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Generic Headers">
+      <UniqueIdentifier>{4dd735b9-9915-4f15-809b-327e37c08e0b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Common Headers">
+      <UniqueIdentifier>{7bb9f0fa-58dd-4d3d-989b-46b1d94ecdac}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="src\common\accelcmn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\accesscmn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\affinematrix2d.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\anidecod.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\appcmn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\artprov.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\artstd.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\arttango.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\bmpbase.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\bmpbtncmn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\bookctrl.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\btncmn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\cairo.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\checkboxcmn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\checklstcmn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\choiccmn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\clipcmn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\clrpickercmn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\cmdproc.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\cmndata.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\colourcmn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\colourdata.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\combocmn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\containr.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\cshelp.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\ctrlcmn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\ctrlsub.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\dcbase.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\dcbufcmn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\dcgraph.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\dcsvg.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\dirctrlcmn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\dlgcmn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\dndcmn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\dobjcmn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\docmdi.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\docview.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\dpycmn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\dseldlg.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\dummy.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\effects.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\event.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\fddlgcmn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\filectrlcmn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\filehistorycmn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\filepickercmn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\fldlgcmn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\fontcmn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\fontdata.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\fontenumcmn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\fontmap.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\fontpickercmn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\fontutilcmn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\framecmn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\fs_mem.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\gaugecmn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\gbsizer.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\gdicmn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\geometry.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\gifdecod.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\graphcmn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\headercolcmn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\headerctrlcmn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\helpbase.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\iconbndl.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\imagall.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\imagbmp.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\image.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\imagfill.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\imaggif.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\imagiff.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\imagjpeg.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\imagpcx.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\imagpng.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\imagpnm.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\imagtga.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\imagtiff.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\imagxpm.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\layout.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\lboxcmn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\listctrlcmn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\markupparser.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\matrix.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\menucmn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\mousemanager.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\msgout.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\nbkbase.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\overlaycmn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\ownerdrwcmn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\panelcmn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\paper.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\persist.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\pickerbase.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\popupcmn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\prntbase.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\quantize.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\radiobtncmn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\radiocmn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\rearrangectrl.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\rendcmn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\rgncmn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\scrolbarcmn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\settcmn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\sizer.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\slidercmn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\spinbtncmn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\spinctrlcmn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\srchcmn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\statbar.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\statbmpcmn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\statboxcmn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\statlinecmn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\stattextcmn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\stockitem.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\tbarbase.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\textcmn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\textentrycmn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\toplvcmn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\treebase.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\uiactioncmn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\utilscmn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\valgen.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\validate.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\valnum.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\valtext.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\wincmn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\windowid.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\wrapsizer.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\xpmdecod.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\accel.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\ole\access.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\ole\activex.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\anybutton.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\app.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\artmsw.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\ole\automtn.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\bitmap.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\bmpbuttn.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\brush.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\button.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\caret.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\checkbox.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\checklst.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\choice.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\clipbrd.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\colordlg.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\colour.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\combo.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\combobox.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\control.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\cursor.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\data.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\ole\dataobj.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\dc.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\dcclient.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\dcmemory.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\dcprint.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\dcscreen.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\dialog.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\dialup.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\dib.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\dirdlg.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\display.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\dragimag.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\ole\dropsrc.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\ole\droptgt.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\enhmeta.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\evtloop.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\fdrepdlg.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\filedlg.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\font.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\fontdlg.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\fontenum.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\fontutil.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\frame.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\gauge.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\gdiimage.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\gdiobj.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\gdiplus.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\graphics.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\headerctrl.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\helpchm.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\helpwin.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\icon.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\imaglist.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\iniconf.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\listbox.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\listctrl.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\main.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\mdi.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\menu.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\menuitem.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\metafile.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\minifram.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\msgdlg.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\mslu.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\nativdlg.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\nativewin.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\nonownedwnd.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\notebook.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\ole\oleutils.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\ownerdrw.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\palette.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\panel.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\pen.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\popupwin.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\printdlg.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\printwin.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\progdlg.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\radiobox.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\radiobut.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\region.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\renderer.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\richmsgdlg.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\scrolbar.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\settings.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\slider.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\spinbutt.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\spinctrl.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\statbmp.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\statbox.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\statline.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\stattext.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\statusbar.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\textctrl.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\textentry.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\tglbtn.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\toolbar.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\tooltip.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\toplevel.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\treectrl.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\uiaction.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\utilsgui.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\ole\uuid.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\uxtheme.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\volume.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\window.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\generic\busyinfo.cpp">
+      <Filter>Generic Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\generic\buttonbar.cpp">
+      <Filter>Generic Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\generic\choicbkg.cpp">
+      <Filter>Generic Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\generic\choicdgg.cpp">
+      <Filter>Generic Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\generic\clrpickerg.cpp">
+      <Filter>Generic Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\generic\collpaneg.cpp">
+      <Filter>Generic Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\generic\combog.cpp">
+      <Filter>Generic Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\generic\dcpsg.cpp">
+      <Filter>Generic Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\generic\dirctrlg.cpp">
+      <Filter>Generic Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\generic\dragimgg.cpp">
+      <Filter>Generic Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\generic\filectrlg.cpp">
+      <Filter>Generic Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\generic\filepickerg.cpp">
+      <Filter>Generic Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\generic\fontpickerg.cpp">
+      <Filter>Generic Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\generic\graphicc.cpp">
+      <Filter>Generic Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\generic\infobar.cpp">
+      <Filter>Generic Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\generic\listbkg.cpp">
+      <Filter>Generic Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\generic\logg.cpp">
+      <Filter>Generic Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\generic\markuptext.cpp">
+      <Filter>Generic Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\generic\msgdlgg.cpp">
+      <Filter>Generic Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\generic\numdlgg.cpp">
+      <Filter>Generic Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\generic\printps.cpp">
+      <Filter>Generic Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\generic\prntdlgg.cpp">
+      <Filter>Generic Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\generic\progdlgg.cpp">
+      <Filter>Generic Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\generic\renderg.cpp">
+      <Filter>Generic Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\generic\richmsgdlgg.cpp">
+      <Filter>Generic Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\generic\scrlwing.cpp">
+      <Filter>Generic Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\generic\selstore.cpp">
+      <Filter>Generic Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\generic\spinctlg.cpp">
+      <Filter>Generic Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\generic\splitter.cpp">
+      <Filter>Generic Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\generic\srchctlg.cpp">
+      <Filter>Generic Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\generic\statbmpg.cpp">
+      <Filter>Generic Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\generic\stattextg.cpp">
+      <Filter>Generic Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\generic\statusbr.cpp">
+      <Filter>Generic Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\generic\textdlgg.cpp">
+      <Filter>Generic Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\generic\tipwin.cpp">
+      <Filter>Generic Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\generic\toolbkg.cpp">
+      <Filter>Generic Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\generic\treebkg.cpp">
+      <Filter>Generic Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\generic\treectlg.cpp">
+      <Filter>Generic Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\generic\vlbox.cpp">
+      <Filter>Generic Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\generic\vscroll.cpp">
+      <Filter>Generic Sources</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="src\msw\version.rc">
+      <Filter>MSW Sources</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="include\wx\msw\accel.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\ole\activex.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\anybutton.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\app.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\ole\automtn.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\bitmap.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\bmpbuttn.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\brush.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\button.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\caret.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\checkbox.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\checklst.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\choice.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\clipbrd.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\colordlg.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\colour.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\combo.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\combobox.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\control.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\ctrlsub.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\cursor.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\ole\dataform.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\ole\dataobj.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\ole\dataobj2.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\dc.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\dcclient.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\dcmemory.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\dcprint.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\dcscreen.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\dialog.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\dib.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\dirdlg.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\dragimag.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\ole\dropsrc.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\ole\droptgt.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\enhmeta.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\evtloop.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\fdrepdlg.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\filedlg.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\font.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\fontdlg.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\frame.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\gauge.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\gdiimage.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\headerctrl.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\helpchm.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\helpwin.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\htmlhelp.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\icon.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\imaglist.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\init.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\listbox.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\listctrl.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\mdi.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\menu.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\menuitem.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\minifram.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\missing.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\msgdlg.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\msvcrt.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\nonownedwnd.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\notebook.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\ole\oleutils.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\ownerdrw.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\palette.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\panel.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\pen.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\popupwin.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\printdlg.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\printwin.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\progdlg.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\radiobox.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\radiobut.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\region.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\richmsgdlg.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\scrolbar.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\slider.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\spinbutt.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\spinctrl.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\statbmp.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\statbox.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\statline.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\stattext.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\statusbar.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\textctrl.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\textentry.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\tglbtn.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\toolbar.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\tooltip.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\toplevel.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\treectrl.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\ole\uuid.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\uxtheme.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\uxthemep.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\window.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\generic\busyinfo.h">
+      <Filter>Generic Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\generic\choicdgg.h">
+      <Filter>Generic Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\generic\clrpickerg.h">
+      <Filter>Generic Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\generic\collpaneg.h">
+      <Filter>Generic Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\generic\combo.h">
+      <Filter>Generic Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\generic\ctrlsub.h">
+      <Filter>Generic Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\generic\dirctrlg.h">
+      <Filter>Generic Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\generic\dragimgg.h">
+      <Filter>Generic Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\generic\filectrlg.h">
+      <Filter>Generic Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\generic\filepickerg.h">
+      <Filter>Generic Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\generic\fontpickerg.h">
+      <Filter>Generic Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\generic\infobar.h">
+      <Filter>Generic Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\generic\logg.h">
+      <Filter>Generic Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\generic\msgdlgg.h">
+      <Filter>Generic Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\generic\notebook.h">
+      <Filter>Generic Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\generic\numdlgg.h">
+      <Filter>Generic Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\generic\prntdlgg.h">
+      <Filter>Generic Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\generic\progdlgg.h">
+      <Filter>Generic Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\generic\richmsgdlgg.h">
+      <Filter>Generic Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\generic\scrolwin.h">
+      <Filter>Generic Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\generic\spinctlg.h">
+      <Filter>Generic Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\generic\splitter.h">
+      <Filter>Generic Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\generic\srchctlg.h">
+      <Filter>Generic Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\generic\statbmpg.h">
+      <Filter>Generic Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\generic\stattextg.h">
+      <Filter>Generic Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\generic\statusbr.h">
+      <Filter>Generic Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\generic\textdlgg.h">
+      <Filter>Generic Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\generic\treectlg.h">
+      <Filter>Generic Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\accel.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\affinematrix2d.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\affinematrix2dbase.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\anidecod.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\animdecod.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\anybutton.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\artprov.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\bitmap.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\bmpbuttn.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\bookctrl.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\brush.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\busyinfo.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\button.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\cairo.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\caret.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\checkbox.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\checklst.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\choicdlg.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\choice.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\choicebk.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\clipbrd.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\clrpicker.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\cmdproc.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\cmndata.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\collpane.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\colordlg.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\colour.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\colourdata.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\combo.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\combobox.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\compositewin.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\control.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\cshelp.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\ctrlsub.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\cursor.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\dataobj.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\dc.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\dcbuffer.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\dcclient.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\dcgraph.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\dcmemory.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\dcmirror.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\dcprint.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\dcscreen.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\dcsvg.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\dialog.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\dialup.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\dirdlg.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\display.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\display_impl.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\dnd.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\docmdi.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\docview.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\effects.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\encinfo.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\fdrepdlg.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\filectrl.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\filedlg.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\filehistory.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\filepicker.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\fmappriv.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\font.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\fontdata.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\fontdlg.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\fontenum.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\fontpicker.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\fontutil.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\frame.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\gauge.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\gbsizer.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\gdicmn.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\gdiobj.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\geometry.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\gifdecod.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\graphics.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\headercol.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\headerctrl.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\help.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\helpbase.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\icon.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\iconbndl.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\imagbmp.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\image.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\imaggif.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\imagiff.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\imagjpeg.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\imaglist.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\imagpcx.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="include\wx\msw\setup.h">
+      <Filter>Setup Headers</Filter>
+    </CustomBuild>
+    <CustomBuild Include="include\wx\msw\genrcdefs.h">
+      <Filter>MSW Headers</Filter>
+    </CustomBuild>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Source/3rd Party/wx/wx_wxjpeg.vcxproj b/Source/3rd Party/wx/wx_wxjpeg.vcxproj
new file mode 100644
index 000000000..b304d423d
--- /dev/null
+++ b/Source/3rd Party/wx/wx_wxjpeg.vcxproj	
@@ -0,0 +1,114 @@
+<?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="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>wxjpeg</ProjectName>
+    <ProjectGuid>{93CFEDF3-9A75-4484-B169-D9D8074F5AC2}</ProjectGuid>
+    <RootNamespace>wxjpeg</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v120_xp</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(SolutionDir)PropertySheets/Win32.Release.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(SolutionDir)PropertySheets/Win32.Debug.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <TargetName>wxjpegd</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>lib\vc_lib\mswud;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+    </ClCompile>
+    <Lib>
+      <OutputFile>$(OutDir)wxjpegd.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\lib\vc_lib\mswu;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+    </ClCompile>
+    <Lib>
+      <OutputFile>$(OutDir)wxjpeg.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="src\jpeg\jcapimin.c" />
+    <ClCompile Include="src\jpeg\jcapistd.c" />
+    <ClCompile Include="src\jpeg\jccoefct.c" />
+    <ClCompile Include="src\jpeg\jccolor.c" />
+    <ClCompile Include="src\jpeg\jcdctmgr.c" />
+    <ClCompile Include="src\jpeg\jchuff.c" />
+    <ClCompile Include="src\jpeg\jcinit.c" />
+    <ClCompile Include="src\jpeg\jcmainct.c" />
+    <ClCompile Include="src\jpeg\jcmarker.c" />
+    <ClCompile Include="src\jpeg\jcmaster.c" />
+    <ClCompile Include="src\jpeg\jcomapi.c" />
+    <ClCompile Include="src\jpeg\jcparam.c" />
+    <ClCompile Include="src\jpeg\jcphuff.c" />
+    <ClCompile Include="src\jpeg\jcprepct.c" />
+    <ClCompile Include="src\jpeg\jcsample.c" />
+    <ClCompile Include="src\jpeg\jctrans.c" />
+    <ClCompile Include="src\jpeg\jdapimin.c" />
+    <ClCompile Include="src\jpeg\jdapistd.c" />
+    <ClCompile Include="src\jpeg\jdatadst.c" />
+    <ClCompile Include="src\jpeg\jdatasrc.c" />
+    <ClCompile Include="src\jpeg\jdcoefct.c" />
+    <ClCompile Include="src\jpeg\jdcolor.c" />
+    <ClCompile Include="src\jpeg\jddctmgr.c" />
+    <ClCompile Include="src\jpeg\jdhuff.c" />
+    <ClCompile Include="src\jpeg\jdinput.c" />
+    <ClCompile Include="src\jpeg\jdmainct.c" />
+    <ClCompile Include="src\jpeg\jdmarker.c" />
+    <ClCompile Include="src\jpeg\jdmaster.c" />
+    <ClCompile Include="src\jpeg\jdmerge.c" />
+    <ClCompile Include="src\jpeg\jdphuff.c" />
+    <ClCompile Include="src\jpeg\jdpostct.c" />
+    <ClCompile Include="src\jpeg\jdsample.c" />
+    <ClCompile Include="src\jpeg\jdtrans.c" />
+    <ClCompile Include="src\jpeg\jerror.c" />
+    <ClCompile Include="src\jpeg\jfdctflt.c" />
+    <ClCompile Include="src\jpeg\jfdctfst.c" />
+    <ClCompile Include="src\jpeg\jfdctint.c" />
+    <ClCompile Include="src\jpeg\jidctflt.c" />
+    <ClCompile Include="src\jpeg\jidctfst.c" />
+    <ClCompile Include="src\jpeg\jidctint.c" />
+    <ClCompile Include="src\jpeg\jidctred.c" />
+    <ClCompile Include="src\jpeg\jmemmgr.c" />
+    <ClCompile Include="src\jpeg\jmemnobs.c" />
+    <ClCompile Include="src\jpeg\jquant1.c" />
+    <ClCompile Include="src\jpeg\jquant2.c" />
+    <ClCompile Include="src\jpeg\jutils.c" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/Source/3rd Party/wx/wx_wxjpeg.vcxproj.filters b/Source/3rd Party/wx/wx_wxjpeg.vcxproj.filters
new file mode 100644
index 000000000..41221b0ca
--- /dev/null
+++ b/Source/3rd Party/wx/wx_wxjpeg.vcxproj.filters	
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4ed3c042-494b-4796-be9a-6ba534721d3e}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="src\jpeg\jcapimin.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\jpeg\jcapistd.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\jpeg\jccoefct.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\jpeg\jccolor.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\jpeg\jcdctmgr.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\jpeg\jchuff.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\jpeg\jcinit.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\jpeg\jcmainct.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\jpeg\jcmarker.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\jpeg\jcmaster.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\jpeg\jcomapi.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\jpeg\jcparam.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\jpeg\jcphuff.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\jpeg\jcprepct.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\jpeg\jcsample.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\jpeg\jctrans.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\jpeg\jdapimin.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\jpeg\jdapistd.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\jpeg\jdatadst.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\jpeg\jdatasrc.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\jpeg\jdcoefct.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\jpeg\jdcolor.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\jpeg\jddctmgr.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\jpeg\jdhuff.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\jpeg\jdinput.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\jpeg\jdmainct.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\jpeg\jdmarker.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\jpeg\jdmaster.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\jpeg\jdmerge.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\jpeg\jdphuff.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\jpeg\jdpostct.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\jpeg\jdsample.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\jpeg\jdtrans.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\jpeg\jerror.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\jpeg\jfdctflt.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\jpeg\jfdctfst.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\jpeg\jfdctint.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\jpeg\jidctflt.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\jpeg\jidctfst.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\jpeg\jidctint.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\jpeg\jidctred.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\jpeg\jmemmgr.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\jpeg\jmemnobs.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\jpeg\jquant1.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\jpeg\jquant2.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\jpeg\jutils.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Source/3rd Party/wx/wx_wxpng.vcxproj b/Source/3rd Party/wx/wx_wxpng.vcxproj
new file mode 100644
index 000000000..7d41b4233
--- /dev/null
+++ b/Source/3rd Party/wx/wx_wxpng.vcxproj	
@@ -0,0 +1,84 @@
+<?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="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>wxpng</ProjectName>
+    <ProjectGuid>{05B9CB11-12D1-47CD-8E4A-88E12162119B}</ProjectGuid>
+    <RootNamespace>wxpng</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v120_xp</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(SolutionDir)PropertySheets/Win32.Release.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(SolutionDir)PropertySheets/Win32.Debug.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <TargetName>wxpngd</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>src\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SmallerTypeCheck>false</SmallerTypeCheck>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+    </ClCompile>
+    <Lib>
+      <OutputFile>$(OutDir)wxpngd.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>src\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+    </ClCompile>
+    <Lib>
+      <OutputFile>$(OutDir)wxpng.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="src\png\png.c" />
+    <ClCompile Include="src\png\pngerror.c" />
+    <ClCompile Include="src\png\pngget.c" />
+    <ClCompile Include="src\png\pngmem.c" />
+    <ClCompile Include="src\png\pngpread.c" />
+    <ClCompile Include="src\png\pngread.c" />
+    <ClCompile Include="src\png\pngrio.c" />
+    <ClCompile Include="src\png\pngrtran.c" />
+    <ClCompile Include="src\png\pngrutil.c" />
+    <ClCompile Include="src\png\pngset.c" />
+    <ClCompile Include="src\png\pngtrans.c" />
+    <ClCompile Include="src\png\pngwio.c" />
+    <ClCompile Include="src\png\pngwrite.c" />
+    <ClCompile Include="src\png\pngwtran.c" />
+    <ClCompile Include="src\png\pngwutil.c" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/Source/3rd Party/wx/wx_wxpng.vcxproj.filters b/Source/3rd Party/wx/wx_wxpng.vcxproj.filters
new file mode 100644
index 000000000..0aa1b6fe3
--- /dev/null
+++ b/Source/3rd Party/wx/wx_wxpng.vcxproj.filters	
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{3934553c-b320-4297-a70b-f730c81debd4}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="src\png\png.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\png\pngerror.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\png\pngget.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\png\pngmem.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\png\pngpread.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\png\pngread.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\png\pngrio.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\png\pngrtran.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\png\pngrutil.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\png\pngset.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\png\pngtrans.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\png\pngwio.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\png\pngwrite.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\png\pngwtran.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\png\pngwutil.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Source/3rd Party/wx/wx_wxzlib.vcxproj b/Source/3rd Party/wx/wx_wxzlib.vcxproj
new file mode 100644
index 000000000..5e98ede84
--- /dev/null
+++ b/Source/3rd Party/wx/wx_wxzlib.vcxproj	
@@ -0,0 +1,77 @@
+<?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="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>wxzlib</ProjectName>
+    <ProjectGuid>{25A25249-C284-4C5A-8DC2-26FC3EB13703}</ProjectGuid>
+    <RootNamespace>wxzlib</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v120_xp</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(SolutionDir)PropertySheets/Win32.Release.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(SolutionDir)PropertySheets/Win32.Debug.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <TargetName>wxzlibd</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+    </ClCompile>
+    <Lib>
+      <OutputFile>$(OutDir)wxzlibd.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+    </ClCompile>
+    <Lib>
+      <OutputFile>$(OutDir)wxzlib.lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="src\zlib\adler32.c" />
+    <ClCompile Include="src\zlib\compress.c" />
+    <ClCompile Include="src\zlib\crc32.c" />
+    <ClCompile Include="src\zlib\deflate.c" />
+    <ClCompile Include="src\zlib\gzio.c" />
+    <ClCompile Include="src\zlib\infback.c" />
+    <ClCompile Include="src\zlib\inffast.c" />
+    <ClCompile Include="src\zlib\inflate.c" />
+    <ClCompile Include="src\zlib\inftrees.c" />
+    <ClCompile Include="src\zlib\trees.c" />
+    <ClCompile Include="src\zlib\uncompr.c" />
+    <ClCompile Include="src\zlib\zutil.c" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/Source/3rd Party/wx/wx_wxzlib.vcxproj.filters b/Source/3rd Party/wx/wx_wxzlib.vcxproj.filters
new file mode 100644
index 000000000..3734eb6dd
--- /dev/null
+++ b/Source/3rd Party/wx/wx_wxzlib.vcxproj.filters	
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{72ef58c0-f0a1-4938-a18a-c55d762af660}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="src\zlib\adler32.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\zlib\compress.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\zlib\crc32.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\zlib\deflate.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\zlib\gzio.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\zlib\infback.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\zlib\inffast.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\zlib\inflate.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\zlib\inftrees.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\zlib\trees.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\zlib\uncompr.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\zlib\zutil.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Source/3rd Party/zlib/zlib.vcxproj b/Source/3rd Party/zlib/zlib.vcxproj
new file mode 100644
index 000000000..7866f097e
--- /dev/null
+++ b/Source/3rd Party/zlib/zlib.vcxproj	
@@ -0,0 +1,98 @@
+<?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="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{731BD205-2826-4631-B7AF-117658E88DBC}</ProjectGuid>
+    <RootNamespace>zlib</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\PropertySheets\Win32.Release.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\PropertySheets\Win32.Debug.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="adler32.c" />
+    <ClCompile Include="compress.c" />
+    <ClCompile Include="crc32.c" />
+    <ClCompile Include="deflate.c" />
+    <ClCompile Include="gzclose.c" />
+    <ClCompile Include="gzlib.c" />
+    <ClCompile Include="gzread.c" />
+    <ClCompile Include="gzwrite.c" />
+    <ClCompile Include="infback.c" />
+    <ClCompile Include="inffast.c" />
+    <ClCompile Include="inflate.c" />
+    <ClCompile Include="inftrees.c" />
+    <ClCompile Include="trees.c" />
+    <ClCompile Include="uncompr.c" />
+    <ClCompile Include="zutil.c" />
+    <ClCompile Include="contrib\minizip\ioapi.c" />
+    <ClCompile Include="contrib\minizip\iowin32.c" />
+    <ClCompile Include="contrib\minizip\minizip.c" />
+    <ClCompile Include="contrib\minizip\mztools.c" />
+    <ClCompile Include="contrib\minizip\unzip.c" />
+    <ClCompile Include="contrib\minizip\zip.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="crc32.h" />
+    <ClInclude Include="deflate.h" />
+    <ClInclude Include="gzguts.h" />
+    <ClInclude Include="inffast.h" />
+    <ClInclude Include="inffixed.h" />
+    <ClInclude Include="inflate.h" />
+    <ClInclude Include="inftrees.h" />
+    <ClInclude Include="trees.h" />
+    <ClInclude Include="zconf.h" />
+    <ClInclude Include="zlib.h" />
+    <ClInclude Include="zutil.h" />
+    <ClInclude Include="contrib\minizip\crypt.h" />
+    <ClInclude Include="contrib\minizip\ioapi.h" />
+    <ClInclude Include="contrib\minizip\iowin32.h" />
+    <ClInclude Include="contrib\minizip\mztools.h" />
+    <ClInclude Include="contrib\minizip\unzip.h" />
+    <ClInclude Include="contrib\minizip\zip.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/Source/3rd Party/zlib/zlib.vcxproj.filters b/Source/3rd Party/zlib/zlib.vcxproj.filters
new file mode 100644
index 000000000..ec4ac5eeb
--- /dev/null
+++ b/Source/3rd Party/zlib/zlib.vcxproj.filters	
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{20a593ff-2e3f-48c3-89ef-81cd7bdd8898}</UniqueIdentifier>
+      <Extensions>cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{a3b93770-ecab-40a0-93dc-ace6e58b2384}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;fi;fd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{976e25a0-5f1d-4b4d-8a84-df1126658768}</UniqueIdentifier>
+      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe</Extensions>
+    </Filter>
+    <Filter Include="Minizip">
+      <UniqueIdentifier>{873bcaad-0a88-4791-922a-b7420d765969}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="adler32.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="compress.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="crc32.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="deflate.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="gzclose.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="gzlib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="gzread.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="gzwrite.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="infback.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="inffast.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="inflate.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="inftrees.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="trees.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="uncompr.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="zutil.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="contrib\minizip\ioapi.c">
+      <Filter>Minizip</Filter>
+    </ClCompile>
+    <ClCompile Include="contrib\minizip\iowin32.c">
+      <Filter>Minizip</Filter>
+    </ClCompile>
+    <ClCompile Include="contrib\minizip\minizip.c">
+      <Filter>Minizip</Filter>
+    </ClCompile>
+    <ClCompile Include="contrib\minizip\mztools.c">
+      <Filter>Minizip</Filter>
+    </ClCompile>
+    <ClCompile Include="contrib\minizip\unzip.c">
+      <Filter>Minizip</Filter>
+    </ClCompile>
+    <ClCompile Include="contrib\minizip\zip.c">
+      <Filter>Minizip</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="crc32.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="deflate.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="gzguts.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="inffast.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="inffixed.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="inflate.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="inftrees.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="trees.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="zconf.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="zlib.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="zutil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="contrib\minizip\crypt.h">
+      <Filter>Minizip</Filter>
+    </ClInclude>
+    <ClInclude Include="contrib\minizip\ioapi.h">
+      <Filter>Minizip</Filter>
+    </ClInclude>
+    <ClInclude Include="contrib\minizip\iowin32.h">
+      <Filter>Minizip</Filter>
+    </ClInclude>
+    <ClInclude Include="contrib\minizip\mztools.h">
+      <Filter>Minizip</Filter>
+    </ClInclude>
+    <ClInclude Include="contrib\minizip\unzip.h">
+      <Filter>Minizip</Filter>
+    </ClInclude>
+    <ClInclude Include="contrib\minizip\zip.h">
+      <Filter>Minizip</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Source/Common/Common.vcxproj b/Source/Common/Common.vcxproj
new file mode 100644
index 000000000..a34df03a5
--- /dev/null
+++ b/Source/Common/Common.vcxproj
@@ -0,0 +1,75 @@
+<?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="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{B4A4B994-9111-42B1-93C2-6F1CA8BC4421}</ProjectGuid>
+    <RootNamespace>Common</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v120_xp</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(SolutionDir)PropertySheets/Win32.Release.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(SolutionDir)PropertySheets/Win32.Debug.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="File Class.cpp" />
+    <ClCompile Include="Ini File Class.cpp" />
+    <ClCompile Include="Log Class.cpp" />
+    <ClCompile Include="md5.cpp" />
+    <ClCompile Include="MemTest.cpp" />
+    <ClCompile Include="osversion.cpp" />
+    <ClCompile Include="path.cpp" />
+    <ClCompile Include="registry.cpp" />
+    <ClCompile Include="std string.cpp" />
+    <ClCompile Include="stdafx.cpp">
+      <PrecompiledHeader>Create</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="Trace.cpp" />
+    <ClCompile Include="Version.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="CriticalSection.h" />
+    <ClInclude Include="File Class.h" />
+    <ClInclude Include="Ini File Class.h" />
+    <ClInclude Include="Log Class.h" />
+    <ClInclude Include="md5.h" />
+    <ClInclude Include="MemTest.h" />
+    <ClInclude Include="osversion.h" />
+    <ClInclude Include="path.h" />
+    <ClInclude Include="registry.h" />
+    <ClInclude Include="Smart Pointer.h" />
+    <ClInclude Include="std string.h" />
+    <ClInclude Include="stdafx.h" />
+    <ClInclude Include="Trace.h" />
+    <ClInclude Include="TraceDefs.h" />
+    <ClInclude Include="Version.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/Source/Common/Common.vcxproj.filters b/Source/Common/Common.vcxproj.filters
new file mode 100644
index 000000000..f77f45322
--- /dev/null
+++ b/Source/Common/Common.vcxproj.filters
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{5842da68-d69c-48c6-a4dd-4871600401a4}</UniqueIdentifier>
+      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{f6332643-96d2-488b-90e6-f3de1582e8a0}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="File Class.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Ini File Class.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Log Class.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="md5.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="MemTest.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="osversion.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="path.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="registry.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="std string.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="stdafx.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Trace.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Version.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="CriticalSection.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="File Class.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Ini File Class.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Log Class.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="md5.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="MemTest.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="osversion.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="path.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="registry.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Smart Pointer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="std string.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="stdafx.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Trace.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="TraceDefs.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Version.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Source/Common/File Class.cpp b/Source/Common/File Class.cpp
index e0dfc358c..0c3134eb1 100644
--- a/Source/Common/File Class.cpp	
+++ b/Source/Common/File Class.cpp	
@@ -1,5 +1,4 @@
 #include "stdafx.h"
-#include <atlbase.h>
 
 CFile::CFile() :
 	m_hFile(INVALID_HANDLE_VALUE),
@@ -13,7 +12,7 @@ CFile::CFile(HANDLE hFile) :
 {
 	if (hFile == 0)
 	{
-		ATLASSERT(hFile != 0);
+		_ASSERTE(hFile != 0);
 	}
 }
 
@@ -60,7 +59,7 @@ bool CFile::Open(LPCTSTR lpszFileName, ULONG nOpenFlags)
 		dwAccess = GENERIC_READ|GENERIC_WRITE;
 		break;
 	default:
-		ATLASSERT(false);
+		_ASSERTE(false);
 	}
 
 	COSVersion osver;
diff --git a/Source/Common/md5.cpp b/Source/Common/md5.cpp
index a8c8f6ae2..3fe2536d1 100644
--- a/Source/Common/md5.cpp
+++ b/Source/Common/md5.cpp
@@ -113,8 +113,14 @@ void MD5::update(FILE *file){
   unsigned char buffer[1024];
   int len;
 
-  while (len=(int)fread(buffer, 1, 1024, file))
-    update(buffer, len);
+  do
+  {
+	  len = (int)fread(buffer, 1, 1024, file);
+	  if (len)
+	  {
+		  update(buffer, len);
+	  }
+  } while (len);
 
   fclose (file);
 
diff --git a/Source/Common/path.cpp b/Source/Common/path.cpp
index dffd79696..51b5bafc0 100644
--- a/Source/Common/path.cpp
+++ b/Source/Common/path.cpp
@@ -2,7 +2,6 @@
 //
 //////////////////////////////////////////////////////////////////////
 #include "stdafx.h"
-#include <atlbase.h>
 #include <Shlobj.h>
 
 //////////////////////////////////////////////////////////////////////
@@ -415,7 +414,7 @@ void CPath::SpecialDirectory(SpecialDirectoryType eInitialDir)
 	default:
 		// Accept only constants we know about
 		//Bugger
-		ATLASSERT(false);
+		_ASSERTE(false);
 		break;
 	}
 }
@@ -2243,13 +2242,7 @@ BOOL CPath::AttributesMatch(ULONG dwTargetAttributes, ULONG dwFileAttributes)
 	{
 		return ((_A_SUBDIR & dwFileAttributes) == 0);
 	}
-	else
-	{
-		return ( ((dwTargetAttributes & dwFileAttributes) != 0) &&
-				 ((_A_SUBDIR & dwTargetAttributes) == (_A_SUBDIR & dwFileAttributes)) );
-	}
-
-    return FALSE;
+	return ( ((dwTargetAttributes & dwFileAttributes) != 0) && ((_A_SUBDIR & dwTargetAttributes) == (_A_SUBDIR & dwFileAttributes)) );
 }
 
 //-------------------------------------------------------------
diff --git a/Source/Glide64/Glide64.vcxproj b/Source/Glide64/Glide64.vcxproj
new file mode 100644
index 000000000..3e920db13
--- /dev/null
+++ b/Source/Glide64/Glide64.vcxproj
@@ -0,0 +1,189 @@
+<?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="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{A4D13408-A794-4199-8FC7-4A9A32505005}</ProjectGuid>
+    <RootNamespace>n64Glide</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(SolutionDir)PropertySheets/Win32.Release.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(SolutionDir)PropertySheets/Win32.Debug.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <TargetName>PJ64Glide64_d</TargetName>
+    <OutDir>$(SolutionDir)Plugin\GFX\</OutDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(SolutionDir)Plugin\GFX\</OutDir>
+    <TargetName>PJ64Glide64</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(Root)Source/3rd Party/wx/include;$(Root)Source/3rd Party/wx/include/msvc;inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>__MSC__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeader />
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>$(Root)Source\3rd Party\wx\lib\vc_lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(Root)Source/3rd Party/wx/include;$(Root)Source/3rd Party/wx/include/msvc;inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>__MSC__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeader />
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>$(Root)Source\3rd Party\wx\lib\vc_lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="turbo3D.h" />
+    <ClInclude Include="ucode.h" />
+    <ClInclude Include="ucode00.h" />
+    <ClInclude Include="ucode01.h" />
+    <ClInclude Include="ucode02.h" />
+    <ClInclude Include="ucode03.h" />
+    <ClInclude Include="ucode04.h" />
+    <ClInclude Include="ucode05.h" />
+    <ClInclude Include="ucode06.h" />
+    <ClInclude Include="ucode07.h" />
+    <ClInclude Include="ucode08.h" />
+    <ClInclude Include="ucode09.h" />
+    <ClInclude Include="ucode09rdp.h" />
+    <ClInclude Include="ucodeFB.h" />
+    <ClInclude Include="CRC.h" />
+    <ClInclude Include="MiClWr16b.h" />
+    <ClInclude Include="MiClWr32b.h" />
+    <ClInclude Include="MiClWr8b.h" />
+    <ClInclude Include="TexCache.h" />
+    <ClInclude Include="TexConv.h" />
+    <ClInclude Include="TexLoad.h" />
+    <ClInclude Include="TexLoad16b.h" />
+    <ClInclude Include="TexLoad32b.h" />
+    <ClInclude Include="TexLoad4b.h" />
+    <ClInclude Include="TexLoad8b.h" />
+    <ClInclude Include="TexMod.h" />
+    <ClInclude Include="TexModCI.h" />
+    <ClInclude Include="Config.h" />
+    <ClInclude Include="cursor.h" />
+    <ClInclude Include="font.h" />
+    <ClInclude Include="resource.h" />
+    <ClInclude Include="3dmath.h" />
+    <ClInclude Include="Combine.h" />
+    <ClInclude Include="Debugger.h" />
+    <ClInclude Include="DepthBufferRender.h" />
+    <ClInclude Include="Ext_TxFilter.h" />
+    <ClInclude Include="FBtoScreen.h" />
+    <ClInclude Include="Gfx #1.3.h" />
+    <ClInclude Include="GlideExtensions.h" />
+    <ClInclude Include="Keys.h" />
+    <ClInclude Include="rdp.h" />
+    <ClInclude Include="TexBuffer.h" />
+    <ClInclude Include="Util.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="CRC.cpp" />
+    <ClCompile Include="TexCache.cpp" />
+    <ClCompile Include="Texture.asm.cpp" />
+    <ClCompile Include="Config.cpp" />
+    <ClCompile Include="3dmath.cpp" />
+    <ClCompile Include="3dmathSIMD.asm.cpp" />
+    <ClCompile Include="Combine.cpp" />
+    <ClCompile Include="Debugger.cpp" />
+    <ClCompile Include="DepthBufferRender.cpp" />
+    <ClCompile Include="Ext_TxFilter.cpp" />
+    <ClCompile Include="FBtoScreen.cpp" />
+    <ClCompile Include="FixedPoint.asm.cpp" />
+    <ClCompile Include="Keys.cpp" />
+    <ClCompile Include="Main.cpp" />
+    <ClCompile Include="rdp.cpp" />
+    <ClCompile Include="TexBuffer.cpp" />
+    <ClCompile Include="Util.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="gpl.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="australia.xpm" />
+    <None Include="brazil.xpm" />
+    <None Include="france.xpm" />
+    <None Include="japan.xpm" />
+    <None Include="logo.xpm" />
+    <None Include="russia.xpm" />
+    <None Include="usa.xpm" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="Glide64.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\3rd Party\wx\wx_base.vcxproj">
+      <Project>{427f1dcd-3bed-4010-9322-077a4c06d871}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\3rd Party\wx\wx_core.vcxproj">
+      <Project>{93447136-facd-4740-8f35-fc46fb4a9e82}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\3rd Party\wx\wx_wxjpeg.vcxproj">
+      <Project>{93cfedf3-9a75-4484-b169-d9d8074f5ac2}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\3rd Party\wx\wx_wxpng.vcxproj">
+      <Project>{05b9cb11-12d1-47cd-8e4a-88e12162119b}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\3rd Party\wx\wx_wxzlib.vcxproj">
+      <Project>{25a25249-c284-4c5a-8dc2-26fc3eb13703}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\Common\Common.vcxproj">
+      <Project>{b4a4b994-9111-42b1-93c2-6f1ca8bc4421}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\GlideHQ\GlideHQ.vcxproj">
+      <Project>{2daddaa5-0f57-46ed-a974-747908ddc7f3}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\Glitch64\Glitch64.vcxproj">
+      <Project>{462c2608-182f-452c-944f-af201e19300b}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\Settings\Settings.vcxproj">
+      <Project>{8b9961b1-88d9-4ea3-a752-507a00dd9f3d}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/Source/Glide64/Glide64.vcxproj.filters b/Source/Glide64/Glide64.vcxproj.filters
new file mode 100644
index 000000000..405f40d56
--- /dev/null
+++ b/Source/Glide64/Glide64.vcxproj.filters
@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="ucode">
+      <UniqueIdentifier>{27e3a0da-75ed-4f27-8b34-e688ef226011}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Texture">
+      <UniqueIdentifier>{c3c04c2d-bf87-47c1-a72f-1ed2ca98d219}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Config">
+      <UniqueIdentifier>{0e996a30-185f-4191-b77d-b88d86055b8c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Doc">
+      <UniqueIdentifier>{a8253215-16b6-4579-9f98-538ad5f4a6c3}</UniqueIdentifier>
+      <Extensions>txt</Extensions>
+    </Filter>
+    <Filter Include="Icons">
+      <UniqueIdentifier>{a4bb9cf1-305d-4c72-bb6e-c494301dcdad}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Res">
+      <UniqueIdentifier>{f0e9ed7a-3046-4b82-a4b1-5f58e1fe7446}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="turbo3D.h">
+      <Filter>ucode</Filter>
+    </ClInclude>
+    <ClInclude Include="ucode.h">
+      <Filter>ucode</Filter>
+    </ClInclude>
+    <ClInclude Include="ucode00.h">
+      <Filter>ucode</Filter>
+    </ClInclude>
+    <ClInclude Include="ucode01.h">
+      <Filter>ucode</Filter>
+    </ClInclude>
+    <ClInclude Include="ucode02.h">
+      <Filter>ucode</Filter>
+    </ClInclude>
+    <ClInclude Include="ucode03.h">
+      <Filter>ucode</Filter>
+    </ClInclude>
+    <ClInclude Include="ucode04.h">
+      <Filter>ucode</Filter>
+    </ClInclude>
+    <ClInclude Include="ucode05.h">
+      <Filter>ucode</Filter>
+    </ClInclude>
+    <ClInclude Include="ucode06.h">
+      <Filter>ucode</Filter>
+    </ClInclude>
+    <ClInclude Include="ucode07.h">
+      <Filter>ucode</Filter>
+    </ClInclude>
+    <ClInclude Include="ucode08.h">
+      <Filter>ucode</Filter>
+    </ClInclude>
+    <ClInclude Include="ucode09.h">
+      <Filter>ucode</Filter>
+    </ClInclude>
+    <ClInclude Include="ucode09rdp.h">
+      <Filter>ucode</Filter>
+    </ClInclude>
+    <ClInclude Include="ucodeFB.h">
+      <Filter>ucode</Filter>
+    </ClInclude>
+    <ClInclude Include="CRC.h">
+      <Filter>Texture</Filter>
+    </ClInclude>
+    <ClInclude Include="MiClWr16b.h">
+      <Filter>Texture</Filter>
+    </ClInclude>
+    <ClInclude Include="MiClWr32b.h">
+      <Filter>Texture</Filter>
+    </ClInclude>
+    <ClInclude Include="MiClWr8b.h">
+      <Filter>Texture</Filter>
+    </ClInclude>
+    <ClInclude Include="TexCache.h">
+      <Filter>Texture</Filter>
+    </ClInclude>
+    <ClInclude Include="TexConv.h">
+      <Filter>Texture</Filter>
+    </ClInclude>
+    <ClInclude Include="TexLoad.h">
+      <Filter>Texture</Filter>
+    </ClInclude>
+    <ClInclude Include="TexLoad16b.h">
+      <Filter>Texture</Filter>
+    </ClInclude>
+    <ClInclude Include="TexLoad32b.h">
+      <Filter>Texture</Filter>
+    </ClInclude>
+    <ClInclude Include="TexLoad4b.h">
+      <Filter>Texture</Filter>
+    </ClInclude>
+    <ClInclude Include="TexLoad8b.h">
+      <Filter>Texture</Filter>
+    </ClInclude>
+    <ClInclude Include="TexMod.h">
+      <Filter>Texture</Filter>
+    </ClInclude>
+    <ClInclude Include="TexModCI.h">
+      <Filter>Texture</Filter>
+    </ClInclude>
+    <ClInclude Include="Config.h">
+      <Filter>Config</Filter>
+    </ClInclude>
+    <ClInclude Include="cursor.h">
+      <Filter>Res</Filter>
+    </ClInclude>
+    <ClInclude Include="font.h">
+      <Filter>Res</Filter>
+    </ClInclude>
+    <ClInclude Include="resource.h">
+      <Filter>Res</Filter>
+    </ClInclude>
+    <ClInclude Include="3dmath.h" />
+    <ClInclude Include="Combine.h" />
+    <ClInclude Include="Debugger.h" />
+    <ClInclude Include="DepthBufferRender.h" />
+    <ClInclude Include="Ext_TxFilter.h" />
+    <ClInclude Include="FBtoScreen.h" />
+    <ClInclude Include="Gfx #1.3.h" />
+    <ClInclude Include="GlideExtensions.h" />
+    <ClInclude Include="Keys.h" />
+    <ClInclude Include="rdp.h" />
+    <ClInclude Include="TexBuffer.h" />
+    <ClInclude Include="Util.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="CRC.cpp">
+      <Filter>Texture</Filter>
+    </ClCompile>
+    <ClCompile Include="TexCache.cpp">
+      <Filter>Texture</Filter>
+    </ClCompile>
+    <ClCompile Include="Texture.asm.cpp">
+      <Filter>Texture</Filter>
+    </ClCompile>
+    <ClCompile Include="Config.cpp">
+      <Filter>Config</Filter>
+    </ClCompile>
+    <ClCompile Include="3dmath.cpp" />
+    <ClCompile Include="3dmathSIMD.asm.cpp" />
+    <ClCompile Include="Combine.cpp" />
+    <ClCompile Include="Debugger.cpp" />
+    <ClCompile Include="DepthBufferRender.cpp" />
+    <ClCompile Include="Ext_TxFilter.cpp" />
+    <ClCompile Include="FBtoScreen.cpp" />
+    <ClCompile Include="FixedPoint.asm.cpp" />
+    <ClCompile Include="Keys.cpp" />
+    <ClCompile Include="Main.cpp" />
+    <ClCompile Include="rdp.cpp" />
+    <ClCompile Include="TexBuffer.cpp" />
+    <ClCompile Include="Util.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="gpl.txt">
+      <Filter>Doc</Filter>
+    </Text>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="australia.xpm">
+      <Filter>Icons</Filter>
+    </None>
+    <None Include="brazil.xpm">
+      <Filter>Icons</Filter>
+    </None>
+    <None Include="france.xpm">
+      <Filter>Icons</Filter>
+    </None>
+    <None Include="japan.xpm">
+      <Filter>Icons</Filter>
+    </None>
+    <None Include="logo.xpm">
+      <Filter>Icons</Filter>
+    </None>
+    <None Include="russia.xpm">
+      <Filter>Icons</Filter>
+    </None>
+    <None Include="usa.xpm">
+      <Filter>Icons</Filter>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="Glide64.rc">
+      <Filter>Res</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Source/GlideHQ/GlideHQ.vcxproj b/Source/GlideHQ/GlideHQ.vcxproj
new file mode 100644
index 000000000..18d6c494f
--- /dev/null
+++ b/Source/GlideHQ/GlideHQ.vcxproj
@@ -0,0 +1,103 @@
+<?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="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{2DADDAA5-0F57-46ED-A974-747908DDC7F3}</ProjectGuid>
+    <RootNamespace>GlideHQ</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(SolutionDir)PropertySheets/Win32.Release.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(SolutionDir)PropertySheets/Win32.Debug.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(Root)Source/3rd Party/wx/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(Root)Source/3rd Party/wx/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="TextureFilters.cpp" />
+    <ClCompile Include="TextureFilters_2xsai.cpp" />
+    <ClCompile Include="TextureFilters_hq2x.cpp" />
+    <ClCompile Include="TextureFilters_hq4x.cpp" />
+    <ClCompile Include="TxCache.cpp" />
+    <ClCompile Include="TxDbg.cpp" />
+    <ClCompile Include="TxFilter.cpp" />
+    <ClCompile Include="TxFilterExport.cpp" />
+    <ClCompile Include="TxHiResCache.cpp" />
+    <ClCompile Include="TxImage.cpp" />
+    <ClCompile Include="TxQuantize.cpp" />
+    <ClCompile Include="TxReSample.cpp" />
+    <ClCompile Include="TxTexCache.cpp" />
+    <ClCompile Include="TxUtil.cpp" />
+    <ClCompile Include="tc-1.1+\dxtn.c" />
+    <ClCompile Include="tc-1.1+\fxt1.c" />
+    <ClCompile Include="tc-1.1+\texstore.c" />
+    <ClCompile Include="tc-1.1+\wrapper.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="Ext_TxFilter.h" />
+    <ClInclude Include="TextureFilters.h" />
+    <ClInclude Include="TextureFilters_2xsai.h" />
+    <ClInclude Include="TextureFilters_hq2x.h" />
+    <ClInclude Include="TextureFilters_hq4x.h" />
+    <ClInclude Include="TextureFilters_lq2x.h" />
+    <ClInclude Include="TxCache.h" />
+    <ClInclude Include="TxDbg.h" />
+    <ClInclude Include="TxFilter.h" />
+    <ClInclude Include="TxHiResCache.h" />
+    <ClInclude Include="TxImage.h" />
+    <ClInclude Include="TxQuantize.h" />
+    <ClInclude Include="TxTexCache.h" />
+    <ClInclude Include="TxUtil.h" />
+    <ClInclude Include="tc-1.1+\fxt1.h" />
+    <ClInclude Include="tc-1.1+\internal.h" />
+    <ClInclude Include="tc-1.1+\types.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Common\Common.vcxproj">
+      <Project>{b4a4b994-9111-42b1-93c2-6f1ca8bc4421}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/Source/GlideHQ/GlideHQ.vcxproj.filters b/Source/GlideHQ/GlideHQ.vcxproj.filters
new file mode 100644
index 000000000..cdc181abd
--- /dev/null
+++ b/Source/GlideHQ/GlideHQ.vcxproj.filters
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="tc-1.1+">
+      <UniqueIdentifier>{e42072d3-97be-40c3-b6eb-6a250288e739}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="TextureFilters.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="TextureFilters_2xsai.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="TextureFilters_hq2x.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="TextureFilters_hq4x.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="TxCache.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="TxDbg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="TxFilter.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="TxFilterExport.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="TxHiResCache.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="TxImage.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="TxQuantize.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="TxReSample.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="TxTexCache.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="TxUtil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="tc-1.1+\dxtn.c">
+      <Filter>tc-1.1+</Filter>
+    </ClCompile>
+    <ClCompile Include="tc-1.1+\fxt1.c">
+      <Filter>tc-1.1+</Filter>
+    </ClCompile>
+    <ClCompile Include="tc-1.1+\texstore.c">
+      <Filter>tc-1.1+</Filter>
+    </ClCompile>
+    <ClCompile Include="tc-1.1+\wrapper.c">
+      <Filter>tc-1.1+</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="Ext_TxFilter.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="TextureFilters.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="TextureFilters_2xsai.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="TextureFilters_hq2x.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="TextureFilters_hq4x.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="TextureFilters_lq2x.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="TxCache.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="TxDbg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="TxFilter.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="TxHiResCache.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="TxImage.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="TxQuantize.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="TxTexCache.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="TxUtil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="tc-1.1+\fxt1.h">
+      <Filter>tc-1.1+</Filter>
+    </ClInclude>
+    <ClInclude Include="tc-1.1+\internal.h">
+      <Filter>tc-1.1+</Filter>
+    </ClInclude>
+    <ClInclude Include="tc-1.1+\types.h">
+      <Filter>tc-1.1+</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Source/Glitch64/Glitch64.vcxproj b/Source/Glitch64/Glitch64.vcxproj
new file mode 100644
index 000000000..dbcceea9d
--- /dev/null
+++ b/Source/Glitch64/Glitch64.vcxproj
@@ -0,0 +1,73 @@
+<?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="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{462C2608-182F-452C-944F-AF201E19300B}</ProjectGuid>
+    <RootNamespace>glide3x</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(SolutionDir)PropertySheets/Win32.Release.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(SolutionDir)PropertySheets/Win32.Debug.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PrecompiledHeader />
+    </ClCompile>
+    <Lib>
+      <AdditionalDependencies>OpenGL32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PrecompiledHeader />
+    </ClCompile>
+    <Lib>
+      <AdditionalDependencies>OpenGL32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="3dfx-mangling.h" />
+    <ClInclude Include="main.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="combiner.cpp" />
+    <ClCompile Include="geometry.cpp" />
+    <ClCompile Include="main.cpp" />
+    <ClCompile Include="textures.cpp" />
+    <ClCompile Include="vram.cpp" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/Source/Glitch64/Glitch64.vcxproj.filters b/Source/Glitch64/Glitch64.vcxproj.filters
new file mode 100644
index 000000000..76f38032a
--- /dev/null
+++ b/Source/Glitch64/Glitch64.vcxproj.filters
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Headers">
+      <UniqueIdentifier>{67046859-ebd4-4537-aed8-a6d9f2fd82b5}</UniqueIdentifier>
+      <Extensions>*.h</Extensions>
+    </Filter>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{2b6170d8-e8e8-4f3a-94af-a88d7b8ce7d9}</UniqueIdentifier>
+      <Extensions>*.cpp</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="3dfx-mangling.h">
+      <Filter>Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="main.h">
+      <Filter>Headers</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="combiner.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="geometry.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="main.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="textures.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="vram.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Source/Installer/Installer.vcxproj b/Source/Installer/Installer.vcxproj
new file mode 100644
index 000000000..6be3dce05
--- /dev/null
+++ b/Source/Installer/Installer.vcxproj
@@ -0,0 +1,75 @@
+<?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="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>Project64Setup</ProjectName>
+    <ProjectGuid>{360A34F3-3172-4B09-8BC9-B3FBEE677863}</ProjectGuid>
+    <RootNamespace>Project64Setup</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(SolutionDir)PropertySheets/Win32.Release.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(SolutionDir)PropertySheets/Win32.Debug.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader />
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PrecompiledHeader />
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <CustomBuild Include="Installer.iss">
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(Root)bin\Inno Setup\ISCC.exe" /dConfiguration="$(Configuration)" "%(Filename).iss"
+</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)Project64.exe;%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)Setup Project64 2.0.exe;%(Outputs)</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(Root)bin\Inno Setup\ISCC.exe" /dConfiguration="$(Configuration)" "%(Filename).iss"</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)Project64.exe;%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)Setup Project64 2.0.exe;%(Outputs)</Outputs>
+    </CustomBuild>
+    <None Include="binno\binno.iss" />
+    <None Include="binno\it_download.iss" />
+    <None Include="binno\it_download_u.iss" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Project64\Project64.vcxproj">
+      <Project>{7e534c8e-1ace-4a88-8807-39a11ed4da18}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/Source/Installer/Installer.vcxproj.filters b/Source/Installer/Installer.vcxproj.filters
new file mode 100644
index 000000000..419b40f53
--- /dev/null
+++ b/Source/Installer/Installer.vcxproj.filters
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{93ba3998-9310-4111-bfd3-a907e3452213}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\binno">
+      <UniqueIdentifier>{389ec096-ad75-499a-82a2-f6b5dbe0ed90}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="binno\binno.iss">
+      <Filter>Source Files\binno</Filter>
+    </None>
+    <None Include="binno\it_download.iss">
+      <Filter>Source Files\binno</Filter>
+    </None>
+    <None Include="binno\it_download_u.iss">
+      <Filter>Source Files\binno</Filter>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="Installer.iss">
+      <Filter>Source Files</Filter>
+    </CustomBuild>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Source/Project64/N64 System/Cheat Class.cpp b/Source/Project64/N64 System/Cheat Class.cpp
index d65432140..4178fa529 100644
--- a/Source/Project64/N64 System/Cheat Class.cpp	
+++ b/Source/Project64/N64 System/Cheat Class.cpp	
@@ -478,7 +478,7 @@ DWORD CCheats::AsciiToHex (const char * HexValue) {
 	return Value;
 }
 
-void CCheats::AddCodeLayers (int CheatNumber, const stdstr &CheatName, WND_HANDLE hParent, bool CheatActive) {
+void CCheats::AddCodeLayers (int CheatNumber, const stdstr &CheatName, HWND hParent, bool CheatActive) {
 	TV_INSERTSTRUCT tv;
 	
 	//Work out text to add
@@ -496,9 +496,9 @@ void CCheats::AddCodeLayers (int CheatNumber, const stdstr &CheatName, WND_HANDL
 		TreeView_GetItem((HWND)m_hCheatTree,&tv.item);
 		if (strcmp(Text,Item) == 0) { 
 			//If already exists then just use existing one
-			int State = TV_GetCheckState(m_hCheatTree,(WND_HANDLE)tv.item.hItem);
+			int State = TV_GetCheckState(m_hCheatTree,(HWND)tv.item.hItem);
 			if ((CheatActive && State == TV_STATE_CLEAR) || (!CheatActive && State == TV_STATE_CHECKED)) { 
-				TV_SetCheckState(m_hCheatTree,(WND_HANDLE)tv.item.hItem,TV_STATE_INDETERMINATE); 
+				TV_SetCheckState(m_hCheatTree,(HWND)tv.item.hItem,TV_STATE_INDETERMINATE); 
 			}
 			size_t StartPos = strlen(Text) + 1;
 			stdstr TempCheatName;
@@ -506,7 +506,7 @@ void CCheats::AddCodeLayers (int CheatNumber, const stdstr &CheatName, WND_HANDL
 			{
 				TempCheatName = CheatName.substr(StartPos);
 			}
-			AddCodeLayers(CheatNumber,TempCheatName, (WND_HANDLE)tv.item.hItem, CheatActive);
+			AddCodeLayers(CheatNumber,TempCheatName, (HWND)tv.item.hItem, CheatActive);
 			return; 
 		}
 		tv.item.hItem = TreeView_GetNextSibling((HWND)m_hCheatTree,tv.item.hItem);
@@ -518,7 +518,7 @@ void CCheats::AddCodeLayers (int CheatNumber, const stdstr &CheatName, WND_HANDL
 	tv.item.pszText = Text;
 	tv.item.lParam  = CheatNumber;
 	tv.hParent      = (HTREEITEM)hParent;
-	hParent = (WND_HANDLE)TreeView_InsertItem((HWND)m_hCheatTree,&tv);
+	hParent = (HWND)TreeView_InsertItem((HWND)m_hCheatTree,&tv);
 	TV_SetCheckState(m_hCheatTree,hParent,CheatActive?TV_STATE_CHECKED:TV_STATE_CLEAR);
 
 	if (strcmp(Text,CheatName.c_str()) == 0) { return; }
@@ -586,11 +586,11 @@ void CCheats::RefreshCheatManager(void)
 		stdstr Name = GetCheatName(i,true);
 		if (Name.length() == 0) { break; }
 
-		AddCodeLayers(i,Name,(WND_HANDLE)TVI_ROOT, g_Settings->LoadBoolIndex(Cheat_Active,i) != 0);
+		AddCodeLayers(i,Name,(HWND)TVI_ROOT, g_Settings->LoadBoolIndex(Cheat_Active,i) != 0);
 	}
 }
 
-stdstr CCheats::GetDlgItemStr (WND_HANDLE hDlg, int nIDDlgItem)
+stdstr CCheats::GetDlgItemStr (HWND hDlg, int nIDDlgItem)
 {
 	HWND hDlgItem = GetDlgItem((HWND)hDlg,nIDDlgItem);
 	int length = SendMessage(hDlgItem, WM_GETTEXTLENGTH, 0, 0);
@@ -607,7 +607,7 @@ stdstr CCheats::GetDlgItemStr (WND_HANDLE hDlg, int nIDDlgItem)
 	return Result;
 }
 
-void CCheats::SelectCheats(WND_HANDLE hParent, bool BlockExecution) {
+void CCheats::SelectCheats(HWND hParent, bool BlockExecution) {
 	if (m_Window != NULL) {
 		SetForegroundWindow((HWND)m_Window);
 		return;
@@ -626,7 +626,7 @@ void CCheats::SelectCheats(WND_HANDLE hParent, bool BlockExecution) {
 }
 
 
-bool CCheats::CheatChanged (WND_HANDLE hDlg)
+bool CCheats::CheatChanged (HWND hDlg)
 {
 	bool Changed = false;
 	if (m_EditName    != GetDlgItemStr(hDlg,IDC_CODE_NAME) ||
@@ -652,7 +652,7 @@ bool CCheats::CheatChanged (WND_HANDLE hDlg)
 	return false;
 }
 
-void CCheats::RecordCheatValues ( WND_HANDLE hDlg )
+void CCheats::RecordCheatValues ( HWND hDlg )
 {
 	m_EditName    = GetDlgItemStr(hDlg,IDC_CODE_NAME);
 	m_EditCode    = GetDlgItemStr(hDlg,IDC_CHEAT_CODES);
@@ -660,7 +660,7 @@ void CCheats::RecordCheatValues ( WND_HANDLE hDlg )
 	m_EditNotes   = GetDlgItemStr(hDlg,IDC_NOTES);
 }
 
-int CALLBACK CCheats::CheatAddProc (WND_HANDLE hDlg,DWORD uMsg,DWORD wParam, DWORD lParam) {
+int CALLBACK CCheats::CheatAddProc (HWND hDlg,DWORD uMsg,DWORD wParam, DWORD lParam) {
 	switch (uMsg) {
 	case WM_INITDIALOG:
 		{
@@ -895,7 +895,7 @@ int CALLBACK CCheats::CheatAddProc (WND_HANDLE hDlg,DWORD uMsg,DWORD wParam, DWO
 	return true;
 }
 
-int CALLBACK CCheats::CheatListProc (WND_HANDLE hDlg,DWORD uMsg,DWORD wParam, DWORD lParam) {
+int CALLBACK CCheats::CheatListProc (HWND hDlg,DWORD uMsg,DWORD wParam, DWORD lParam) {
 	switch (uMsg) {
 	case WM_INITDIALOG:
 		{
@@ -913,7 +913,7 @@ int CALLBACK CCheats::CheatListProc (WND_HANDLE hDlg,DWORD uMsg,DWORD wParam, DW
 			GetWindowRect(GetDlgItem((HWND)hDlg, IDC_CHEATSFRAME), &rcList);
 			GetWindowRect(GetDlgItem((HWND)hDlg, IDC_UNMARK), &rcButton);
 
-			_this->m_hCheatTree = (WND_HANDLE)CreateWindowEx(WS_EX_CLIENTEDGE,WC_TREEVIEW,"",
+			_this->m_hCheatTree = (HWND)CreateWindowEx(WS_EX_CLIENTEDGE,WC_TREEVIEW,"",
 					WS_CHILD | WS_BORDER | WS_VISIBLE | WS_VSCROLL | TVS_HASLINES | 
 					TVS_HASBUTTONS | TVS_LINESATROOT  | TVS_DISABLEDRAGDROP |WS_TABSTOP|
 					TVS_FULLROWSELECT, 8, 15, rcList.right-rcList.left-16, 
@@ -959,13 +959,13 @@ int CALLBACK CCheats::CheatListProc (WND_HANDLE hDlg,DWORD uMsg,DWORD wParam, DW
 					item.mask = TVIF_PARAM ;
 					TreeView_GetItem((HWND)_this->m_hCheatTree,&item);
 
-					_this->ChangeChildrenStatus((WND_HANDLE)TVI_ROOT,false); 
+					_this->ChangeChildrenStatus((HWND)TVI_ROOT,false); 
 					_this->DeleteCheat(item.lParam);
 					_this->RefreshCheatManager();
 				}
 				break;
 			case IDC_UNMARK: 
-				_this->ChangeChildrenStatus((WND_HANDLE)TVI_ROOT,false); 
+				_this->ChangeChildrenStatus((HWND)TVI_ROOT,false); 
 				_this->m_CheatSelectionChanged = true;
 				break;
 			}
@@ -994,7 +994,7 @@ int CALLBACK CCheats::CheatListProc (WND_HANDLE hDlg,DWORD uMsg,DWORD wParam, DW
 				MapWindowPoints(HWND_DESKTOP, lpnmh->hwndFrom, &ht.pt, 1);
 
 				TreeView_HitTest(lpnmh->hwndFrom, &ht);
-				_this->m_hSelectedItem = (WND_HANDLE)ht.hItem;
+				_this->m_hSelectedItem = (HWND)ht.hItem;
 				if (g_Settings->LoadBool(UserInterface_BasicMode)) { return true; }
 
 				//Show Menu
@@ -1004,9 +1004,9 @@ int CALLBACK CCheats::CheatListProc (WND_HANDLE hDlg,DWORD uMsg,DWORD wParam, DW
 
 				GetCursorPos(&Mouse);
 					
-				MenuSetText((MENU_HANDLE)hPopupMenu, 0, GS(CHEAT_ADDNEW), NULL);
-				MenuSetText((MENU_HANDLE)hPopupMenu, 1, GS(CHEAT_EDIT), NULL);
-				MenuSetText((MENU_HANDLE)hPopupMenu, 3, GS(CHEAT_DELETE), NULL);
+				MenuSetText((HMENU)hPopupMenu, 0, GS(CHEAT_ADDNEW), NULL);
+				MenuSetText((HMENU)hPopupMenu, 1, GS(CHEAT_EDIT), NULL);
+				MenuSetText((HMENU)hPopupMenu, 3, GS(CHEAT_DELETE), NULL);
 
 				if (_this->m_hSelectedItem == NULL || 
 					TreeView_GetChild((HWND)_this->m_hCheatTree,_this->m_hSelectedItem) != NULL) 
@@ -1033,11 +1033,11 @@ int CALLBACK CCheats::CheatListProc (WND_HANDLE hDlg,DWORD uMsg,DWORD wParam, DW
 				if(TVHT_ONITEMSTATEICON & ht.flags)
 				{
 
-					switch (TV_GetCheckState(_this->m_hCheatTree,(WND_HANDLE)ht.hItem)) {
+					switch (TV_GetCheckState(_this->m_hCheatTree,(HWND)ht.hItem)) {
 					case TV_STATE_CLEAR:
 					case TV_STATE_INDETERMINATE: 
 						//Make sure that the item has a valid code extenstion selected
-						if (TreeView_GetChild((HWND)_this->m_hCheatTree, (WND_HANDLE)ht.hItem) == NULL) {
+						if (TreeView_GetChild((HWND)_this->m_hCheatTree, (HWND)ht.hItem) == NULL) {
 							TVITEM item;
 							item.mask  = TVIF_PARAM ;
 							item.hItem = (HTREEITEM)ht.hItem;
@@ -1049,25 +1049,25 @@ int CALLBACK CCheats::CheatListProc (WND_HANDLE hDlg,DWORD uMsg,DWORD wParam, DW
 								if (!g_Settings->LoadStringIndex(Cheat_Extension,item.lParam,CheatExtension))
 								{
 									SendMessage((HWND)hDlg, UM_CHANGECODEEXTENSION, 0, (LPARAM)ht.hItem);
-									TV_SetCheckState(_this->m_hCheatTree,(WND_HANDLE)ht.hItem,TV_STATE_CLEAR); 
+									TV_SetCheckState(_this->m_hCheatTree,(HWND)ht.hItem,TV_STATE_CLEAR); 
 									break;
 								}
 							}
 						}
-						TV_SetCheckState(_this->m_hCheatTree,(WND_HANDLE)ht.hItem,TV_STATE_CHECKED); 
-						_this->ChangeChildrenStatus((WND_HANDLE)ht.hItem,true);
-						_this->CheckParentStatus((WND_HANDLE)TreeView_GetParent((HWND)_this->m_hCheatTree,ht.hItem));
+						TV_SetCheckState(_this->m_hCheatTree,(HWND)ht.hItem,TV_STATE_CHECKED); 
+						_this->ChangeChildrenStatus((HWND)ht.hItem,true);
+						_this->CheckParentStatus((HWND)TreeView_GetParent((HWND)_this->m_hCheatTree,ht.hItem));
 						break;
 					case TV_STATE_CHECKED: 
-						TV_SetCheckState(_this->m_hCheatTree,(WND_HANDLE)ht.hItem,TV_STATE_CLEAR); 
-						_this->ChangeChildrenStatus((WND_HANDLE)ht.hItem,false);
-						_this->CheckParentStatus((WND_HANDLE)TreeView_GetParent((HWND)_this->m_hCheatTree,ht.hItem));
+						TV_SetCheckState(_this->m_hCheatTree,(HWND)ht.hItem,TV_STATE_CLEAR); 
+						_this->ChangeChildrenStatus((HWND)ht.hItem,false);
+						_this->CheckParentStatus((HWND)TreeView_GetParent((HWND)_this->m_hCheatTree,ht.hItem));
 						break;
 					}
-					switch (TV_GetCheckState(_this->m_hCheatTree,(WND_HANDLE)ht.hItem)) {
-					case TV_STATE_CHECKED: TV_SetCheckState(_this->m_hCheatTree,(WND_HANDLE)ht.hItem,TV_STATE_INDETERMINATE); break;
-					case TV_STATE_CLEAR:   TV_SetCheckState(_this->m_hCheatTree,(WND_HANDLE)ht.hItem,TV_STATE_CHECKED); break;
-					case TV_STATE_INDETERMINATE: TV_SetCheckState(_this->m_hCheatTree,(WND_HANDLE)ht.hItem,TV_STATE_CLEAR); break;
+					switch (TV_GetCheckState(_this->m_hCheatTree,(HWND)ht.hItem)) {
+					case TV_STATE_CHECKED: TV_SetCheckState(_this->m_hCheatTree,(HWND)ht.hItem,TV_STATE_INDETERMINATE); break;
+					case TV_STATE_CLEAR:   TV_SetCheckState(_this->m_hCheatTree,(HWND)ht.hItem,TV_STATE_CHECKED); break;
+					case TV_STATE_INDETERMINATE: TV_SetCheckState(_this->m_hCheatTree,(HWND)ht.hItem,TV_STATE_CLEAR); break;
 					}
 
 					_this->m_CheatSelectionChanged = true;
@@ -1118,7 +1118,7 @@ int CALLBACK CCheats::CheatListProc (WND_HANDLE hDlg,DWORD uMsg,DWORD wParam, DW
 			CCheats   * _this = (CCheats *)GetProp((HWND)hDlg,"Class");
 ;
 			//Get the selected item
-			_this->m_hSelectedItem = (WND_HANDLE)lParam;
+			_this->m_hSelectedItem = (HWND)lParam;
 			TVITEM item;
 			item.mask = TVIF_PARAM ;
 			item.hItem = (HTREEITEM)_this->m_hSelectedItem;
@@ -1160,7 +1160,7 @@ int CALLBACK CCheats::CheatListProc (WND_HANDLE hDlg,DWORD uMsg,DWORD wParam, DW
 	return true;
 }
 
-int CALLBACK CCheats::CheatsCodeExProc (WND_HANDLE hDlg,DWORD uMsg,DWORD wParam, DWORD lParam) {
+int CALLBACK CCheats::CheatsCodeExProc (HWND hDlg,DWORD uMsg,DWORD wParam, DWORD lParam) {
 	switch (uMsg) {
 	case WM_INITDIALOG:
 		{
@@ -1237,7 +1237,7 @@ int CALLBACK CCheats::CheatsCodeExProc (WND_HANDLE hDlg,DWORD uMsg,DWORD wParam,
 	return true;
 }
 
-int CALLBACK CCheats::CheatsCodeQuantProc (WND_HANDLE hDlg,DWORD uMsg,DWORD wParam, DWORD lParam) {
+int CALLBACK CCheats::CheatsCodeQuantProc (HWND hDlg,DWORD uMsg,DWORD wParam, DWORD lParam) {
 	static WORD Start, Stop, SelStart, SelStop;
 
 	switch (uMsg) {
@@ -1346,7 +1346,7 @@ bool CCheats::IsCheatMessage( MSG * msg )
 	return false;
 }
 
-int CALLBACK CCheats::ManageCheatsProc (WND_HANDLE hDlg,DWORD uMsg,DWORD wParam, DWORD lParam) {
+int CALLBACK CCheats::ManageCheatsProc (HWND hDlg,DWORD uMsg,DWORD wParam, DWORD lParam) {
 	switch (uMsg) {
 	case WM_INITDIALOG:
 		{
@@ -1359,7 +1359,7 @@ int CALLBACK CCheats::ManageCheatsProc (WND_HANDLE hDlg,DWORD uMsg,DWORD wParam,
 			GetWindowPlacement((HWND)hDlg, &WndPlac);
 
 			SetWindowText((HWND)hDlg, GS(CHEAT_TITLE));
-			_this->m_hSelectCheat = (WND_HANDLE)CreateDialogParam(GetModuleHandle(NULL), MAKEINTRESOURCE(IDD_Cheats_List),(HWND)hDlg,(DLGPROC)CheatListProc,(LPARAM)_this);
+			_this->m_hSelectCheat = (HWND)CreateDialogParam(GetModuleHandle(NULL), MAKEINTRESOURCE(IDD_Cheats_List),(HWND)hDlg,(DLGPROC)CheatListProc,(LPARAM)_this);
 			SetWindowPos((HWND)_this->m_hSelectCheat,HWND_TOP, 5, 8, 0, 0, SWP_NOSIZE);
 			ShowWindow((HWND)_this->m_hSelectCheat,SW_SHOW);
 
@@ -1377,7 +1377,7 @@ int CALLBACK CCheats::ManageCheatsProc (WND_HANDLE hDlg,DWORD uMsg,DWORD wParam,
 
 				ShowWindow(GetDlgItem((HWND)hDlg, IDC_STATE),SW_HIDE);
 			} else {
-				_this->m_AddCheat = (WND_HANDLE)CreateDialogParam(GetModuleHandle(NULL), MAKEINTRESOURCE(IDD_Cheats_Add),(HWND)hDlg,(DLGPROC)CheatAddProc,(LPARAM)_this);
+				_this->m_AddCheat = (HWND)CreateDialogParam(GetModuleHandle(NULL), MAKEINTRESOURCE(IDD_Cheats_Add),(HWND)hDlg,(DLGPROC)CheatAddProc,(LPARAM)_this);
 				SetWindowPos((HWND)_this->m_AddCheat, HWND_TOP, (rc->right - rc->left)/2, 8, 0, 0, SWP_NOSIZE);
 				ShowWindow((HWND)_this->m_AddCheat,SW_HIDE);
 
@@ -1478,7 +1478,7 @@ int CALLBACK CCheats::ManageCheatsProc (WND_HANDLE hDlg,DWORD uMsg,DWORD wParam,
 	return true;
 }
 
-bool CCheats::TV_SetCheckState(WND_HANDLE hwndTreeView, WND_HANDLE hItem, TV_CHECK_STATE state)
+bool CCheats::TV_SetCheckState(HWND hwndTreeView, HWND hItem, TV_CHECK_STATE state)
 {
     TVITEM tvItem;
 
@@ -1498,7 +1498,7 @@ bool CCheats::TV_SetCheckState(WND_HANDLE hwndTreeView, WND_HANDLE hItem, TV_CHE
     return TreeView_SetItem((HWND)hwndTreeView, &tvItem) != 0;
 }
 
-int CCheats::TV_GetCheckState(WND_HANDLE hwndTreeView, WND_HANDLE hItem)
+int CCheats::TV_GetCheckState(HWND hwndTreeView, HWND hItem)
 {
     TVITEM tvItem;
 
@@ -1519,7 +1519,7 @@ int CCheats::TV_GetCheckState(WND_HANDLE hwndTreeView, WND_HANDLE hItem)
 	return ((int)(tvItem.state >> 12) -1);
 }
 
-void CCheats::MenuSetText ( MENU_HANDLE hMenu, int MenuPos, const char * Title, char * ShotCut) {
+void CCheats::MenuSetText ( HMENU hMenu, int MenuPos, const char * Title, char * ShotCut) {
 	MENUITEMINFO MenuInfo;
 	char String[256];
 
@@ -1604,7 +1604,7 @@ void CCheats::DeleteCheat(int Index)
 	CSettingTypeCheats::FlushChanges();
 }
 
-void CCheats::ChangeChildrenStatus(WND_HANDLE hParent, bool Checked) {
+void CCheats::ChangeChildrenStatus(HWND hParent, bool Checked) {
 	HTREEITEM hItem = TreeView_GetChild((HWND)m_hCheatTree, hParent);
 	if (hItem == NULL) {
 		if ((HTREEITEM)hParent == TVI_ROOT) { return; }
@@ -1632,13 +1632,13 @@ void CCheats::ChangeChildrenStatus(WND_HANDLE hParent, bool Checked) {
 	}
 	TV_CHECK_STATE state = TV_STATE_UNKNOWN;
 	while (hItem != NULL) {
-		TV_CHECK_STATE ChildState = (TV_CHECK_STATE)TV_GetCheckState(m_hCheatTree,(WND_HANDLE)hItem);
+		TV_CHECK_STATE ChildState = (TV_CHECK_STATE)TV_GetCheckState(m_hCheatTree,(HWND)hItem);
 		if ((ChildState != TV_STATE_CHECKED || !Checked) && 
 			(ChildState != TV_STATE_CLEAR   || Checked))
 		{
-			ChangeChildrenStatus((WND_HANDLE)hItem,Checked);
+			ChangeChildrenStatus((HWND)hItem,Checked);
 		}
-		ChildState = (TV_CHECK_STATE)TV_GetCheckState(m_hCheatTree,(WND_HANDLE)hItem);
+		ChildState = (TV_CHECK_STATE)TV_GetCheckState(m_hCheatTree,(HWND)hItem);
 		if (state == TV_STATE_UNKNOWN) { state = ChildState; }
 		if (state != ChildState) { state = TV_STATE_INDETERMINATE; }
 		hItem = TreeView_GetNextSibling((HWND)m_hCheatTree,hItem);
@@ -1648,29 +1648,29 @@ void CCheats::ChangeChildrenStatus(WND_HANDLE hParent, bool Checked) {
 	}
 }
 
-void CCheats::CheckParentStatus(WND_HANDLE hParent) {
+void CCheats::CheckParentStatus(HWND hParent) {
 	TV_CHECK_STATE CurrentState, InitialState;
 	HTREEITEM hItem;
 
 	if (!hParent) { return; }
 	hItem = TreeView_GetChild((HWND)m_hCheatTree, (HTREEITEM)hParent);	
 	InitialState = (TV_CHECK_STATE)TV_GetCheckState(m_hCheatTree,hParent);
-	CurrentState = (TV_CHECK_STATE)TV_GetCheckState((WND_HANDLE)m_hCheatTree,(WND_HANDLE)hItem);
+	CurrentState = (TV_CHECK_STATE)TV_GetCheckState((HWND)m_hCheatTree,(HWND)hItem);
 	
 	while (hItem != NULL) {
-		if (TV_GetCheckState((WND_HANDLE)m_hCheatTree,(WND_HANDLE)hItem) != CurrentState) { 
+		if (TV_GetCheckState((HWND)m_hCheatTree,(HWND)hItem) != CurrentState) { 
 			CurrentState = TV_STATE_INDETERMINATE; 
 			break; 
 		}
 		hItem = TreeView_GetNextSibling((HWND)m_hCheatTree,hItem);
 	}
-	TV_SetCheckState((WND_HANDLE)m_hCheatTree,(WND_HANDLE)hParent,CurrentState); 
+	TV_SetCheckState((HWND)m_hCheatTree,(HWND)hParent,CurrentState); 
 	if (InitialState != CurrentState) { 
-		CheckParentStatus((WND_HANDLE)TreeView_GetParent((HWND)m_hCheatTree,(HTREEITEM)hParent));
+		CheckParentStatus((HWND)TreeView_GetParent((HWND)m_hCheatTree,(HTREEITEM)hParent));
 	}
 }
 
-stdstr CCheats::ReadCodeString (WND_HANDLE hDlg, bool &validcodes, bool &validoptions, bool &nooptions, int &codeformat ) {
+stdstr CCheats::ReadCodeString (HWND hDlg, bool &validcodes, bool &validoptions, bool &nooptions, int &codeformat ) {
 	int numlines, linecount, len;
 	char str[128];
 	int i;
@@ -1749,7 +1749,7 @@ stdstr CCheats::ReadCodeString (WND_HANDLE hDlg, bool &validcodes, bool &validop
 	return codestring;
 }
 
-stdstr CCheats::ReadOptionsString(WND_HANDLE hDlg, bool &/*validcodes*/, bool &validoptions, bool &/*nooptions*/, int &codeformat)
+stdstr CCheats::ReadOptionsString(HWND hDlg, bool &/*validcodes*/, bool &validoptions, bool &/*nooptions*/, int &codeformat)
 {
 	int numlines, linecount, len;
 	char str[128];
diff --git a/Source/Project64/N64 System/Cheat Class.h b/Source/Project64/N64 System/Cheat Class.h
index f27a8eec2..177833c08 100644
--- a/Source/Project64/N64 System/Cheat Class.h	
+++ b/Source/Project64/N64 System/Cheat Class.h	
@@ -23,14 +23,14 @@ class CCheats {
 	
 	CN64Rom       * const _Rom;
 
-	static int CALLBACK CheatAddProc        ( WND_HANDLE hDlg,DWORD uMsg,DWORD wParam, DWORD lParam );
-	static int CALLBACK CheatListProc       ( WND_HANDLE hDlg,DWORD uMsg,DWORD wParam, DWORD lParam );
-	static int CALLBACK ManageCheatsProc    ( WND_HANDLE hDlg,DWORD uMsg,DWORD wParam, DWORD lParam );
-	static int CALLBACK CheatsCodeExProc    ( WND_HANDLE hDlg,DWORD uMsg,DWORD wParam, DWORD lParam );
-	static int CALLBACK CheatsCodeQuantProc ( WND_HANDLE hDlg,DWORD uMsg,DWORD wParam, DWORD lParam );
+	static int CALLBACK CheatAddProc        ( HWND hDlg,DWORD uMsg,DWORD wParam, DWORD lParam );
+	static int CALLBACK CheatListProc       ( HWND hDlg,DWORD uMsg,DWORD wParam, DWORD lParam );
+	static int CALLBACK ManageCheatsProc    ( HWND hDlg,DWORD uMsg,DWORD wParam, DWORD lParam );
+	static int CALLBACK CheatsCodeExProc    ( HWND hDlg, DWORD uMsg, DWORD wParam, DWORD lParam);
+	static int CALLBACK CheatsCodeQuantProc ( HWND hDlg, DWORD uMsg, DWORD wParam, DWORD lParam);
 	
 	//information about the gui for selecting cheats
-	WND_HANDLE    m_Window, m_hSelectCheat, m_AddCheat, m_hCheatTree, m_hSelectedItem;
+	HWND    m_Window, m_hSelectCheat, m_AddCheat, m_hCheatTree, m_hSelectedItem;
 	void          * const m_rcList, * const m_rcAdd;
 	int           m_MinSizeDlg, m_MaxSizeDlg;
 	int           m_EditCheat;
@@ -50,16 +50,16 @@ class CCheats {
 
 	void LoadPermCheats (void);
 	bool LoadCode ( int CheatNo, LPCSTR CheatString );
-	void AddCodeLayers           ( int CheatNumber, const stdstr &CheatName, WND_HANDLE hParent, bool CheatActive ); 
+	void AddCodeLayers           ( int CheatNumber, const stdstr &CheatName, HWND hParent, bool CheatActive ); 
 	//Reload the cheats from the ini file to the select gui
 	void RefreshCheatManager      ( void );
-	void ChangeChildrenStatus     ( WND_HANDLE hParent, bool Checked );
-	void CheckParentStatus        ( WND_HANDLE hParent );
-	static stdstr ReadCodeString   ( WND_HANDLE hDlg, bool &validcodes, bool &validoption, bool &nooptions, int &codeformat );
-	static stdstr ReadOptionsString( WND_HANDLE hDlg, bool &validcodes, bool &validoptions, bool &nooptions, int &codeformat );
+	void ChangeChildrenStatus     ( HWND hParent, bool Checked );
+	void CheckParentStatus        ( HWND hParent );
+	static stdstr ReadCodeString   ( HWND hDlg, bool &validcodes, bool &validoption, bool &nooptions, int &codeformat );
+	static stdstr ReadOptionsString( HWND hDlg, bool &validcodes, bool &validoptions, bool &nooptions, int &codeformat );
 	int ApplyCheatEntry (CMipsMemory * MMU,const CODES & CodeEntry, int CurrentEntry, BOOL Execute );
-	void RecordCheatValues ( WND_HANDLE hDlg );
-	bool CheatChanged ( WND_HANDLE hDlg );
+	void RecordCheatValues ( HWND hDlg );
+	bool CheatChanged ( HWND hDlg );
 	bool IsValid16BitCode ( LPCSTR CheatString ) const;
 	void DeleteCheat(int Index);
 
@@ -68,14 +68,14 @@ class CCheats {
 	static bool   CheatUsesCodeExtensions ( const stdstr &LineEntry );
 
 	//Working with treeview 
-	static bool  TV_SetCheckState(WND_HANDLE hwndTreeView, WND_HANDLE hItem, TV_CHECK_STATE state);
-	static int   TV_GetCheckState(WND_HANDLE hwndTreeView, WND_HANDLE hItem);
+	static bool  TV_SetCheckState(HWND hwndTreeView, HWND hItem, TV_CHECK_STATE state);
+	static int   TV_GetCheckState(HWND hwndTreeView, HWND hItem);
 	static DWORD AsciiToHex            ( const char * HexValue );
-	static void  MenuSetText           ( MENU_HANDLE hMenu, int MenuPos, const char * Title, char * ShotCut );
+	static void  MenuSetText           ( HMENU hMenu, int MenuPos, const char * Title, char * ShotCut );
 
 
 	//UI Functions
-	static stdstr GetDlgItemStr (WND_HANDLE hDlg, int nIDDlgItem);
+	static stdstr GetDlgItemStr (HWND hDlg, int nIDDlgItem);
 
 public:
 	CCheats (CN64Rom * const Rom = NULL);
@@ -85,6 +85,6 @@ public:
 	void ApplyCheats    ( CMipsMemory * MMU );
 	void ApplyGSButton  ( CMipsMemory * MMU );
 	void LoadCheats     ( bool DisableSelected );
-	void SelectCheats   ( WND_HANDLE hParent, bool BlockExecution );
+	void SelectCheats   ( HWND hParent, bool BlockExecution );
 	inline bool CheatsSlectionChanged ( void ) const { return m_CheatSelectionChanged; }
 };
\ No newline at end of file
diff --git a/Source/Project64/N64 System/Debugger/Debugger - Memory Dump.cpp b/Source/Project64/N64 System/Debugger/Debugger - Memory Dump.cpp
index 08a82d071..6ff29bf30 100644
--- a/Source/Project64/N64 System/Debugger/Debugger - Memory Dump.cpp	
+++ b/Source/Project64/N64 System/Debugger/Debugger - Memory Dump.cpp	
@@ -135,7 +135,7 @@ LRESULT	CDumpMemory::OnClicked(WORD /*wNotifyCode*/, WORD wID, HWND /*hWndCtl*/,
 //CDumpMemory::~CDumpMemory()
 //{
 //}
-//void CDumpMemory::DisplayDump(WND_HANDLE & hParent)
+//void CDumpMemory::DisplayDump(HWND & hParent)
 //{
 //	DialogBoxParam(GetModuleHandle(NULL), MAKEINTRESOURCE(IDD_Cheats_DumpMemory), 
 //			(HWND)hParent, (DLGPROC)WinProc,(LPARAM)this);
@@ -176,7 +176,7 @@ LRESULT	CDumpMemory::OnClicked(WORD /*wNotifyCode*/, WORD wID, HWND /*hWndCtl*/,
 //	}
 //	return Value;
 //}
-//int CALLBACK CDumpMemory::WinProc (WND_HANDLE hDlg,DWORD uMsg,DWORD wParam, DWORD lParam) 
+//int CALLBACK CDumpMemory::WinProc (HWND hDlg,DWORD uMsg,DWORD wParam, DWORD lParam) 
 //{
 //	switch (uMsg) {
 //	case WM_INITDIALOG:
@@ -342,7 +342,7 @@ bool CDumpMemory::DumpMemory ( LPCSTR FileName,DumpFormat Format, DWORD StartPC,
 //{
 //}
 //
-//void CDumpMemory::DisplayDump(WND_HANDLE & hParent)
+//void CDumpMemory::DisplayDump(HWND & hParent)
 //{
 //	DialogBoxParam(GetModuleHandle(NULL), MAKEINTRESOURCE(IDD_Cheats_DumpMemory), 
 //			(HWND)hParent, (DLGPROC)WinProc,(LPARAM)this);
@@ -387,7 +387,7 @@ bool CDumpMemory::DumpMemory ( LPCSTR FileName,DumpFormat Format, DWORD StartPC,
 //	return Value;
 //}
 //
-//int CALLBACK CDumpMemory::WinProc (WND_HANDLE hDlg,DWORD uMsg,DWORD wParam, DWORD lParam) 
+//int CALLBACK CDumpMemory::WinProc (HWND hDlg,DWORD uMsg,DWORD wParam, DWORD lParam) 
 //{
 //	switch (uMsg) {
 //	case WM_INITDIALOG:
diff --git a/Source/Project64/N64 System/Debugger/Debugger - TLB.h b/Source/Project64/N64 System/Debugger/Debugger - TLB.h
index 377252ac1..9112dc6f2 100644
--- a/Source/Project64/N64 System/Debugger/Debugger - TLB.h	
+++ b/Source/Project64/N64 System/Debugger/Debugger - TLB.h	
@@ -29,23 +29,4 @@ public:
 	virtual ~CDebugTlb(void);
 
 	void RefreshTLBWindow ( void );
-};
-
-//class CDebugTlb
-//{
-//	CTLB * g_TLB;
-//
-//	//Debugger
-//	WND_HANDLE m_hDebugWnd;
-//	void SetupDebugWindow (void);
-//	static void CreateDebugWindow ( CDebugTlb * _this );
-//	friend DWORD CALLBACK DebugWndProc ( WND_HANDLE, DWORD, DWORD, DWORD );
-//
-//public: 
-//	CDebugTlb(CTLB * g_TLB);
-//	~CDebugTlb(void);
-//
-//	//debugger function
-//	void ShowTLBWindow    ( void );
-//	void RefreshTLBWindow ( void );
-//};
+};
\ No newline at end of file
diff --git a/Source/Project64/N64 System/Mips/Memory Virtual Mem.cpp b/Source/Project64/N64 System/Mips/Memory Virtual Mem.cpp
index d3d8a7d25..c485a7500 100644
--- a/Source/Project64/N64 System/Mips/Memory Virtual Mem.cpp	
+++ b/Source/Project64/N64 System/Mips/Memory Virtual Mem.cpp	
@@ -1484,8 +1484,6 @@ void CMipsMemoryVM::Compile_SW_Register (x86Reg Reg, DWORD VAddr )
 			Call_Direct(AddressOf(&CRegisters::CheckInterrupts),"CRegisters::CheckInterrupts");
 			AfterCallDirect(m_RegWorkingSet);
 			break;
-			MoveX86regToVariable(Reg,&g_Reg->VI_ORIGIN_REG,"VI_ORIGIN_REG"); 
-			AndConstToVariable(0xFFFFFF,&g_Reg->VI_ORIGIN_REG,"VI_ORIGIN_REG"); 
 		case 0x04600014: 
 			MoveX86regToVariable(Reg,&g_Reg->PI_DOMAIN1_REG,"PI_DOMAIN1_REG");
 			AndConstToVariable(0xFF,&g_Reg->PI_DOMAIN1_REG,"PI_DOMAIN1_REG"); 
@@ -1874,9 +1872,6 @@ int CMipsMemoryVM::MemoryFilter( DWORD dwExptCode, void * lpExceptionPointer )
 		}
 		lpEP->ContextRecord->Eip = (DWORD)(ReadPos + 4);
 		return EXCEPTION_CONTINUE_EXECUTION;		
-	default:
-		if (bHaveDebugger()) { g_Notify->BreakPoint(__FILE__,__LINE__); }
-		return EXCEPTION_EXECUTE_HANDLER;
 	}
 	if (bHaveDebugger()) { g_Notify->BreakPoint(__FILE__,__LINE__); }
 	return EXCEPTION_EXECUTE_HANDLER;
@@ -2159,7 +2154,6 @@ int CMipsMemoryVM::LW_NonMemory ( DWORD PAddr, DWORD * Value ) {
 			* Value = 0;
 			return FALSE;
 		}
-		g_Notify->BreakPoint(__FILE__,__LINE__);
 		break;
 	default:
 		*Value = PAddr & 0xFFFF;
diff --git a/Source/Project64/N64 System/N64 Class.cpp b/Source/Project64/N64 System/N64 Class.cpp
index 2e2a4d62d..5e4705fd9 100644
--- a/Source/Project64/N64 System/N64 Class.cpp	
+++ b/Source/Project64/N64 System/N64 Class.cpp	
@@ -433,12 +433,12 @@ void CN64System::CloseCpu ( void )
 	CpuStopped();
 }
 
-void CN64System::SelectCheats ( WND_HANDLE hParent ) 
+void CN64System::SelectCheats ( HWND hParent ) 
 {
 	m_Cheats.SelectCheats(hParent,false);
 }
 
-void CN64System::DisplayRomInfo ( WND_HANDLE hParent ) {
+void CN64System::DisplayRomInfo ( HWND hParent ) {
 	if (!g_Rom) { return; }
 	
 	RomInformation Info(g_Rom);
@@ -462,7 +462,7 @@ void CN64System::Pause(void)
 	g_Notify->DisplayMessage(5,MSG_CPU_RESUMED);
 }
 
-stdstr CN64System::ChooseFileToOpen ( WND_HANDLE hParent ) {
+stdstr CN64System::ChooseFileToOpen ( HWND hParent ) {
 	OPENFILENAME openfilename;
 	char FileName[_MAX_PATH],Directory[_MAX_PATH];
 
diff --git a/Source/Project64/N64 System/N64 Class.h b/Source/Project64/N64 System/N64 Class.h
index a1c1335c8..1c7a212f7 100644
--- a/Source/Project64/N64 System/N64 Class.h	
+++ b/Source/Project64/N64 System/N64 Class.h	
@@ -48,9 +48,9 @@ public:
 		
 	void   CloseCpu         ( void );
 	void   ExternalEvent    ( SystemEvent action ); //covers gui interacting and timers etc..
-	stdstr ChooseFileToOpen ( WND_HANDLE hParent );
-	void   DisplayRomInfo   ( WND_HANDLE hParent );
-	void   SelectCheats     ( WND_HANDLE hParent );
+	stdstr ChooseFileToOpen ( HWND hParent );
+	void   DisplayRomInfo   ( HWND hParent );
+	void   SelectCheats     ( HWND hParent );
 	void   StartEmulation   ( bool NewThread );
 	void   SyncToAudio      ( void );
 	bool   IsDialogMsg      ( MSG * msg );
diff --git a/Source/Project64/N64 System/Rom Information Class.cpp b/Source/Project64/N64 System/Rom Information Class.cpp
index 46c083a41..1b1072fba 100644
--- a/Source/Project64/N64 System/Rom Information Class.cpp	
+++ b/Source/Project64/N64 System/Rom Information Class.cpp	
@@ -38,14 +38,14 @@ RomInformation::~RomInformation(void) {
 }
 
 #include <windows.h>
-void RomInformation::DisplayInformation(WND_HANDLE hParent) const {
+void RomInformation::DisplayInformation(HWND hParent) const {
 	if (m_FileName.length() == 0) { return; }
 	
 	DialogBoxParam(GetModuleHandle(NULL), MAKEINTRESOURCE(IDD_Rom_Information), 
 		(HWND)hParent, (DLGPROC)RomInfoProc, (DWORD)this);
 }
 
-DWORD CALLBACK RomInfoProc (WND_HANDLE hDlg, DWORD uMsg, DWORD wParam, DWORD lParam) {
+DWORD CALLBACK RomInfoProc (HWND hDlg, DWORD uMsg, DWORD wParam, DWORD lParam) {
 	switch (uMsg) {
 	case WM_INITDIALOG:
 		{
diff --git a/Source/Project64/N64 System/Rom Information Class.h b/Source/Project64/N64 System/Rom Information Class.h
index d6194a7a5..6d6f32075 100644
--- a/Source/Project64/N64 System/Rom Information Class.h	
+++ b/Source/Project64/N64 System/Rom Information Class.h	
@@ -16,12 +16,12 @@ class RomInformation
 	stdstr  const m_FileName;
 	CN64Rom *     m_pRomInfo;
 
-	friend DWORD CALLBACK RomInfoProc ( WND_HANDLE, DWORD, DWORD, DWORD );
+	friend DWORD CALLBACK RomInfoProc ( HWND, DWORD, DWORD, DWORD );
 
 public:
 	RomInformation(const char * RomFile );
 	RomInformation(CN64Rom * RomInfo );
 	~RomInformation(void);
 	
-	void DisplayInformation (WND_HANDLE hParent) const;
+	void DisplayInformation (HWND hParent) const;
 };
\ No newline at end of file
diff --git a/Source/Project64/Plugins/GFX plugin.cpp b/Source/Project64/Plugins/GFX plugin.cpp
index 03ec1e5d7..44aea8f15 100644
--- a/Source/Project64/Plugins/GFX plugin.cpp	
+++ b/Source/Project64/Plugins/GFX plugin.cpp	
@@ -87,8 +87,8 @@ void CGfxPlugin::Init ( const char * FileName )
 	DrawStatus       = (void (__cdecl *)(const char *, BOOL ))GetProcAddress((HMODULE)m_hDll, "DrawFullScreenStatus");
 	
 	// Rom Browser
-	GetRomBrowserMenu    = (MENU_HANDLE (__cdecl *)( void ))GetProcAddress( (HMODULE)m_hDll, "GetRomBrowserMenu" );
-	OnRomBrowserMenuItem = (void (__cdecl *) ( int, WND_HANDLE, BYTE * ))GetProcAddress( (HMODULE)m_hDll, "OnRomBrowserMenuItem" );
+	GetRomBrowserMenu    = (HMENU (__cdecl *)( void ))GetProcAddress( (HMODULE)m_hDll, "GetRomBrowserMenu" );
+	OnRomBrowserMenuItem = (void (__cdecl *) ( int, HWND, BYTE * ))GetProcAddress( (HMODULE)m_hDll, "OnRomBrowserMenuItem" );
 
 	//Make sure dll had all needed functions
 	if (ChangeWindow == NULL)    { UnloadPlugin(); return; }
diff --git a/Source/Project64/Plugins/GFX plugin.h b/Source/Project64/Plugins/GFX plugin.h
index 9f49b4e55..8b7e712fa 100644
--- a/Source/Project64/Plugins/GFX plugin.h	
+++ b/Source/Project64/Plugins/GFX plugin.h	
@@ -15,19 +15,19 @@ class CGfxPlugin
 	typedef struct {
 		/* Menu */
 		/* Items should have an ID between 5101 and 5200 */
-		MENU_HANDLE hGFXMenu;
+		HMENU hGFXMenu;
 		void (__cdecl *ProcessMenuItem) ( int ID );
 
 		/* Break Points */
 		BOOL UseBPoints;
 		char BPPanelName[20];
 		void (__cdecl *Add_BPoint)      ( void );
-		void (__cdecl *CreateBPPanel)   ( WND_HANDLE hDlg, RECT_STRUCT rcBox );
+		void (__cdecl *CreateBPPanel)   ( HWND hDlg, RECT_STRUCT rcBox );
 		void (__cdecl *HideBPPanel)     ( void );
 		void (__cdecl *PaintBPPanel)    ( WINDOWS_PAINTSTRUCT ps );
 		void (__cdecl *ShowBPPanel)     ( void );
-		void (__cdecl *RefreshBpoints)  ( WND_HANDLE hList );
-		void (__cdecl *RemoveBpoint)    ( WND_HANDLE hList, int index );
+		void (__cdecl *RefreshBpoints)  ( HWND hList );
+		void (__cdecl *RemoveBpoint)    ( HWND hList, int index );
 		void (__cdecl *RemoveAllBpoint) ( void );
 		
 		/* GFX command Window */
@@ -72,10 +72,10 @@ public:
 	void (__cdecl *SoftReset)          ( void );
 
 	//Rom Browser
-	MENU_HANDLE (__cdecl * GetRomBrowserMenu)  ( void ); /* Items should have an ID between 4101 and 4200 */
-	void (__cdecl * OnRomBrowserMenuItem) ( int MenuID, WND_HANDLE hParent, BYTE * HEADER );
+	HMENU (__cdecl * GetRomBrowserMenu)  ( void ); /* Items should have an ID between 4101 and 4200 */
+	void (__cdecl * OnRomBrowserMenuItem) ( int MenuID, HWND hParent, BYTE * HEADER );
 	
-	MENU_HANDLE GetDebugMenu (void ) { return m_GFXDebug.hGFXMenu; }
+	HMENU GetDebugMenu (void ) { return m_GFXDebug.hGFXMenu; }
 	void ProcessMenuItem (int id );
 
 private:
diff --git a/Source/Project64/Plugins/RSP Plugin.h b/Source/Project64/Plugins/RSP Plugin.h
index 08e383708..319dea817 100644
--- a/Source/Project64/Plugins/RSP Plugin.h	
+++ b/Source/Project64/Plugins/RSP Plugin.h	
@@ -15,19 +15,19 @@ class CRSP_Plugin
 	typedef struct {
 		/* Menu */
 		/* Items should have an ID between 5001 and 5100 */
-		MENU_HANDLE hRSPMenu;
+		HMENU hRSPMenu;
 		void (__cdecl *ProcessMenuItem) ( int ID );
 
 		/* Break Points */
 		BOOL UseBPoints;
 		char BPPanelName[20];
 		void (__cdecl *Add_BPoint)      ( void );
-		void (__cdecl *CreateBPPanel)   ( MENU_HANDLE hDlg, RECT_STRUCT rcBox );
+		void (__cdecl *CreateBPPanel)   ( HMENU hDlg, RECT_STRUCT rcBox );
 		void (__cdecl *HideBPPanel)     ( void );
 		void (__cdecl *PaintBPPanel)    ( WINDOWS_PAINTSTRUCT ps );
 		void (__cdecl *ShowBPPanel)     ( void );
-		void (__cdecl *RefreshBpoints)  ( MENU_HANDLE hList );
-		void (__cdecl *RemoveBpoint)    ( MENU_HANDLE hList, int index );
+		void (__cdecl *RefreshBpoints)  ( HMENU hList );
+		void (__cdecl *RemoveBpoint)    ( HMENU hList, int index );
 		void (__cdecl *RemoveAllBpoint) ( void );
 		
 		/* RSP command Window */
@@ -61,7 +61,7 @@ public:
 	DWORD (__cdecl *DoRspCycles)     ( DWORD );
 	void  (__cdecl *EnableDebugging) ( BOOL Enable );
 
-	MENU_HANDLE GetDebugMenu (void ) { return m_RSPDebug.hRSPMenu; }
+	HMENU GetDebugMenu (void ) { return m_RSPDebug.hRSPMenu; }
 	void ProcessMenuItem (int id );
 
 private:
diff --git a/Source/Project64/Project64.vcxproj b/Source/Project64/Project64.vcxproj
new file mode 100644
index 000000000..169c633bc
--- /dev/null
+++ b/Source/Project64/Project64.vcxproj
@@ -0,0 +1,343 @@
+<?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="Beta Release|Win32">
+      <Configuration>Beta Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{7E534C8E-1ACE-4A88-8807-39A11ED4DA18}</ProjectGuid>
+    <RootNamespace>Project64</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v120_xp</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Beta Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(SolutionDir)PropertySheets/Win32.Release.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(SolutionDir)PropertySheets/Win32.Release.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(SolutionDir)PropertySheets/Win32.Debug.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <Link>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+      <DataExecutionPrevention>false</DataExecutionPrevention>
+      <MinimumRequiredVersion Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Beta Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>BETA_RELEASE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="main.cpp" />
+    <ClCompile Include="stdafx.cpp">
+      <PrecompiledHeader>Create</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="ValidateBinary.cpp" />
+    <ClCompile Include="Settings\Debug Settings.cpp" />
+    <ClCompile Include="Settings\Game Settings.cpp" />
+    <ClCompile Include="Settings\Gui Settings.cpp" />
+    <ClCompile Include="Settings\N64System Settings.cpp" />
+    <ClCompile Include="Settings\Notification Settings.cpp" />
+    <ClCompile Include="Settings\Recompiler Settings.cpp" />
+    <ClCompile Include="Settings\Settings Class.cpp" />
+    <ClCompile Include="Settings\SettingType\SettingsType-Application.cpp" />
+    <ClCompile Include="Settings\SettingType\SettingsType-ApplicationIndex.cpp" />
+    <ClCompile Include="Settings\SettingType\SettingsType-ApplicationPath.cpp" />
+    <ClCompile Include="Settings\SettingType\SettingsType-Cheats.cpp" />
+    <ClCompile Include="Settings\SettingType\SettingsType-GameSetting.cpp" />
+    <ClCompile Include="Settings\SettingType\SettingsType-GameSettingIndex.cpp" />
+    <ClCompile Include="Settings\SettingType\SettingsType-RDBCpuType.cpp" />
+    <ClCompile Include="Settings\SettingType\SettingsType-RDBOnOff.cpp" />
+    <ClCompile Include="Settings\SettingType\SettingsType-RDBRamSize.cpp" />
+    <ClCompile Include="Settings\SettingType\SettingsType-RDBSaveChip.cpp" />
+    <ClCompile Include="Settings\SettingType\SettingsType-RDBYesNo.cpp" />
+    <ClCompile Include="Settings\SettingType\SettingsType-RelativePath.cpp" />
+    <ClCompile Include="Settings\SettingType\SettingsType-RomDatabase.cpp" />
+    <ClCompile Include="Settings\SettingType\SettingsType-RomDatabaseIndex.cpp" />
+    <ClCompile Include="Settings\SettingType\SettingsType-RomDatabaseSetting.cpp" />
+    <ClCompile Include="Settings\SettingType\SettingsType-SelectedDirectory.cpp" />
+    <ClCompile Include="Settings\SettingType\SettingsType-TempBool.cpp" />
+    <ClCompile Include="Settings\SettingType\SettingsType-TempNumber.cpp" />
+    <ClCompile Include="Settings\SettingType\SettingsType-TempString.cpp" />
+    <ClCompile Include="User Interface\Frame Per Second Class.cpp" />
+    <ClCompile Include="User Interface\Gui Class.cpp" />
+    <ClCompile Include="User Interface\Main Menu Class.cpp" />
+    <ClCompile Include="User Interface\Menu Class.cpp" />
+    <ClCompile Include="User Interface\MenuShortCuts.cpp" />
+    <ClCompile Include="User Interface\Notification Class.cpp" />
+    <ClCompile Include="User Interface\Rom Browser Class.cpp" />
+    <ClCompile Include="User Interface\Settings Config.cpp" />
+    <ClCompile Include="User Interface\Settings\Settings Page - Advanced Options.cpp" />
+    <ClCompile Include="User Interface\Settings\Settings Page - Directories.cpp" />
+    <ClCompile Include="User Interface\Settings\Settings Page - Game - General.cpp" />
+    <ClCompile Include="User Interface\Settings\Settings Page - Game - Plugin.cpp" />
+    <ClCompile Include="User Interface\Settings\Settings Page - Game - Recompiler.cpp" />
+    <ClCompile Include="User Interface\Settings\Settings Page - Game - Status.cpp" />
+    <ClCompile Include="User Interface\Settings\Settings Page - Game Browser.cpp" />
+    <ClCompile Include="User Interface\Settings\Settings Page - Keyboard Shortcuts.cpp" />
+    <ClCompile Include="User Interface\Settings\Settings Page - Options.cpp" />
+    <ClCompile Include="User Interface\Settings\Settings Page - Plugin.cpp" />
+    <ClCompile Include="User Interface\Settings\Settings Page.cpp" />
+    <ClCompile Include="User Interface\WTL Controls\ModifiedEditBox.cpp" />
+    <ClCompile Include="User Interface\WTL Controls\PartialGroupBox.cpp" />
+    <ClCompile Include="N64 System\Debugger\Debugger - Memory Dump.cpp" />
+    <ClCompile Include="N64 System\Debugger\Debugger - Memory Search.cpp" />
+    <ClCompile Include="N64 System\Debugger\Debugger - TLB.cpp" />
+    <ClCompile Include="N64 System\Debugger\Debugger - View Memory.cpp" />
+    <ClCompile Include="N64 System\Debugger\Debugger.cpp" />
+    <ClCompile Include="Multilanguage\Language Class.cpp" />
+    <ClCompile Include="N64 System\Cheat Class.cpp" />
+    <ClCompile Include="N64 System\N64 Class.cpp" />
+    <ClCompile Include="N64 System\N64 Rom Class.cpp" />
+    <ClCompile Include="N64 System\Profiling Class.cpp" />
+    <ClCompile Include="N64 System\Rom Information Class.cpp" />
+    <ClCompile Include="N64 System\Speed Limitor Class.cpp" />
+    <ClCompile Include="N64 System\System Globals.cpp" />
+    <ClCompile Include="N64 System\Mips\Audio.cpp" />
+    <ClCompile Include="N64 System\Mips\Dma.cpp" />
+    <ClCompile Include="N64 System\Mips\Eeprom.cpp" />
+    <ClCompile Include="N64 System\Mips\FlashRam.cpp" />
+    <ClCompile Include="N64 System\Mips\Memory Labels Class.cpp" />
+    <ClCompile Include="N64 System\Mips\Memory Virtual Mem.cpp" />
+    <ClCompile Include="N64 System\Mips\Mempak.cpp" />
+    <ClCompile Include="N64 System\Mips\Pif Ram.cpp" />
+    <ClCompile Include="N64 System\Mips\Register Class.cpp" />
+    <ClCompile Include="N64 System\Mips\Sram.cpp" />
+    <ClCompile Include="N64 System\Mips\System Events.cpp" />
+    <ClCompile Include="N64 System\Mips\System Timing.cpp" />
+    <ClCompile Include="N64 System\Mips\TLB class.cpp" />
+    <ClCompile Include="N64 System\C Core\Logging.cpp" />
+    <ClCompile Include="N64 System\C Core\r4300i Commands.cpp" />
+    <ClCompile Include="N64 System\Recompiler\Code Block.cpp" />
+    <ClCompile Include="N64 System\Recompiler\Code Section.cpp" />
+    <ClCompile Include="N64 System\Recompiler\Function Info.cpp" />
+    <ClCompile Include="N64 System\Recompiler\Function Map Class.cpp" />
+    <ClCompile Include="N64 System\Recompiler\Loop Analysis.cpp" />
+    <ClCompile Include="N64 System\Recompiler\Recompiler Class.cpp" />
+    <ClCompile Include="N64 System\Recompiler\Recompiler Memory.cpp" />
+    <ClCompile Include="N64 System\Recompiler\Recompiler Ops.cpp" />
+    <ClCompile Include="N64 System\Recompiler\Reg Info.cpp" />
+    <ClCompile Include="N64 System\Recompiler\Section Info.cpp" />
+    <ClCompile Include="N64 System\Recompiler\x86CodeLog.cpp" />
+    <ClCompile Include="N64 System\Recompiler\X86ops.cpp" />
+    <ClCompile Include="N64 System\Interpreter\Interpreter CPU.cpp" />
+    <ClCompile Include="N64 System\Interpreter\Interpreter Ops 32.cpp" />
+    <ClCompile Include="N64 System\Interpreter\Interpreter Ops.cpp" />
+    <ClCompile Include="Plugins\Audio Plugin.cpp" />
+    <ClCompile Include="Plugins\Controller Plugin.cpp" />
+    <ClCompile Include="Plugins\GFX plugin.cpp" />
+    <ClCompile Include="Plugins\Plugin Class.cpp" />
+    <ClCompile Include="Plugins\Plugin List.cpp" />
+    <ClCompile Include="Plugins\RSP Plugin.cpp" />
+    <ClCompile Include="3rd Party\7zip.cpp">
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="3rd Party\Processor Info.cpp">
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="3rd Party\zlib\UNZIP.C">
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="3rd Party\zlib\zip.c">
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <Image Include="User Interface\Bitmaps\AboutScreenBottom.bmp" />
+    <Image Include="User Interface\Bitmaps\AboutScreenMiddle.bmp" />
+    <Image Include="User Interface\Bitmaps\AboutScreenTop.bmp" />
+    <Image Include="User Interface\Bitmaps\CloseNormal.bmp" />
+    <Image Include="User Interface\Bitmaps\LangOK.bmp" />
+    <Image Include="User Interface\Bitmaps\LangOK_down.bmp" />
+    <Image Include="User Interface\Icons\left.ico" />
+    <Image Include="User Interface\Bitmaps\ListItems.bmp" />
+    <Image Include="User Interface\Icons\PJ64.ICO" />
+    <Image Include="User Interface\Icons\right.ico" />
+    <Image Include="User Interface\Bitmaps\tri-state.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="User Interface\Icons\divider.cur" />
+    <None Include="User Interface\Icons\hand.cur" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="User Interface\UI Resources.rc">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Beta Release|Win32'">User Interface;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">User Interface;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">User Interface;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="Multilanguage.h" />
+    <ClInclude Include="N64 System.h" />
+    <ClInclude Include="Plugin.h" />
+    <ClInclude Include="Settings.h" />
+    <ClInclude Include="stdafx.h" />
+    <ClInclude Include="User Interface.h" />
+    <ClInclude Include="Validate Binary.h" />
+    <ClInclude Include="WTL App.h" />
+    <ClInclude Include="Settings\Debug Settings.h" />
+    <ClInclude Include="Settings\Game Settings.h" />
+    <ClInclude Include="Settings\Gui Settings.h" />
+    <ClInclude Include="Settings\N64System Settings.h" />
+    <ClInclude Include="Settings\Notification Settings.h" />
+    <ClInclude Include="Settings\Recompiler Settings.h" />
+    <ClInclude Include="Settings\Settings Class.h" />
+    <ClInclude Include="Settings\SettingType\SettingsType-Application.h" />
+    <ClInclude Include="Settings\SettingType\SettingsType-ApplicationIndex.h" />
+    <ClInclude Include="Settings\SettingType\SettingsType-ApplicationPath.h" />
+    <ClInclude Include="Settings\SettingType\SettingsType-Base.h" />
+    <ClInclude Include="Settings\SettingType\SettingsType-Cheats.h" />
+    <ClInclude Include="Settings\SettingType\SettingsType-GameSetting.h" />
+    <ClInclude Include="Settings\SettingType\SettingsType-GameSettingIndex.h" />
+    <ClInclude Include="Settings\SettingType\SettingsType-RDBCpuType.h" />
+    <ClInclude Include="Settings\SettingType\SettingsType-RDBOnOff.h" />
+    <ClInclude Include="Settings\SettingType\SettingsType-RDBRamSize.h" />
+    <ClInclude Include="Settings\SettingType\SettingsType-RDBSaveChip.h" />
+    <ClInclude Include="Settings\SettingType\SettingsType-RDBYesNo.h" />
+    <ClInclude Include="Settings\SettingType\SettingsType-RelativePath.h" />
+    <ClInclude Include="Settings\SettingType\SettingsType-RomDatabase.h" />
+    <ClInclude Include="Settings\SettingType\SettingsType-RomDatabaseIndex.h" />
+    <ClInclude Include="Settings\SettingType\SettingsType-RomDatabaseSetting.h" />
+    <ClInclude Include="Settings\SettingType\SettingsType-SelectedDirectory.h" />
+    <ClInclude Include="Settings\SettingType\SettingsType-TempBool.h" />
+    <ClInclude Include="Settings\SettingType\SettingsType-TempNumber.h" />
+    <ClInclude Include="Settings\SettingType\SettingsType-TempString.h" />
+    <ClInclude Include="User Interface\Frame Per Second Class.h" />
+    <ClInclude Include="User Interface\Gui Class.h" />
+    <ClInclude Include="User Interface\Main Menu Class.h" />
+    <ClInclude Include="User Interface\Menu Class.h" />
+    <ClInclude Include="User Interface\MenuShortCuts.h" />
+    <ClInclude Include="User Interface\Notification Class.h" />
+    <ClInclude Include="User Interface\resource.h" />
+    <ClInclude Include="User Interface\Rom Browser.h" />
+    <ClInclude Include="User Interface\Settings\Settings Page - Advanced Options.h" />
+    <ClInclude Include="User Interface\Settings\Settings Page - Directories.h" />
+    <ClInclude Include="User Interface\Settings\Settings Page - Game - General.h" />
+    <ClInclude Include="User Interface\Settings\Settings Page - Game - Plugin.h" />
+    <ClInclude Include="User Interface\Settings\Settings Page - Game - Recompiler.h" />
+    <ClInclude Include="User Interface\Settings\Settings Page - Game - Status.h" />
+    <ClInclude Include="User Interface\Settings\Settings Page - Game Browser.h" />
+    <ClInclude Include="User Interface\Settings\Settings Page - Keyboard Shortcuts.h" />
+    <ClInclude Include="User Interface\Settings\Settings Page - Options.h" />
+    <ClInclude Include="User Interface\Settings\Settings Page - Plugin.h" />
+    <ClInclude Include="User Interface\Settings\Settings Page.h" />
+    <ClInclude Include="User Interface\WTL Controls\ModifiedCheckBox.h" />
+    <ClInclude Include="User Interface\WTL Controls\ModifiedComboBox.h" />
+    <ClInclude Include="User Interface\WTL Controls\ModifiedEditBox.h" />
+    <ClInclude Include="User Interface\WTL Controls\numberctrl.h" />
+    <ClInclude Include="User Interface\WTL Controls\PartialGroupBox.h" />
+    <ClInclude Include="Multilanguage\Language Class.h" />
+    <ClInclude Include="N64 System\Cheat Class.h" />
+    <ClInclude Include="N64 System\N64 Class.h" />
+    <ClInclude Include="N64 System\N64 Rom Class.h" />
+    <ClInclude Include="N64 System\N64 Types.h" />
+    <ClInclude Include="N64 System\Profiling Class.h" />
+    <ClInclude Include="N64 System\Rom Information Class.h" />
+    <ClInclude Include="N64 System\Speed Limitor Class.h" />
+    <ClInclude Include="N64 System\System Globals.h" />
+    <ClInclude Include="N64 System\Types.h" />
+    <ClInclude Include="N64 System\Mips\Audio.h" />
+    <ClInclude Include="N64 System\Mips\Dma.h" />
+    <ClInclude Include="N64 System\Mips\Eeprom.h" />
+    <ClInclude Include="N64 System\Mips\FlashRam.h" />
+    <ClInclude Include="N64 System\Mips\Memory Class.h" />
+    <ClInclude Include="N64 System\Mips\Memory Labels Class.h" />
+    <ClInclude Include="N64 System\Mips\Memory Virtual Mem.h" />
+    <ClInclude Include="N64 System\Mips\Mempak.H" />
+    <ClInclude Include="N64 System\Mips\OpCode.h" />
+    <ClInclude Include="N64 System\Mips\Pif Ram.h" />
+    <ClInclude Include="N64 System\Mips\Register Class.h" />
+    <ClInclude Include="N64 System\Mips\Sram.h" />
+    <ClInclude Include="N64 System\Mips\System Events.h" />
+    <ClInclude Include="N64 System\Mips\System Timing.h" />
+    <ClInclude Include="N64 System\Mips\TLB Class.h" />
+    <ClInclude Include="N64 System\Mips\TranslateVaddr.h" />
+    <ClInclude Include="N64 System\C Core\Logging.h" />
+    <ClInclude Include="N64 System\C Core\r4300i Commands.h" />
+    <ClInclude Include="N64 System\Debugger\Debugger - Memory Dump.h" />
+    <ClInclude Include="N64 System\Debugger\Debugger - Memory Search.h" />
+    <ClInclude Include="N64 System\Debugger\Debugger - TLB.h" />
+    <ClInclude Include="N64 System\Debugger\Debugger - View Memory.h" />
+    <ClInclude Include="N64 System\Debugger\debugger.h" />
+    <ClInclude Include="N64 System\Recompiler\Code Block.h" />
+    <ClInclude Include="N64 System\Recompiler\Code Section.h" />
+    <ClInclude Include="N64 System\Recompiler\Delay Slot Map Class.h" />
+    <ClInclude Include="N64 System\Recompiler\Exit Info.h" />
+    <ClInclude Include="N64 System\Recompiler\Function Info.h" />
+    <ClInclude Include="N64 System\Recompiler\Function Map Class.h" />
+    <ClInclude Include="N64 System\Recompiler\Jump Info.h" />
+    <ClInclude Include="N64 System\Recompiler\Loop Analysis.h" />
+    <ClInclude Include="N64 System\Recompiler\Recompiler Class.h" />
+    <ClInclude Include="N64 System\Recompiler\Recompiler Memory.h" />
+    <ClInclude Include="N64 System\Recompiler\Recompiler Ops.h" />
+    <ClInclude Include="N64 System\Recompiler\Reg Info.h" />
+    <ClInclude Include="N64 System\Recompiler\Section Info.h" />
+    <ClInclude Include="N64 System\Recompiler\x86CodeLog.h" />
+    <ClInclude Include="N64 System\Recompiler\X86ops.h" />
+    <ClInclude Include="N64 System\Interpreter\Interpreter CPU.h" />
+    <ClInclude Include="N64 System\Interpreter\Interpreter Ops 32.h" />
+    <ClInclude Include="N64 System\Interpreter\Interpreter Ops.h" />
+    <ClInclude Include="Plugins\Audio Plugin.h" />
+    <ClInclude Include="Plugins\Controller Plugin.h" />
+    <ClInclude Include="Plugins\GFX plugin.h" />
+    <ClInclude Include="Plugins\Plugin Class.h" />
+    <ClInclude Include="Plugins\Plugin List.h" />
+    <ClInclude Include="Plugins\RSP Plugin.h" />
+    <ClInclude Include="3rd Party\7zip.h" />
+    <ClInclude Include="3rd Party\Processor Info.h" />
+    <ClInclude Include="3rd Party\zip.h" />
+    <ClInclude Include="3rd Party\HTML Help\HTMLHELP.H" />
+    <ClInclude Include="3rd Party\zlib\UNZIP.H" />
+    <ClInclude Include="3rd Party\zlib\ZCONF.H" />
+    <ClInclude Include="3rd Party\zlib\zip.h" />
+    <ClInclude Include="3rd Party\zlib\ZLIB.H" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\3rd Party\7zip\7zip.vcxproj">
+      <Project>{3326e128-33af-422c-bb7c-67cc6b915610}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\3rd Party\zlib\zlib.vcxproj">
+      <Project>{731bd205-2826-4631-b7af-117658e88dbc}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\Common\Common.vcxproj">
+      <Project>{b4a4b994-9111-42b1-93c2-6f1ca8bc4421}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\Glide64\Glide64.vcxproj">
+      <Project>{a4d13408-a794-4199-8fc7-4a9a32505005}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/Source/Project64/Project64.vcxproj.filters b/Source/Project64/Project64.vcxproj.filters
new file mode 100644
index 000000000..8e076f143
--- /dev/null
+++ b/Source/Project64/Project64.vcxproj.filters
@@ -0,0 +1,843 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{994eee48-3b61-4493-9a7f-6340a5a47175}</UniqueIdentifier>
+      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
+    </Filter>
+    <Filter Include="Source Files\Settings Files">
+      <UniqueIdentifier>{60e2fd87-7b6b-4147-82fe-e12516efe43c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Settings Files\Setting Types Files">
+      <UniqueIdentifier>{305f064d-be0e-418e-a93e-7de72242550e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\User Interface Source">
+      <UniqueIdentifier>{7b81a6a8-b20b-464e-8184-864886bb00fd}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\User Interface Source\Settings Source">
+      <UniqueIdentifier>{bbef87b7-814a-4c87-9713-a07a2de577d4}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\User Interface Source\WTL Controls Source">
+      <UniqueIdentifier>{19f68e68-7068-4a3c-a11d-c3ff48fe78b2}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\User Interface Source\Debugger Source">
+      <UniqueIdentifier>{89244064-68f5-44d9-9021-7a592d910e43}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Multilanguage Source">
+      <UniqueIdentifier>{94e87bf5-3b11-4f61-8a4a-333690ecf588}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\N64 System Source">
+      <UniqueIdentifier>{4d3c9ef9-7903-4112-8356-1e7ab2112c20}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\N64 System Source\Mips Source">
+      <UniqueIdentifier>{2b25c9d1-e1ec-46b6-988a-034edc1fc184}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\N64 System Source\C Core Source">
+      <UniqueIdentifier>{28ecfeb8-9360-4619-ae95-6f67d66f848d}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\N64 System Source\Recompiler Files">
+      <UniqueIdentifier>{9a830b90-21d4-429d-b211-26ab691d6474}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\N64 System Source\Interpreter Files">
+      <UniqueIdentifier>{b5142b69-6b3b-4221-a3cb-2c6c0a35e1d7}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Plugin Source">
+      <UniqueIdentifier>{242ae4a5-b150-44e6-b31c-027acd6d38b0}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\3rd Party Source">
+      <UniqueIdentifier>{0b08dc3f-d3a6-453b-98ab-169c510f34a5}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\3rd Party Source\ZLib Source">
+      <UniqueIdentifier>{547023e2-7478-40d0-9123-eef7659a97ab}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{1e3eb4f7-a0b1-4d09-9e50-b5c699f24050}</UniqueIdentifier>
+      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{bc88015e-37f7-4320-8aa4-d5043d17a386}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl</Extensions>
+    </Filter>
+    <Filter Include="Header Files\Settings Headers">
+      <UniqueIdentifier>{80441979-1696-4aca-8652-199a9db22d06}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Settings Headers\Setting Types Header">
+      <UniqueIdentifier>{024d5b64-27a9-466b-9388-5c08c5eb5a47}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\User Interface Headers">
+      <UniqueIdentifier>{54e8f51f-d81d-4f8f-b4f1-76584c1b29a5}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\User Interface Headers\Settings Header">
+      <UniqueIdentifier>{81b58fad-f73f-4098-8ebc-ffceaff53478}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\User Interface Headers\WTL Controls Headers">
+      <UniqueIdentifier>{838a58e7-e1d2-45d3-bcf0-dcedad19610c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Multilanguage Headers">
+      <UniqueIdentifier>{5531af4d-33bb-4e84-8a55-c971a18ec7bf}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\N64 System Headers">
+      <UniqueIdentifier>{6cfab019-2f8d-4e09-be41-1df513b5a680}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\N64 System Headers\Mips Headers">
+      <UniqueIdentifier>{34662870-e7f3-4ab8-8788-a659bf32f764}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\N64 System Headers\C Core Headers">
+      <UniqueIdentifier>{4db18f2d-3c89-4a86-adf7-46731ca35087}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\N64 System Headers\Debugger Headers">
+      <UniqueIdentifier>{c4249d55-df70-4453-b017-b548514ad094}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\N64 System Headers\Recompiler Headers">
+      <UniqueIdentifier>{a3157468-d5a6-4167-b28f-9de5719ec1e9}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\N64 System Headers\Interpreter Headers">
+      <UniqueIdentifier>{d87d7401-c716-40f7-a51b-2d9803936b23}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Plugin Headers">
+      <UniqueIdentifier>{93ec15cf-1fb2-4095-ae07-95128a67d3df}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\3rd Party Headers">
+      <UniqueIdentifier>{21f6da31-289d-4d03-80bb-b77fe60355d7}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\3rd Party Headers\HTML Help">
+      <UniqueIdentifier>{53a1d70d-ec39-415a-88eb-70d6b6eaa918}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\3rd Party Headers\Zlib Headers">
+      <UniqueIdentifier>{ef4a164b-c5ed-4469-a0e2-4eb21f800b11}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="main.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="stdafx.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ValidateBinary.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Settings\Debug Settings.cpp">
+      <Filter>Source Files\Settings Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Settings\Game Settings.cpp">
+      <Filter>Source Files\Settings Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Settings\Gui Settings.cpp">
+      <Filter>Source Files\Settings Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Settings\N64System Settings.cpp">
+      <Filter>Source Files\Settings Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Settings\Notification Settings.cpp">
+      <Filter>Source Files\Settings Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Settings\Recompiler Settings.cpp">
+      <Filter>Source Files\Settings Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Settings\Settings Class.cpp">
+      <Filter>Source Files\Settings Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Settings\SettingType\SettingsType-Application.cpp">
+      <Filter>Source Files\Settings Files\Setting Types Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Settings\SettingType\SettingsType-ApplicationIndex.cpp">
+      <Filter>Source Files\Settings Files\Setting Types Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Settings\SettingType\SettingsType-ApplicationPath.cpp">
+      <Filter>Source Files\Settings Files\Setting Types Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Settings\SettingType\SettingsType-Cheats.cpp">
+      <Filter>Source Files\Settings Files\Setting Types Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Settings\SettingType\SettingsType-GameSetting.cpp">
+      <Filter>Source Files\Settings Files\Setting Types Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Settings\SettingType\SettingsType-GameSettingIndex.cpp">
+      <Filter>Source Files\Settings Files\Setting Types Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Settings\SettingType\SettingsType-RDBCpuType.cpp">
+      <Filter>Source Files\Settings Files\Setting Types Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Settings\SettingType\SettingsType-RDBOnOff.cpp">
+      <Filter>Source Files\Settings Files\Setting Types Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Settings\SettingType\SettingsType-RDBRamSize.cpp">
+      <Filter>Source Files\Settings Files\Setting Types Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Settings\SettingType\SettingsType-RDBSaveChip.cpp">
+      <Filter>Source Files\Settings Files\Setting Types Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Settings\SettingType\SettingsType-RDBYesNo.cpp">
+      <Filter>Source Files\Settings Files\Setting Types Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Settings\SettingType\SettingsType-RelativePath.cpp">
+      <Filter>Source Files\Settings Files\Setting Types Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Settings\SettingType\SettingsType-RomDatabase.cpp">
+      <Filter>Source Files\Settings Files\Setting Types Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Settings\SettingType\SettingsType-RomDatabaseIndex.cpp">
+      <Filter>Source Files\Settings Files\Setting Types Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Settings\SettingType\SettingsType-RomDatabaseSetting.cpp">
+      <Filter>Source Files\Settings Files\Setting Types Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Settings\SettingType\SettingsType-SelectedDirectory.cpp">
+      <Filter>Source Files\Settings Files\Setting Types Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Settings\SettingType\SettingsType-TempBool.cpp">
+      <Filter>Source Files\Settings Files\Setting Types Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Settings\SettingType\SettingsType-TempNumber.cpp">
+      <Filter>Source Files\Settings Files\Setting Types Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Settings\SettingType\SettingsType-TempString.cpp">
+      <Filter>Source Files\Settings Files\Setting Types Files</Filter>
+    </ClCompile>
+    <ClCompile Include="User Interface\Frame Per Second Class.cpp">
+      <Filter>Source Files\User Interface Source</Filter>
+    </ClCompile>
+    <ClCompile Include="User Interface\Gui Class.cpp">
+      <Filter>Source Files\User Interface Source</Filter>
+    </ClCompile>
+    <ClCompile Include="User Interface\Main Menu Class.cpp">
+      <Filter>Source Files\User Interface Source</Filter>
+    </ClCompile>
+    <ClCompile Include="User Interface\Menu Class.cpp">
+      <Filter>Source Files\User Interface Source</Filter>
+    </ClCompile>
+    <ClCompile Include="User Interface\MenuShortCuts.cpp">
+      <Filter>Source Files\User Interface Source</Filter>
+    </ClCompile>
+    <ClCompile Include="User Interface\Notification Class.cpp">
+      <Filter>Source Files\User Interface Source</Filter>
+    </ClCompile>
+    <ClCompile Include="User Interface\Rom Browser Class.cpp">
+      <Filter>Source Files\User Interface Source</Filter>
+    </ClCompile>
+    <ClCompile Include="User Interface\Settings Config.cpp">
+      <Filter>Source Files\User Interface Source</Filter>
+    </ClCompile>
+    <ClCompile Include="User Interface\Settings\Settings Page - Advanced Options.cpp">
+      <Filter>Source Files\User Interface Source\Settings Source</Filter>
+    </ClCompile>
+    <ClCompile Include="User Interface\Settings\Settings Page - Directories.cpp">
+      <Filter>Source Files\User Interface Source\Settings Source</Filter>
+    </ClCompile>
+    <ClCompile Include="User Interface\Settings\Settings Page - Game - General.cpp">
+      <Filter>Source Files\User Interface Source\Settings Source</Filter>
+    </ClCompile>
+    <ClCompile Include="User Interface\Settings\Settings Page - Game - Plugin.cpp">
+      <Filter>Source Files\User Interface Source\Settings Source</Filter>
+    </ClCompile>
+    <ClCompile Include="User Interface\Settings\Settings Page - Game - Recompiler.cpp">
+      <Filter>Source Files\User Interface Source\Settings Source</Filter>
+    </ClCompile>
+    <ClCompile Include="User Interface\Settings\Settings Page - Game - Status.cpp">
+      <Filter>Source Files\User Interface Source\Settings Source</Filter>
+    </ClCompile>
+    <ClCompile Include="User Interface\Settings\Settings Page - Game Browser.cpp">
+      <Filter>Source Files\User Interface Source\Settings Source</Filter>
+    </ClCompile>
+    <ClCompile Include="User Interface\Settings\Settings Page - Keyboard Shortcuts.cpp">
+      <Filter>Source Files\User Interface Source\Settings Source</Filter>
+    </ClCompile>
+    <ClCompile Include="User Interface\Settings\Settings Page - Options.cpp">
+      <Filter>Source Files\User Interface Source\Settings Source</Filter>
+    </ClCompile>
+    <ClCompile Include="User Interface\Settings\Settings Page - Plugin.cpp">
+      <Filter>Source Files\User Interface Source\Settings Source</Filter>
+    </ClCompile>
+    <ClCompile Include="User Interface\Settings\Settings Page.cpp">
+      <Filter>Source Files\User Interface Source\Settings Source</Filter>
+    </ClCompile>
+    <ClCompile Include="User Interface\WTL Controls\ModifiedEditBox.cpp">
+      <Filter>Source Files\User Interface Source\WTL Controls Source</Filter>
+    </ClCompile>
+    <ClCompile Include="User Interface\WTL Controls\PartialGroupBox.cpp">
+      <Filter>Source Files\User Interface Source\WTL Controls Source</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\Debugger\Debugger - Memory Dump.cpp">
+      <Filter>Source Files\User Interface Source\Debugger Source</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\Debugger\Debugger - Memory Search.cpp">
+      <Filter>Source Files\User Interface Source\Debugger Source</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\Debugger\Debugger - TLB.cpp">
+      <Filter>Source Files\User Interface Source\Debugger Source</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\Debugger\Debugger - View Memory.cpp">
+      <Filter>Source Files\User Interface Source\Debugger Source</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\Debugger\Debugger.cpp">
+      <Filter>Source Files\User Interface Source\Debugger Source</Filter>
+    </ClCompile>
+    <ClCompile Include="Multilanguage\Language Class.cpp">
+      <Filter>Source Files\Multilanguage Source</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\Cheat Class.cpp">
+      <Filter>Source Files\N64 System Source</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\N64 Class.cpp">
+      <Filter>Source Files\N64 System Source</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\N64 Rom Class.cpp">
+      <Filter>Source Files\N64 System Source</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\Profiling Class.cpp">
+      <Filter>Source Files\N64 System Source</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\Rom Information Class.cpp">
+      <Filter>Source Files\N64 System Source</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\Speed Limitor Class.cpp">
+      <Filter>Source Files\N64 System Source</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\System Globals.cpp">
+      <Filter>Source Files\N64 System Source</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\Mips\Audio.cpp">
+      <Filter>Source Files\N64 System Source\Mips Source</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\Mips\Dma.cpp">
+      <Filter>Source Files\N64 System Source\Mips Source</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\Mips\Eeprom.cpp">
+      <Filter>Source Files\N64 System Source\Mips Source</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\Mips\FlashRam.cpp">
+      <Filter>Source Files\N64 System Source\Mips Source</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\Mips\Memory Labels Class.cpp">
+      <Filter>Source Files\N64 System Source\Mips Source</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\Mips\Memory Virtual Mem.cpp">
+      <Filter>Source Files\N64 System Source\Mips Source</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\Mips\Mempak.cpp">
+      <Filter>Source Files\N64 System Source\Mips Source</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\Mips\Pif Ram.cpp">
+      <Filter>Source Files\N64 System Source\Mips Source</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\Mips\Register Class.cpp">
+      <Filter>Source Files\N64 System Source\Mips Source</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\Mips\Sram.cpp">
+      <Filter>Source Files\N64 System Source\Mips Source</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\Mips\System Events.cpp">
+      <Filter>Source Files\N64 System Source\Mips Source</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\Mips\System Timing.cpp">
+      <Filter>Source Files\N64 System Source\Mips Source</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\Mips\TLB class.cpp">
+      <Filter>Source Files\N64 System Source\Mips Source</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\C Core\Logging.cpp">
+      <Filter>Source Files\N64 System Source\C Core Source</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\C Core\r4300i Commands.cpp">
+      <Filter>Source Files\N64 System Source\C Core Source</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\Recompiler\Code Block.cpp">
+      <Filter>Source Files\N64 System Source\Recompiler Files</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\Recompiler\Code Section.cpp">
+      <Filter>Source Files\N64 System Source\Recompiler Files</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\Recompiler\Function Info.cpp">
+      <Filter>Source Files\N64 System Source\Recompiler Files</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\Recompiler\Function Map Class.cpp">
+      <Filter>Source Files\N64 System Source\Recompiler Files</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\Recompiler\Loop Analysis.cpp">
+      <Filter>Source Files\N64 System Source\Recompiler Files</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\Recompiler\Recompiler Class.cpp">
+      <Filter>Source Files\N64 System Source\Recompiler Files</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\Recompiler\Recompiler Memory.cpp">
+      <Filter>Source Files\N64 System Source\Recompiler Files</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\Recompiler\Recompiler Ops.cpp">
+      <Filter>Source Files\N64 System Source\Recompiler Files</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\Recompiler\Reg Info.cpp">
+      <Filter>Source Files\N64 System Source\Recompiler Files</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\Recompiler\Section Info.cpp">
+      <Filter>Source Files\N64 System Source\Recompiler Files</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\Recompiler\x86CodeLog.cpp">
+      <Filter>Source Files\N64 System Source\Recompiler Files</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\Recompiler\X86ops.cpp">
+      <Filter>Source Files\N64 System Source\Recompiler Files</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\Interpreter\Interpreter CPU.cpp">
+      <Filter>Source Files\N64 System Source\Interpreter Files</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\Interpreter\Interpreter Ops 32.cpp">
+      <Filter>Source Files\N64 System Source\Interpreter Files</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\Interpreter\Interpreter Ops.cpp">
+      <Filter>Source Files\N64 System Source\Interpreter Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Plugins\Audio Plugin.cpp">
+      <Filter>Source Files\Plugin Source</Filter>
+    </ClCompile>
+    <ClCompile Include="Plugins\Controller Plugin.cpp">
+      <Filter>Source Files\Plugin Source</Filter>
+    </ClCompile>
+    <ClCompile Include="Plugins\GFX plugin.cpp">
+      <Filter>Source Files\Plugin Source</Filter>
+    </ClCompile>
+    <ClCompile Include="Plugins\Plugin Class.cpp">
+      <Filter>Source Files\Plugin Source</Filter>
+    </ClCompile>
+    <ClCompile Include="Plugins\Plugin List.cpp">
+      <Filter>Source Files\Plugin Source</Filter>
+    </ClCompile>
+    <ClCompile Include="Plugins\RSP Plugin.cpp">
+      <Filter>Source Files\Plugin Source</Filter>
+    </ClCompile>
+    <ClCompile Include="3rd Party\7zip.cpp">
+      <Filter>Source Files\3rd Party Source</Filter>
+    </ClCompile>
+    <ClCompile Include="3rd Party\Processor Info.cpp">
+      <Filter>Source Files\3rd Party Source</Filter>
+    </ClCompile>
+    <ClCompile Include="3rd Party\zlib\UNZIP.C">
+      <Filter>Source Files\3rd Party Source\ZLib Source</Filter>
+    </ClCompile>
+    <ClCompile Include="3rd Party\zlib\zip.c">
+      <Filter>Source Files\3rd Party Source\ZLib Source</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <Image Include="User Interface\Bitmaps\AboutScreenBottom.bmp">
+      <Filter>Resource Files</Filter>
+    </Image>
+    <Image Include="User Interface\Bitmaps\AboutScreenMiddle.bmp">
+      <Filter>Resource Files</Filter>
+    </Image>
+    <Image Include="User Interface\Bitmaps\AboutScreenTop.bmp">
+      <Filter>Resource Files</Filter>
+    </Image>
+    <Image Include="User Interface\Bitmaps\CloseNormal.bmp">
+      <Filter>Resource Files</Filter>
+    </Image>
+    <Image Include="User Interface\Bitmaps\LangOK.bmp">
+      <Filter>Resource Files</Filter>
+    </Image>
+    <Image Include="User Interface\Bitmaps\LangOK_down.bmp">
+      <Filter>Resource Files</Filter>
+    </Image>
+    <Image Include="User Interface\Icons\left.ico">
+      <Filter>Resource Files</Filter>
+    </Image>
+    <Image Include="User Interface\Bitmaps\ListItems.bmp">
+      <Filter>Resource Files</Filter>
+    </Image>
+    <Image Include="User Interface\Icons\PJ64.ICO">
+      <Filter>Resource Files</Filter>
+    </Image>
+    <Image Include="User Interface\Icons\right.ico">
+      <Filter>Resource Files</Filter>
+    </Image>
+    <Image Include="User Interface\Bitmaps\tri-state.bmp">
+      <Filter>Resource Files</Filter>
+    </Image>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="User Interface\Icons\divider.cur">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="User Interface\Icons\hand.cur">
+      <Filter>Resource Files</Filter>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="User Interface\UI Resources.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="Multilanguage.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Plugin.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Settings.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="stdafx.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="User Interface.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Validate Binary.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="WTL App.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Settings\Debug Settings.h">
+      <Filter>Header Files\Settings Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="Settings\Game Settings.h">
+      <Filter>Header Files\Settings Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="Settings\Gui Settings.h">
+      <Filter>Header Files\Settings Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="Settings\N64System Settings.h">
+      <Filter>Header Files\Settings Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="Settings\Notification Settings.h">
+      <Filter>Header Files\Settings Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="Settings\Recompiler Settings.h">
+      <Filter>Header Files\Settings Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="Settings\Settings Class.h">
+      <Filter>Header Files\Settings Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="Settings\SettingType\SettingsType-Application.h">
+      <Filter>Header Files\Settings Headers\Setting Types Header</Filter>
+    </ClInclude>
+    <ClInclude Include="Settings\SettingType\SettingsType-ApplicationIndex.h">
+      <Filter>Header Files\Settings Headers\Setting Types Header</Filter>
+    </ClInclude>
+    <ClInclude Include="Settings\SettingType\SettingsType-ApplicationPath.h">
+      <Filter>Header Files\Settings Headers\Setting Types Header</Filter>
+    </ClInclude>
+    <ClInclude Include="Settings\SettingType\SettingsType-Base.h">
+      <Filter>Header Files\Settings Headers\Setting Types Header</Filter>
+    </ClInclude>
+    <ClInclude Include="Settings\SettingType\SettingsType-Cheats.h">
+      <Filter>Header Files\Settings Headers\Setting Types Header</Filter>
+    </ClInclude>
+    <ClInclude Include="Settings\SettingType\SettingsType-GameSetting.h">
+      <Filter>Header Files\Settings Headers\Setting Types Header</Filter>
+    </ClInclude>
+    <ClInclude Include="Settings\SettingType\SettingsType-GameSettingIndex.h">
+      <Filter>Header Files\Settings Headers\Setting Types Header</Filter>
+    </ClInclude>
+    <ClInclude Include="Settings\SettingType\SettingsType-RDBCpuType.h">
+      <Filter>Header Files\Settings Headers\Setting Types Header</Filter>
+    </ClInclude>
+    <ClInclude Include="Settings\SettingType\SettingsType-RDBOnOff.h">
+      <Filter>Header Files\Settings Headers\Setting Types Header</Filter>
+    </ClInclude>
+    <ClInclude Include="Settings\SettingType\SettingsType-RDBRamSize.h">
+      <Filter>Header Files\Settings Headers\Setting Types Header</Filter>
+    </ClInclude>
+    <ClInclude Include="Settings\SettingType\SettingsType-RDBSaveChip.h">
+      <Filter>Header Files\Settings Headers\Setting Types Header</Filter>
+    </ClInclude>
+    <ClInclude Include="Settings\SettingType\SettingsType-RDBYesNo.h">
+      <Filter>Header Files\Settings Headers\Setting Types Header</Filter>
+    </ClInclude>
+    <ClInclude Include="Settings\SettingType\SettingsType-RelativePath.h">
+      <Filter>Header Files\Settings Headers\Setting Types Header</Filter>
+    </ClInclude>
+    <ClInclude Include="Settings\SettingType\SettingsType-RomDatabase.h">
+      <Filter>Header Files\Settings Headers\Setting Types Header</Filter>
+    </ClInclude>
+    <ClInclude Include="Settings\SettingType\SettingsType-RomDatabaseIndex.h">
+      <Filter>Header Files\Settings Headers\Setting Types Header</Filter>
+    </ClInclude>
+    <ClInclude Include="Settings\SettingType\SettingsType-RomDatabaseSetting.h">
+      <Filter>Header Files\Settings Headers\Setting Types Header</Filter>
+    </ClInclude>
+    <ClInclude Include="Settings\SettingType\SettingsType-SelectedDirectory.h">
+      <Filter>Header Files\Settings Headers\Setting Types Header</Filter>
+    </ClInclude>
+    <ClInclude Include="Settings\SettingType\SettingsType-TempBool.h">
+      <Filter>Header Files\Settings Headers\Setting Types Header</Filter>
+    </ClInclude>
+    <ClInclude Include="Settings\SettingType\SettingsType-TempNumber.h">
+      <Filter>Header Files\Settings Headers\Setting Types Header</Filter>
+    </ClInclude>
+    <ClInclude Include="Settings\SettingType\SettingsType-TempString.h">
+      <Filter>Header Files\Settings Headers\Setting Types Header</Filter>
+    </ClInclude>
+    <ClInclude Include="User Interface\Frame Per Second Class.h">
+      <Filter>Header Files\User Interface Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="User Interface\Gui Class.h">
+      <Filter>Header Files\User Interface Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="User Interface\Main Menu Class.h">
+      <Filter>Header Files\User Interface Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="User Interface\Menu Class.h">
+      <Filter>Header Files\User Interface Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="User Interface\MenuShortCuts.h">
+      <Filter>Header Files\User Interface Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="User Interface\Notification Class.h">
+      <Filter>Header Files\User Interface Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="User Interface\resource.h">
+      <Filter>Header Files\User Interface Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="User Interface\Rom Browser.h">
+      <Filter>Header Files\User Interface Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="User Interface\Settings\Settings Page - Advanced Options.h">
+      <Filter>Header Files\User Interface Headers\Settings Header</Filter>
+    </ClInclude>
+    <ClInclude Include="User Interface\Settings\Settings Page - Directories.h">
+      <Filter>Header Files\User Interface Headers\Settings Header</Filter>
+    </ClInclude>
+    <ClInclude Include="User Interface\Settings\Settings Page - Game - General.h">
+      <Filter>Header Files\User Interface Headers\Settings Header</Filter>
+    </ClInclude>
+    <ClInclude Include="User Interface\Settings\Settings Page - Game - Plugin.h">
+      <Filter>Header Files\User Interface Headers\Settings Header</Filter>
+    </ClInclude>
+    <ClInclude Include="User Interface\Settings\Settings Page - Game - Recompiler.h">
+      <Filter>Header Files\User Interface Headers\Settings Header</Filter>
+    </ClInclude>
+    <ClInclude Include="User Interface\Settings\Settings Page - Game - Status.h">
+      <Filter>Header Files\User Interface Headers\Settings Header</Filter>
+    </ClInclude>
+    <ClInclude Include="User Interface\Settings\Settings Page - Game Browser.h">
+      <Filter>Header Files\User Interface Headers\Settings Header</Filter>
+    </ClInclude>
+    <ClInclude Include="User Interface\Settings\Settings Page - Keyboard Shortcuts.h">
+      <Filter>Header Files\User Interface Headers\Settings Header</Filter>
+    </ClInclude>
+    <ClInclude Include="User Interface\Settings\Settings Page - Options.h">
+      <Filter>Header Files\User Interface Headers\Settings Header</Filter>
+    </ClInclude>
+    <ClInclude Include="User Interface\Settings\Settings Page - Plugin.h">
+      <Filter>Header Files\User Interface Headers\Settings Header</Filter>
+    </ClInclude>
+    <ClInclude Include="User Interface\Settings\Settings Page.h">
+      <Filter>Header Files\User Interface Headers\Settings Header</Filter>
+    </ClInclude>
+    <ClInclude Include="User Interface\WTL Controls\ModifiedCheckBox.h">
+      <Filter>Header Files\User Interface Headers\WTL Controls Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="User Interface\WTL Controls\ModifiedComboBox.h">
+      <Filter>Header Files\User Interface Headers\WTL Controls Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="User Interface\WTL Controls\ModifiedEditBox.h">
+      <Filter>Header Files\User Interface Headers\WTL Controls Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="User Interface\WTL Controls\numberctrl.h">
+      <Filter>Header Files\User Interface Headers\WTL Controls Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="User Interface\WTL Controls\PartialGroupBox.h">
+      <Filter>Header Files\User Interface Headers\WTL Controls Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="Multilanguage\Language Class.h">
+      <Filter>Header Files\Multilanguage Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Cheat Class.h">
+      <Filter>Header Files\N64 System Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\N64 Class.h">
+      <Filter>Header Files\N64 System Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\N64 Rom Class.h">
+      <Filter>Header Files\N64 System Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\N64 Types.h">
+      <Filter>Header Files\N64 System Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Profiling Class.h">
+      <Filter>Header Files\N64 System Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Rom Information Class.h">
+      <Filter>Header Files\N64 System Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Speed Limitor Class.h">
+      <Filter>Header Files\N64 System Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\System Globals.h">
+      <Filter>Header Files\N64 System Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Types.h">
+      <Filter>Header Files\N64 System Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Mips\Audio.h">
+      <Filter>Header Files\N64 System Headers\Mips Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Mips\Dma.h">
+      <Filter>Header Files\N64 System Headers\Mips Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Mips\Eeprom.h">
+      <Filter>Header Files\N64 System Headers\Mips Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Mips\FlashRam.h">
+      <Filter>Header Files\N64 System Headers\Mips Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Mips\Memory Class.h">
+      <Filter>Header Files\N64 System Headers\Mips Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Mips\Memory Labels Class.h">
+      <Filter>Header Files\N64 System Headers\Mips Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Mips\Memory Virtual Mem.h">
+      <Filter>Header Files\N64 System Headers\Mips Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Mips\Mempak.H">
+      <Filter>Header Files\N64 System Headers\Mips Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Mips\OpCode.h">
+      <Filter>Header Files\N64 System Headers\Mips Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Mips\Pif Ram.h">
+      <Filter>Header Files\N64 System Headers\Mips Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Mips\Register Class.h">
+      <Filter>Header Files\N64 System Headers\Mips Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Mips\Sram.h">
+      <Filter>Header Files\N64 System Headers\Mips Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Mips\System Events.h">
+      <Filter>Header Files\N64 System Headers\Mips Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Mips\System Timing.h">
+      <Filter>Header Files\N64 System Headers\Mips Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Mips\TLB Class.h">
+      <Filter>Header Files\N64 System Headers\Mips Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Mips\TranslateVaddr.h">
+      <Filter>Header Files\N64 System Headers\Mips Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\C Core\Logging.h">
+      <Filter>Header Files\N64 System Headers\C Core Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\C Core\r4300i Commands.h">
+      <Filter>Header Files\N64 System Headers\C Core Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Debugger\Debugger - Memory Dump.h">
+      <Filter>Header Files\N64 System Headers\Debugger Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Debugger\Debugger - Memory Search.h">
+      <Filter>Header Files\N64 System Headers\Debugger Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Debugger\Debugger - TLB.h">
+      <Filter>Header Files\N64 System Headers\Debugger Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Debugger\Debugger - View Memory.h">
+      <Filter>Header Files\N64 System Headers\Debugger Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Debugger\debugger.h">
+      <Filter>Header Files\N64 System Headers\Debugger Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Recompiler\Code Block.h">
+      <Filter>Header Files\N64 System Headers\Recompiler Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Recompiler\Code Section.h">
+      <Filter>Header Files\N64 System Headers\Recompiler Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Recompiler\Delay Slot Map Class.h">
+      <Filter>Header Files\N64 System Headers\Recompiler Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Recompiler\Exit Info.h">
+      <Filter>Header Files\N64 System Headers\Recompiler Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Recompiler\Function Info.h">
+      <Filter>Header Files\N64 System Headers\Recompiler Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Recompiler\Function Map Class.h">
+      <Filter>Header Files\N64 System Headers\Recompiler Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Recompiler\Jump Info.h">
+      <Filter>Header Files\N64 System Headers\Recompiler Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Recompiler\Loop Analysis.h">
+      <Filter>Header Files\N64 System Headers\Recompiler Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Recompiler\Recompiler Class.h">
+      <Filter>Header Files\N64 System Headers\Recompiler Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Recompiler\Recompiler Memory.h">
+      <Filter>Header Files\N64 System Headers\Recompiler Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Recompiler\Recompiler Ops.h">
+      <Filter>Header Files\N64 System Headers\Recompiler Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Recompiler\Reg Info.h">
+      <Filter>Header Files\N64 System Headers\Recompiler Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Recompiler\Section Info.h">
+      <Filter>Header Files\N64 System Headers\Recompiler Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Recompiler\x86CodeLog.h">
+      <Filter>Header Files\N64 System Headers\Recompiler Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Recompiler\X86ops.h">
+      <Filter>Header Files\N64 System Headers\Recompiler Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Interpreter\Interpreter CPU.h">
+      <Filter>Header Files\N64 System Headers\Interpreter Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Interpreter\Interpreter Ops 32.h">
+      <Filter>Header Files\N64 System Headers\Interpreter Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Interpreter\Interpreter Ops.h">
+      <Filter>Header Files\N64 System Headers\Interpreter Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="Plugins\Audio Plugin.h">
+      <Filter>Header Files\Plugin Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="Plugins\Controller Plugin.h">
+      <Filter>Header Files\Plugin Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="Plugins\GFX plugin.h">
+      <Filter>Header Files\Plugin Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="Plugins\Plugin Class.h">
+      <Filter>Header Files\Plugin Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="Plugins\Plugin List.h">
+      <Filter>Header Files\Plugin Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="Plugins\RSP Plugin.h">
+      <Filter>Header Files\Plugin Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="3rd Party\7zip.h">
+      <Filter>Header Files\3rd Party Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="3rd Party\Processor Info.h">
+      <Filter>Header Files\3rd Party Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="3rd Party\zip.h">
+      <Filter>Header Files\3rd Party Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="3rd Party\HTML Help\HTMLHELP.H">
+      <Filter>Header Files\3rd Party Headers\HTML Help</Filter>
+    </ClInclude>
+    <ClInclude Include="3rd Party\zlib\UNZIP.H">
+      <Filter>Header Files\3rd Party Headers\Zlib Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="3rd Party\zlib\ZCONF.H">
+      <Filter>Header Files\3rd Party Headers\Zlib Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="3rd Party\zlib\zip.h">
+      <Filter>Header Files\3rd Party Headers\Zlib Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="3rd Party\zlib\ZLIB.H">
+      <Filter>Header Files\3rd Party Headers\Zlib Headers</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Source/Project64/Settings/SettingType/SettingsType-RomDatabaseSetting.cpp b/Source/Project64/Settings/SettingType/SettingsType-RomDatabaseSetting.cpp
index c295674ea..fe745930b 100644
--- a/Source/Project64/Settings/SettingType/SettingsType-RomDatabaseSetting.cpp
+++ b/Source/Project64/Settings/SettingType/SettingsType-RomDatabaseSetting.cpp
@@ -81,7 +81,7 @@ bool CSettingTypeRomDatabaseSetting::Load ( int /*Index*/, stdstr & /*Value*/ )
 }
 
 //return the default values
-void CSettingTypeRomDatabaseSetting::LoadDefault ( int /*Index*/, bool & Value ) const
+void CSettingTypeRomDatabaseSetting::LoadDefault ( int /*Index*/, bool & /*Value*/ ) const
 {
 	g_Notify->BreakPoint(__FILE__,__LINE__);
 	/*if (m_DefaultSetting != Default_None)
@@ -107,7 +107,7 @@ void CSettingTypeRomDatabaseSetting::LoadDefault ( int /*Index*/, ULONG & Value
 	}
 }
 
-void CSettingTypeRomDatabaseSetting::LoadDefault ( int /*Index*/, stdstr & Value ) const
+void CSettingTypeRomDatabaseSetting::LoadDefault ( int /*Index*/, stdstr & /*Value*/ ) const
 {
 	g_Notify->BreakPoint(__FILE__,__LINE__);
 	/*if (m_DefaultSetting != Default_None)
@@ -122,7 +122,7 @@ void CSettingTypeRomDatabaseSetting::LoadDefault ( int /*Index*/, stdstr & Value
 }
 
 //Update the settings
-void CSettingTypeRomDatabaseSetting::Save ( int /*Index*/, bool Value )
+void CSettingTypeRomDatabaseSetting::Save ( int /*Index*/, bool /*Value*/ )
 {
 	g_Notify->BreakPoint(__FILE__,__LINE__);
 	/*if (!g_Settings->LoadBool(Setting_RdbEditor))
@@ -169,7 +169,7 @@ void CSettingTypeRomDatabaseSetting::Save ( int /*Index*/, const stdstr & /*Valu
 	*/
 }
 
-void CSettingTypeRomDatabaseSetting::Save ( int /*Index*/, const char * Value )
+void CSettingTypeRomDatabaseSetting::Save ( int /*Index*/, const char * /*Value*/ )
 {
 	g_Notify->BreakPoint(__FILE__,__LINE__);
 	/*if (!g_Settings->LoadBool(Setting_RdbEditor))
diff --git a/Source/Project64/User Interface.h b/Source/Project64/User Interface.h
index 359e0ba53..05b97978f 100644
--- a/Source/Project64/User Interface.h	
+++ b/Source/Project64/User Interface.h	
@@ -16,13 +16,6 @@
 #include "Multilanguage.h"
 #include "Settings.h"
 
-#define DECLARE_HANDLE(name) struct name##__ { int unused; }; typedef struct name##__ *name
-
-DECLARE_HANDLE (WND_HANDLE);
-DECLARE_HANDLE (MENU_HANDLE);
-DECLARE_HANDLE (DC_HANDLE);
-
-
 typedef unsigned char    BYTE;
 typedef unsigned short   WORD;
 typedef unsigned long    DWORD;
@@ -39,7 +32,7 @@ typedef struct
 } RECT_STRUCT;
 
 typedef struct {
-    DC_HANDLE   hdc;
+    HDC   hdc;
     int        fErase;
     RECT_STRUCT rcPaint;
     int        fRestore;
diff --git a/Source/Project64/User Interface/Gui Class.cpp b/Source/Project64/User Interface/Gui Class.cpp
index cdb277931..02ef8ae11 100644
--- a/Source/Project64/User Interface/Gui Class.cpp	
+++ b/Source/Project64/User Interface/Gui Class.cpp	
@@ -17,7 +17,7 @@ void EnterLogOptions(HWND hwndOwner);
 #pragma comment(lib, "Comctl32.lib") 
 
 DWORD CALLBACK AboutBoxProc (HWND WndHandle, DWORD uMsg, DWORD wParam, DWORD lParam);
-DWORD CALLBACK MainGui_Proc (WND_HANDLE WndHandle, DWORD uMsg, DWORD wParam, DWORD lParam);
+DWORD CALLBACK MainGui_Proc (HWND WndHandle, DWORD uMsg, DWORD wParam, DWORD lParam);
 
 bool CMainGui::RegisterWinClass ( void ) {
 	WNDCLASS wcl;
@@ -156,7 +156,7 @@ void CMainGui::AboutIniBox (void) {
 	DialogBoxParam(GetModuleHandle(NULL), MAKEINTRESOURCE(IDD_About_Ini), (HWND)m_hMainWindow, (DLGPROC)AboutIniBoxProc,(LPARAM)this);
 }
 
-DWORD CALLBACK AboutIniBoxProc (WND_HANDLE WndHandle, DWORD uMsg, DWORD wParam, DWORD /*lParam*/) {
+DWORD CALLBACK AboutIniBoxProc (HWND WndHandle, DWORD uMsg, DWORD wParam, DWORD /*lParam*/) {
 	static char RDBHomePage[300], CHTHomePage[300], RDXHomePage[300];
 	
 	switch (uMsg) {
@@ -310,13 +310,13 @@ void CMainGui::Caption (LPCSTR Caption) {
 }
 
 void CMainGui::Create (const char * WindowTitle) {
-	m_hMainWindow = (WND_HANDLE)CreateWindow ("Project64 2.0", WindowTitle, WS_OVERLAPPED | WS_CLIPCHILDREN | 
+	m_hMainWindow = (HWND)CreateWindow ("Project64 2.0", WindowTitle, WS_OVERLAPPED | WS_CLIPCHILDREN | 
 		WS_CLIPSIBLINGS | WS_SYSMENU | WS_MINIMIZEBOX,5,5,640,480,
 		NULL,NULL,GetModuleHandle(NULL),this );
 }
 
 void CMainGui::CreateStatusBar (void) {
-	m_hStatusWnd = (WND_HANDLE)CreateStatusWindow( WS_CHILD | WS_VISIBLE, "", (HWND)m_hMainWindow, StatusBarID );
+	m_hStatusWnd = (HWND)CreateStatusWindow( WS_CHILD | WS_VISIBLE, "", (HWND)m_hMainWindow, StatusBarID );
 	SendMessage( (HWND)m_hStatusWnd, SB_SETTEXT, 0, (LPARAM)"" );
 }
 
@@ -464,7 +464,7 @@ void CMainGui::SaveWindowLoc ( void )
 
 }
 
-DWORD CALLBACK CMainGui::MainGui_Proc (WND_HANDLE hWnd, DWORD uMsg, DWORD wParam, DWORD lParam) {
+DWORD CALLBACK CMainGui::MainGui_Proc (HWND hWnd, DWORD uMsg, DWORD wParam, DWORD lParam) {
 	switch (uMsg) {	
 	case WM_CREATE:
 		{
diff --git a/Source/Project64/User Interface/Gui Class.h b/Source/Project64/User Interface/Gui Class.h
index ab50e3c5d..4c54c5d88 100644
--- a/Source/Project64/User Interface/Gui Class.h	
+++ b/Source/Project64/User Interface/Gui Class.h	
@@ -71,7 +71,7 @@ public:
 	bool InitiatePlugins ( void );
 
 	//Get Window Handle
-	inline WND_HANDLE GetHandle ( void ) const { return m_hMainWindow; }
+	inline HWND GetHandle ( void ) const { return m_hMainWindow; }
 
 private:
 	CMainGui(void);					// Disable default constructor
@@ -89,8 +89,8 @@ private:
 	void Resize           ( DWORD fwSizeType, WORD nWidth, WORD nHeight ); //responding to WM_SIZE
 
 	friend DWORD CALLBACK AboutBoxProc ( HWND, DWORD, DWORD, DWORD );
-	friend DWORD CALLBACK AboutIniBoxProc ( WND_HANDLE, DWORD, DWORD, DWORD );
-	static DWORD CALLBACK MainGui_Proc ( WND_HANDLE, DWORD, DWORD, DWORD );
+	friend DWORD CALLBACK AboutIniBoxProc ( HWND, DWORD, DWORD, DWORD );
+	static DWORD CALLBACK MainGui_Proc ( HWND, DWORD, DWORD, DWORD );
 
 	friend void RomBowserEnabledChanged  (CMainGui * Gui);
 	friend void RomBowserColoumnsChanged (CMainGui * Gui);
@@ -98,7 +98,7 @@ private:
 
 	CBaseMenu     * m_Menu;
 
-	WND_HANDLE  m_hMainWindow, m_hStatusWnd;
+	HWND  m_hMainWindow, m_hStatusWnd;
 	DWORD       m_ThreadId;
 #ifdef BETA_RELEASE
 	bool        m_hacked;
diff --git a/Source/Project64/User Interface/Main Menu Class.cpp b/Source/Project64/User Interface/Main Menu Class.cpp
index f4e55b06b..420c46bfc 100644
--- a/Source/Project64/User Interface/Main Menu Class.cpp	
+++ b/Source/Project64/User Interface/Main Menu Class.cpp	
@@ -50,7 +50,7 @@ void CMainMenu::SettingsChanged (CMainMenu * _this )
 	_this->ResetMenu();
 }
 
-int CMainMenu::ProcessAccelerator ( WND_HANDLE hWnd, void * lpMsg ) {
+int CMainMenu::ProcessAccelerator ( HWND hWnd, void * lpMsg ) {
 	if (m_ResetAccelerators)
 	{
 		m_ResetAccelerators = false;
@@ -60,7 +60,7 @@ int CMainMenu::ProcessAccelerator ( WND_HANDLE hWnd, void * lpMsg ) {
 	return TranslateAccelerator((HWND)hWnd,(HACCEL)m_AccelTable,(LPMSG)lpMsg);
 }
 
-bool CMainMenu::ProcessMessage(WND_HANDLE hWnd, DWORD /*FromAccelerator*/, DWORD MenuID) {
+bool CMainMenu::ProcessMessage(HWND hWnd, DWORD /*FromAccelerator*/, DWORD MenuID) {
 	switch (MenuID) {
 	case ID_FILE_OPEN_ROM: 
 		{
@@ -671,7 +671,7 @@ stdstr CMainMenu::GetSaveSlotString (int Slot)
 	return stdstr_f("%s%s",SlotName.c_str(),LastSaveTime.c_str()) ;
 }
 
-void CMainMenu::FillOutMenu ( MENU_HANDLE hMenu ) {
+void CMainMenu::FillOutMenu ( HMENU hMenu ) {
 	CGuard Guard(m_CS);
 
 	MENU_ITEM Item;
@@ -1199,12 +1199,12 @@ void CMainMenu::ResetMenu(void)
 	{
 		//Create a new window with all the items
 		WriteTrace(TraceDebug,__FUNCTION__ ": Create Menu");
-		MENU_HANDLE hMenu = (MENU_HANDLE)CreateMenu();
+		HMENU hMenu = (HMENU)CreateMenu();
 		FillOutMenu(hMenu);
 		WriteTrace(TraceDebug,__FUNCTION__ ": Create Menu Done");
 
 		//save old menu to destroy latter
-		MENU_HANDLE OldMenuHandle;
+		HMENU OldMenuHandle;
 		{
 			CGuard Guard(m_CS);
 			OldMenuHandle = m_MenuHandle;
diff --git a/Source/Project64/User Interface/Main Menu Class.h b/Source/Project64/User Interface/Main Menu Class.h
index cc8db595d..a8fa12d83 100644
--- a/Source/Project64/User Interface/Main Menu Class.h	
+++ b/Source/Project64/User Interface/Main Menu Class.h	
@@ -64,7 +64,7 @@ class CMainMenu :
 	SettingList  m_ChangeSettingList;
 	CriticalSection m_CS;
 	
-	void FillOutMenu ( MENU_HANDLE hMenu );
+	void FillOutMenu ( HMENU hMenu );
 	//stdstr ShortCutString(MSC_MAP & ShortCuts, int  MenuID, CMenuShortCutKey::ACCESS_MODE AccessLevel);
 	stdstr GetSaveSlotString ( int Slot );
 	stdstr GetFileLastMod    ( stdstr FileName );
@@ -75,8 +75,8 @@ public:
 	     CMainMenu      ( CMainGui * Window );
         ~CMainMenu();
     
-    int       ProcessAccelerator ( WND_HANDLE hWnd, void * lpMsg );
-	bool      ProcessMessage     ( WND_HANDLE hWnd, DWORD wNotifyCode, DWORD wID);
+    int       ProcessAccelerator ( HWND hWnd, void * lpMsg );
+	bool      ProcessMessage     ( HWND hWnd, DWORD wNotifyCode, DWORD wID);
 	void      ResetMenu          ( void );
 	void      ResetAccelerators  ( void ) { m_ResetAccelerators = true; } 
 };
diff --git a/Source/Project64/User Interface/Menu Class.cpp b/Source/Project64/User Interface/Menu Class.cpp
index ff287a16b..569887b18 100644
--- a/Source/Project64/User Interface/Menu Class.cpp	
+++ b/Source/Project64/User Interface/Menu Class.cpp	
@@ -1,11 +1,11 @@
 #include "stdafx.h"
 
 CBaseMenu::CBaseMenu () :
-	m_MenuHandle((MENU_HANDLE)CreateMenu())
+	m_MenuHandle((HMENU)CreateMenu())
 {
 }
 
-bool CBaseMenu::AddMenu(MENU_HANDLE hMenu, MenuItemList Items ) {
+bool CBaseMenu::AddMenu(HMENU hMenu, MenuItemList Items ) {
 	if (Items.begin() == Items.end()) { return false; }
 
 	UINT ItemID, uFlags;
@@ -36,7 +36,7 @@ bool CBaseMenu::AddMenu(MENU_HANDLE hMenu, MenuItemList Items ) {
 			ItemID = (UINT)CreatePopupMenu();
 			uFlags |= MF_POPUP;
 
-			AddMenu((MENU_HANDLE)ItemID,*SubMenu);
+			AddMenu((HMENU)ItemID,*SubMenu);
 		}
 		
 		if (ItemID == ID_PLUGIN_MENU)
diff --git a/Source/Project64/User Interface/Menu Class.h b/Source/Project64/User Interface/Menu Class.h
index 9928dad43..8f342e696 100644
--- a/Source/Project64/User Interface/Menu Class.h	
+++ b/Source/Project64/User Interface/Menu Class.h	
@@ -53,16 +53,16 @@ typedef std::list<MENU_ITEM>   MenuItemList;
 
 class CBaseMenu  {
 protected:
-	MENU_HANDLE m_MenuHandle;
+	HMENU m_MenuHandle;
 	
-	bool AddMenu    ( MENU_HANDLE hMenu, MenuItemList Items );
+	bool AddMenu    ( HMENU hMenu, MenuItemList Items );
 
 public:
 	    CBaseMenu ();
 
 
-    virtual int  ProcessAccelerator(WND_HANDLE hWnd, void * lpMsg ) = 0; // pure virtual draw() function
-    virtual bool ProcessMessage(WND_HANDLE hWnd, DWORD wNotifyCode, DWORD wID) = 0; // pure virtual draw() function
+    virtual int  ProcessAccelerator(HWND hWnd, void * lpMsg ) = 0; // pure virtual draw() function
+    virtual bool ProcessMessage(HWND hWnd, DWORD wNotifyCode, DWORD wID) = 0; // pure virtual draw() function
     virtual void ResetMenu(void) = 0; // pure virtual draw() function
-	MENU_HANDLE GetHandle (void) { return m_MenuHandle; }
+	HMENU GetHandle (void) { return m_MenuHandle; }
 };
diff --git a/Source/Project64/User Interface/Rom Browser Class.cpp b/Source/Project64/User Interface/Rom Browser Class.cpp
index 481f4ed5d..c4f46650a 100644
--- a/Source/Project64/User Interface/Rom Browser Class.cpp	
+++ b/Source/Project64/User Interface/Rom Browser Class.cpp	
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 
-CRomBrowser::CRomBrowser (WND_HANDLE & MainWindow, WND_HANDLE & StatusWindow ) :
+CRomBrowser::CRomBrowser (HWND & MainWindow, HWND & StatusWindow ) :
 	m_MainWindow(MainWindow), 
 	m_StatusWindow(StatusWindow),
 	m_RefreshThread(NULL),
@@ -365,7 +365,7 @@ DWORD CRomBrowser::AsciiToHex (char * HexValue) {
 
 
 void CRomBrowser::CreateRomListControl (void) {
-	m_hRomList = (WND_HANDLE)CreateWindowEx( WS_EX_CLIENTEDGE,WC_LISTVIEW,NULL,
+	m_hRomList = (HWND)CreateWindowEx( WS_EX_CLIENTEDGE,WC_LISTVIEW,NULL,
 					WS_TABSTOP | WS_VISIBLE | WS_CHILD | LVS_OWNERDRAWFIXED |
 					WS_BORDER | LVS_SINGLESEL | LVS_REPORT,
 					0,0,0,0,(HWND)m_MainWindow,(HMENU)IDC_ROMLIST,GetModuleHandle(NULL),NULL);	
@@ -937,7 +937,7 @@ void CRomBrowser::LoadRomList (void) {
 	RomList_SortList();
 }
 
-void CRomBrowser::MenuSetText ( MENU_HANDLE hMenu, int MenuPos, const char * Title, char * ShotCut) {
+void CRomBrowser::MenuSetText ( HMENU hMenu, int MenuPos, const char * Title, char * ShotCut) {
 	MENUITEMINFO MenuInfo;
 	char String[256];
 
@@ -1368,7 +1368,7 @@ void CRomBrowser::RomList_PopupMenu(DWORD /*pnmh*/)
 	
 	//Load the menu
 	HMENU hMenu = LoadMenu(GetModuleHandle(NULL),MAKEINTRESOURCE(IDR_POPUP));
-	MENU_HANDLE hPopupMenu = (MENU_HANDLE)GetSubMenu(hMenu,0);
+	HMENU hPopupMenu = (HMENU)GetSubMenu(hMenu,0);
 	
 	//Fix up menu
 	MenuSetText(hPopupMenu, 0, GS(POPUP_PLAY), NULL);
@@ -1502,7 +1502,7 @@ void CRomBrowser::SaveRomListColoumnInfo(void) {
 	WriteTrace(TraceDebug,__FUNCTION__ ": Done");
 }
 
-int CALLBACK CRomBrowser::SelectRomDirCallBack(WND_HANDLE hwnd,DWORD uMsg,DWORD /*lp*/, DWORD lpData) 
+int CALLBACK CRomBrowser::SelectRomDirCallBack(HWND hwnd,DWORD uMsg,DWORD /*lp*/, DWORD lpData) 
 {
   switch(uMsg)
   {
@@ -1738,7 +1738,6 @@ void CRomBrowser::WatchRomDirChanged ( CRomBrowser * _this )
 			}
 			WriteTrace(TraceDebug,__FUNCTION__ ": 5d");
 		}
-		WriteTrace(TraceDebug,__FUNCTION__ ": 5e");
 	}
 	catch (...)
 	{
diff --git a/Source/Project64/User Interface/Rom Browser.h b/Source/Project64/User Interface/Rom Browser.h
index b168015d3..4ee96ac82 100644
--- a/Source/Project64/User Interface/Rom Browser.h	
+++ b/Source/Project64/User Interface/Rom Browser.h	
@@ -130,9 +130,9 @@ class CRomBrowser
 
 	typedef std::vector<ROM_INFO>   ROMINFO_LIST;
 
-	WND_HANDLE           & m_MainWindow;
-	WND_HANDLE           & m_StatusWindow;
-	WND_HANDLE             m_hRomList;
+	HWND           & m_MainWindow;
+	HWND           & m_StatusWindow;
+	HWND             m_hRomList;
 	ROMBROWSER_FIELDS_LIST m_Fields;
 	FIELD_TYPE_LIST        m_FieldType;
 	ROMINFO_LIST           m_RomInfo;
@@ -163,7 +163,7 @@ class CRomBrowser
 	static int   GetCicChipID     ( BYTE * RomData );
 	bool  LoadDataFromRomFile     ( char * FileName, BYTE * Data,int DataLen, int * RomSize, FILE_FORMAT & FileFormat );
 	void  LoadRomList             ( void );
-	void  MenuSetText             ( MENU_HANDLE hMenu, int MenuPos, const char * Title, char * ShotCut);
+	void  MenuSetText             ( HMENU hMenu, int MenuPos, const char * Title, char * ShotCut);
 	void  SaveRomList             ( strlist & FileList );
 	void  RomList_ColoumnSortList ( DWORD pnmh );
 	void  RomList_GetDispInfo     ( DWORD pnmh );
@@ -187,11 +187,11 @@ class CRomBrowser
 	static void AddField (ROMBROWSER_FIELDS_LIST & Fields, LPCSTR Name, int Pos,int ID,int Width,LanguageStringID LangID, bool UseDefault);
 
 	//Callback
-	static int CALLBACK SelectRomDirCallBack ( WND_HANDLE hwnd,DWORD uMsg,DWORD lp, DWORD lpData );
+	static int CALLBACK SelectRomDirCallBack ( HWND hwnd,DWORD uMsg,DWORD lp, DWORD lpData );
 	static int CALLBACK RomList_CompareItems ( DWORD lParam1, DWORD lParam2, DWORD lParamSort );
 
 public:
-	      CRomBrowser             ( WND_HANDLE & hMainWindow, WND_HANDLE & StatusWindow );
+	      CRomBrowser             ( HWND & hMainWindow, HWND & StatusWindow );
 	     ~CRomBrowser             ( void );
 	void  HighLightLastRom        ( void );
 	void  HideRomList             ( void );
diff --git a/Source/Project64/WTL App.h b/Source/Project64/WTL App.h
index 2fcd5a9b5..cfda490a8 100644
--- a/Source/Project64/WTL App.h	
+++ b/Source/Project64/WTL App.h	
@@ -11,8 +11,14 @@
 #pragma once
 //#define _WIN32_WINNT 0x0500
 
+#define _ATL_DISABLE_NOTHROW_NEW
+#include <shellapi.h>
 #include <atlbase.h>
-#include <wtl/atlapp.h>
+
+#pragma warning(push)
+#pragma warning(disable : 4996) // warning C4996: 'GetVersionExA': was declared deprecated
+#include <wtl/atlapp.h> 
+#pragma warning(pop)
 
 class CPj64Module :
 	public CAppModule
diff --git a/Source/RSP/RSP.vcxproj b/Source/RSP/RSP.vcxproj
new file mode 100644
index 000000000..93fc2fb4a
--- /dev/null
+++ b/Source/RSP/RSP.vcxproj
@@ -0,0 +1,117 @@
+<?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="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{A7ED562C-63F3-4B7E-B6B3-2CF7848752E1}</ProjectGuid>
+    <RootNamespace>RSP</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(SolutionDir)PropertySheets/Win32.Release.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(SolutionDir)PropertySheets/Win32.Debug.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <TargetName>RSP_d 1.7</TargetName>
+    <OutDir>$(SolutionDir)Plugin\RSP\</OutDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader />
+    </ClCompile>
+    <Link />
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PrecompiledHeader />
+    </ClCompile>
+    <Link>
+      <OutputFile>$(Root)Plugin/RSP/RSP 1.7.dll</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="breakpoint.c" />
+    <ClCompile Include="Cpu.c" />
+    <ClCompile Include="dma.c" />
+    <ClCompile Include="Interpreter CPU.c" />
+    <ClCompile Include="Interpreter Ops.c" />
+    <ClCompile Include="log.cpp" />
+    <ClCompile Include="Main.cpp" />
+    <ClCompile Include="memory.c" />
+    <ClCompile Include="Mmx.c" />
+    <ClCompile Include="Profiling.cpp" />
+    <ClCompile Include="Recompiler Analysis.c" />
+    <ClCompile Include="Recompiler CPU.c" />
+    <ClCompile Include="Recompiler Ops.c" />
+    <ClCompile Include="Recompiler Sections.c" />
+    <ClCompile Include="RSP Command.c" />
+    <ClCompile Include="RSP Register.c" />
+    <ClCompile Include="Sse.c" />
+    <ClCompile Include="X86.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="breakpoint.h" />
+    <ClInclude Include="Cpu.h" />
+    <ClInclude Include="dma.h" />
+    <ClInclude Include="Interpreter CPU.h" />
+    <ClInclude Include="Interpreter Ops.h" />
+    <ClInclude Include="log.h" />
+    <ClInclude Include="memory.h" />
+    <ClInclude Include="OpCode.h" />
+    <ClInclude Include="Profiling.h" />
+    <ClInclude Include="Recompiler CPU.h" />
+    <ClInclude Include="Recompiler Ops.h" />
+    <ClInclude Include="resource.h" />
+    <ClInclude Include="RSP Command.h" />
+    <ClInclude Include="RSP Registers.h" />
+    <ClInclude Include="Rsp.h" />
+    <ClInclude Include="Types.h" />
+    <ClInclude Include="X86.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="RSP.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Common\Common.vcxproj">
+      <Project>{b4a4b994-9111-42b1-93c2-6f1ca8bc4421}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\Settings\Settings.vcxproj">
+      <Project>{8b9961b1-88d9-4ea3-a752-507a00dd9f3d}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/Source/RSP/RSP.vcxproj.filters b/Source/RSP/RSP.vcxproj.filters
new file mode 100644
index 000000000..8c3d284fa
--- /dev/null
+++ b/Source/RSP/RSP.vcxproj.filters
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{efc57297-d491-4393-82bc-c7d7522164e4}</UniqueIdentifier>
+      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{0baf5ca2-d686-4cb5-b3d2-1617c3b17dc0}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl</Extensions>
+    </Filter>
+    <Filter Include="Header Files\RSP Header Files">
+      <UniqueIdentifier>{d213ff3a-6660-487a-9efc-5f05821cef48}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{53b9495d-f564-4b1d-968c-42c816ca2d41}</UniqueIdentifier>
+      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="breakpoint.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Cpu.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="dma.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Interpreter CPU.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Interpreter Ops.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="log.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Main.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="memory.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Mmx.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Profiling.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Recompiler Analysis.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Recompiler CPU.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Recompiler Ops.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Recompiler Sections.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="RSP Command.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="RSP Register.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Sse.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="X86.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="breakpoint.h">
+      <Filter>Header Files\RSP Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Cpu.h">
+      <Filter>Header Files\RSP Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="dma.h">
+      <Filter>Header Files\RSP Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Interpreter CPU.h">
+      <Filter>Header Files\RSP Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Interpreter Ops.h">
+      <Filter>Header Files\RSP Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="log.h">
+      <Filter>Header Files\RSP Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="memory.h">
+      <Filter>Header Files\RSP Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="OpCode.h">
+      <Filter>Header Files\RSP Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Profiling.h">
+      <Filter>Header Files\RSP Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Recompiler CPU.h">
+      <Filter>Header Files\RSP Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Recompiler Ops.h">
+      <Filter>Header Files\RSP Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="resource.h">
+      <Filter>Header Files\RSP Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="RSP Command.h">
+      <Filter>Header Files\RSP Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="RSP Registers.h">
+      <Filter>Header Files\RSP Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Rsp.h">
+      <Filter>Header Files\RSP Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Types.h">
+      <Filter>Header Files\RSP Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="X86.h">
+      <Filter>Header Files\RSP Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="RSP.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Source/RSP/X86.c b/Source/RSP/X86.c
index 5314bb3da..7e82771bc 100644
--- a/Source/RSP/X86.c
+++ b/Source/RSP/X86.c
@@ -809,9 +809,9 @@ void Cwde(void) {
 	PUTDST8(RecompPos, 0x98);
 }
 
-void DecX86reg(x86Reg) {
-	CPU_Message("      dec %s",x86_Name(x86Reg));
-	switch (x86Reg) {
+void DecX86reg(int x86reg) {
+	CPU_Message("      dec %s", x86_Name(x86reg));
+	switch (x86reg) {
 	case x86_EAX: PUTDST16(RecompPos,0xC8FF); break;
 	case x86_EBX: PUTDST16(RecompPos,0xCBFF); break;
 	case x86_ECX: PUTDST16(RecompPos,0xC9FF); break;
diff --git a/Source/Settings/Settings.vcxproj b/Source/Settings/Settings.vcxproj
new file mode 100644
index 000000000..28edee0de
--- /dev/null
+++ b/Source/Settings/Settings.vcxproj
@@ -0,0 +1,60 @@
+<?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="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{8B9961B1-88D9-4EA3-A752-507A00DD9F3D}</ProjectGuid>
+    <RootNamespace>Settings</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(SolutionDir)PropertySheets/Win32.Release.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(SolutionDir)PropertySheets/Win32.Debug.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader />
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PrecompiledHeader />
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="Settings.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="Settings.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/Source/Settings/Settings.vcxproj.filters b/Source/Settings/Settings.vcxproj.filters
new file mode 100644
index 000000000..f664b9c0d
--- /dev/null
+++ b/Source/Settings/Settings.vcxproj.filters
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{891241b1-ca4e-4637-b7bb-01ed0dbea256}</UniqueIdentifier>
+      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{ecd62392-723f-4db7-aa1f-6e688cfb2e1a}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="Settings.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="Settings.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Source/SortRdb/SortRdb.vcxproj b/Source/SortRdb/SortRdb.vcxproj
new file mode 100644
index 000000000..255f33ece
--- /dev/null
+++ b/Source/SortRdb/SortRdb.vcxproj
@@ -0,0 +1,71 @@
+<?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="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{5788717F-E3D4-40CF-9637-3A2AEE85BB81}</ProjectGuid>
+    <RootNamespace>SortRdb</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(SolutionDir)PropertySheets/Win32.Release.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(SolutionDir)PropertySheets/Win32.Debug.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader />
+      <WarningLevel>Level4</WarningLevel>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PrecompiledHeader />
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="main.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Common\Common.vcxproj">
+      <Project>{b4a4b994-9111-42b1-93c2-6f1ca8bc4421}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/Source/SortRdb/SortRdb.vcxproj.filters b/Source/SortRdb/SortRdb.vcxproj.filters
new file mode 100644
index 000000000..a5aaa3f23
--- /dev/null
+++ b/Source/SortRdb/SortRdb.vcxproj.filters
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="main.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Source/nragev20/NRage_Input_V2.vcxproj b/Source/nragev20/NRage_Input_V2.vcxproj
new file mode 100644
index 000000000..ca7950473
--- /dev/null
+++ b/Source/nragev20/NRage_Input_V2.vcxproj
@@ -0,0 +1,104 @@
+<?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="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{FD617E80-9E40-4138-85DA-B94633972E6A}</ProjectGuid>
+    <RootNamespace>NRage_Input_V2</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(SolutionDir)PropertySheets/Win32.Release.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(SolutionDir)PropertySheets/Win32.Debug.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(Root)Source\3rd Party\directx\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>xinput.lib;dinput8.lib;dxguid.lib;Comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(Root)Plugin/Input/NRage_Input_V2_d.dll</OutputFile>
+      <AdditionalLibraryDirectories>$(Root)Source\3rd Party\directx\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(Root)Source\3rd Party\directx\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>xinput.lib;dinput8.lib;dxguid.lib;Comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(Root)Plugin/Input/NRage_Input_V2.dll</OutputFile>
+      <AdditionalLibraryDirectories>$(Root)Source\3rd Party\directx\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="Debug.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="DirectInput.cpp" />
+    <ClCompile Include="FileAccess.cpp" />
+    <ClCompile Include="GBCart.cpp" />
+    <ClCompile Include="Interface.cpp" />
+    <ClCompile Include="International.cpp" />
+    <ClCompile Include="NRagePluginV2.cpp" />
+    <ClCompile Include="PakIO.cpp" />
+    <ClCompile Include="XInputController.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="XInputController.h" />
+    <ClInclude Include="commonIncludes.h" />
+    <ClInclude Include="ControllerSpecs\Controller #1.0.h" />
+    <ClInclude Include="ControllerSpecs\Controller #1.1.h" />
+    <ClInclude Include="Debug.h" />
+    <ClInclude Include="DirectInput.h" />
+    <ClInclude Include="FileAccess.h" />
+    <ClInclude Include="GBCart.h" />
+    <ClInclude Include="Interface.h" />
+    <ClInclude Include="International.h" />
+    <ClInclude Include="NRagePluginV2.h" />
+    <ClInclude Include="PakIO.h" />
+    <ClInclude Include="resource.h" />
+    <ClInclude Include="settings.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="configs\Controller1.cpf" />
+    <None Include="configs\Shortcuts.sc" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="NRagePluginV2.rc" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/Source/nragev20/NRage_Input_V2.vcxproj.filters b/Source/nragev20/NRage_Input_V2.vcxproj.filters
new file mode 100644
index 000000000..2f1dfd4bc
--- /dev/null
+++ b/Source/nragev20/NRage_Input_V2.vcxproj.filters
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{d605fa72-86f1-484f-ae67-9d7561e0d9ca}</UniqueIdentifier>
+      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{dc26775d-8e36-4858-a40e-8e07fdbc831f}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{2bcd7a7e-5013-4acc-88b4-a6a04c432ef3}</UniqueIdentifier>
+      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="Debug.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="DirectInput.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="FileAccess.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="GBCart.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Interface.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="International.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="NRagePluginV2.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="PakIO.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="XInputController.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="XInputController.h">
+      <Filter>Source Files</Filter>
+    </ClInclude>
+    <ClInclude Include="commonIncludes.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ControllerSpecs\Controller #1.0.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ControllerSpecs\Controller #1.1.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Debug.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="DirectInput.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="FileAccess.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="GBCart.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Interface.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="International.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="NRagePluginV2.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="PakIO.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="resource.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="settings.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="configs\Controller1.cpf">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="configs\Shortcuts.sc">
+      <Filter>Resource Files</Filter>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="NRagePluginV2.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file