From 75c82513b5893706eff073b9bec9c82e7883ae70 Mon Sep 17 00:00:00 2001
From: Dimitris Panokostas <midwan@gmail.com>
Date: Tue, 5 Dec 2017 12:38:45 +0100
Subject: [PATCH] Updated VisualGDB solution for SDL1 target

---
 .gitignore                                    |    1 +
 .../Amiberry-sdl1-Debug.vgdbsettings}         |   75 +-
 ...iberry-sdl1-Debug.vgdbsettings.midwan.user |   17 +
 .../Amiberry-sdl1-Release.vgdbsettings        |  125 ++
 VisualGDB/Amiberry-sdl1/Amiberry-sdl1.vcxproj |  390 +++++++
 .../Amiberry-sdl1.vcxproj.filters             | 1029 +++++++++++++++++
 VisualGDB/Amiberry/Amiberry.sln               |   11 +-
 VisualGDB/Amiberry/Amiberry.vcxproj           |   28 +-
 VisualGDB/Amiberry/Amiberry.vcxproj.filters   |    6 +
 9 files changed, 1580 insertions(+), 102 deletions(-)
 rename VisualGDB/{Amiberry/Amiberry-Debug-sdl1.vgdbsettings => Amiberry-sdl1/Amiberry-sdl1-Debug.vgdbsettings} (62%)
 create mode 100644 VisualGDB/Amiberry-sdl1/Amiberry-sdl1-Debug.vgdbsettings.midwan.user
 create mode 100644 VisualGDB/Amiberry-sdl1/Amiberry-sdl1-Release.vgdbsettings
 create mode 100644 VisualGDB/Amiberry-sdl1/Amiberry-sdl1.vcxproj
 create mode 100644 VisualGDB/Amiberry-sdl1/Amiberry-sdl1.vcxproj.filters

diff --git a/.gitignore b/.gitignore
index 18777cc6..1dc7590a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,3 +46,4 @@ VisualGDB/VisualGDB/Release/gencomp
 VSLinux/obj/ARM/Debug/amiberry-sdl2-dev
 VisualGDB/VisualGDB/Debug/Amiberry-sdl2-dev
 VSLinux/obj/ARM/Debug/
+VisualGDB/Amiberry/VisualGDB/Debug/Amiberry-sdl1
diff --git a/VisualGDB/Amiberry/Amiberry-Debug-sdl1.vgdbsettings b/VisualGDB/Amiberry-sdl1/Amiberry-sdl1-Debug.vgdbsettings
similarity index 62%
rename from VisualGDB/Amiberry/Amiberry-Debug-sdl1.vgdbsettings
rename to VisualGDB/Amiberry-sdl1/Amiberry-sdl1-Debug.vgdbsettings
index 92a6581f..9e953ee1 100644
--- a/VisualGDB/Amiberry/Amiberry-Debug-sdl1.vgdbsettings
+++ b/VisualGDB/Amiberry-sdl1/Amiberry-sdl1-Debug.vgdbsettings
@@ -1,44 +1,16 @@
 <?xml version="1.0"?>
 <VisualGDBProjectSettings2 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <ConfigurationName>Debug-sdl1</ConfigurationName>
+  <ConfigurationName>Debug</ConfigurationName>
   <Project xsi:type="com.visualgdb.project.linux">
     <CustomSourceDirectories>
       <Directories />
       <PathStyle>MinGWUnixSlash</PathStyle>
     </CustomSourceDirectories>
-    <BuildHost>
-      <Transport>None</Transport>
-    </BuildHost>
     <DeploymentHost>
       <HostName>192.168.1.189</HostName>
       <Transport>SSH</Transport>
       <UserName>pi</UserName>
     </DeploymentHost>
-    <MainSourceTransferCommand>
-      <SkipWhenRunningCommandList>false</SkipWhenRunningCommandList>
-      <RemoteHost>
-        <Transport>None</Transport>
-      </RemoteHost>
-      <LocalDirectory>$(ProjectDir)</LocalDirectory>
-      <RemoteDirectory>/tmp/VisualGDB/$(ProjectDirUnixStyle)</RemoteDirectory>
-      <FileMasks>
-        <string>*.cpp</string>
-        <string>*.h</string>
-        <string>*.hpp</string>
-        <string>*.c</string>
-        <string>*.cc</string>
-        <string>*.cxx</string>
-        <string>*.mak</string>
-        <string>Makefile</string>
-        <string>*.txt</string>
-        <string>*.cmake</string>
-      </FileMasks>
-      <TransferNewFilesOnly>true</TransferNewFilesOnly>
-      <IncludeSubdirectories>true</IncludeSubdirectories>
-      <SelectedDirectories />
-      <DeleteDisappearedFiles>false</DeleteDisappearedFiles>
-      <ApplyGlobalExclusionList>true</ApplyGlobalExclusionList>
-    </MainSourceTransferCommand>
     <AllowChangingHostForMainCommands>false</AllowChangingHostForMainCommands>
     <SkipBuildIfNoSourceFilesChanged>false</SkipBuildIfNoSourceFilesChanged>
     <IgnoreFileTransferErrors>false</IgnoreFileTransferErrors>
@@ -55,9 +27,10 @@
         <Revision>1</Revision>
       </Version>
     </ToolchainID>
-    <ProjectFile>Amiberry.vcxproj</ProjectFile>
+    <ProjectFile>Amiberry-sdl1.vcxproj</ProjectFile>
     <RemoteBuildEnvironment>
       <Records />
+      <EnvironmentSetupFiles />
     </RemoteBuildEnvironment>
     <ParallelJobCount>1</ParallelJobCount>
     <SuppressDirectoryChangeMessages>true</SuppressDirectoryChangeMessages>
@@ -146,47 +119,7 @@
       </DiscoverySettings>
     </ExtraSettings>
     <CodeAnalyzerSettings>
-      <Enabled>true</Enabled>
-      <SelectedAnalyzers>
-        <string>core.builtin.BuiltinFunctions</string>
-        <string>core.builtin.NoReturnFunctions</string>
-        <string>core.CallAndMessage</string>
-        <string>core.DivideZero</string>
-        <string>core.DynamicTypePropagation</string>
-        <string>core.NonNullParamChecker</string>
-        <string>core.NullDereference</string>
-        <string>core.StackAddressEscape</string>
-        <string>core.UndefinedBinaryOperatorResult</string>
-        <string>core.uninitialized.ArraySubscript</string>
-        <string>core.uninitialized.Assign</string>
-        <string>core.uninitialized.Branch</string>
-        <string>core.uninitialized.CapturedBlockVariable</string>
-        <string>core.uninitialized.UndefReturn</string>
-        <string>core.VLASize</string>
-        <string>cplusplus.NewDelete</string>
-        <string>cplusplus.NewDeleteLeaks</string>
-        <string>deadcode.DeadStores</string>
-        <string>nullability.NullPassedToNonnull</string>
-        <string>nullability.NullReturnedFromNonnull</string>
-        <string>security.insecureAPI.getpw</string>
-        <string>security.insecureAPI.gets</string>
-        <string>security.insecureAPI.mkstemp</string>
-        <string>security.insecureAPI.mktemp</string>
-        <string>security.insecureAPI.UncheckedReturn</string>
-        <string>security.insecureAPI.vfork</string>
-        <string>unix.API</string>
-        <string>unix.cstring.BadSizeArg</string>
-        <string>unix.cstring.NullArg</string>
-        <string>unix.Malloc</string>
-        <string>unix.MallocSizeof</string>
-        <string>unix.MismatchedDeallocator</string>
-        <string>unix.Vfork</string>
-      </SelectedAnalyzers>
-      <ExtraArguments>
-        <string>-analyzer-store=region</string>
-        <string>-analyzer-opt-analyze-nested-blocks</string>
-        <string>-analyzer-eagerly-assume</string>
-      </ExtraArguments>
+      <Enabled>false</Enabled>
     </CodeAnalyzerSettings>
   </CodeSense>
   <BuildContextDirectory>VisualGDB\VisualGDBCache</BuildContextDirectory>
diff --git a/VisualGDB/Amiberry-sdl1/Amiberry-sdl1-Debug.vgdbsettings.midwan.user b/VisualGDB/Amiberry-sdl1/Amiberry-sdl1-Debug.vgdbsettings.midwan.user
new file mode 100644
index 00000000..be8d5823
--- /dev/null
+++ b/VisualGDB/Amiberry-sdl1/Amiberry-sdl1-Debug.vgdbsettings.midwan.user
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<VisualGDBUserPreferences xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <UserDefinedVariableValues />
+  <DebugPreferences>
+    <CatchpointConfiguration>
+      <Throw>false</Throw>
+      <Rethrow>false</Rethrow>
+      <Catch>false</Catch>
+      <Exec>false</Exec>
+      <Fork>false</Fork>
+      <Vfork>false</Vfork>
+      <Syscalls />
+    </CatchpointConfiguration>
+    <MaskInterruptsWhileStepping>false</MaskInterruptsWhileStepping>
+    <MemoryWindowPreferences />
+  </DebugPreferences>
+</VisualGDBUserPreferences>
\ No newline at end of file
diff --git a/VisualGDB/Amiberry-sdl1/Amiberry-sdl1-Release.vgdbsettings b/VisualGDB/Amiberry-sdl1/Amiberry-sdl1-Release.vgdbsettings
new file mode 100644
index 00000000..2392ac09
--- /dev/null
+++ b/VisualGDB/Amiberry-sdl1/Amiberry-sdl1-Release.vgdbsettings
@@ -0,0 +1,125 @@
+<?xml version="1.0"?>
+<VisualGDBProjectSettings2 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <ConfigurationName>Release</ConfigurationName>
+  <Project xsi:type="com.visualgdb.project.linux">
+    <CustomSourceDirectories>
+      <Directories />
+      <PathStyle>MinGWUnixSlash</PathStyle>
+    </CustomSourceDirectories>
+    <DeploymentHost>
+      <HostName>192.168.1.189</HostName>
+      <Transport>SSH</Transport>
+      <UserName>pi</UserName>
+    </DeploymentHost>
+    <AllowChangingHostForMainCommands>false</AllowChangingHostForMainCommands>
+    <SkipBuildIfNoSourceFilesChanged>false</SkipBuildIfNoSourceFilesChanged>
+    <IgnoreFileTransferErrors>false</IgnoreFileTransferErrors>
+    <RemoveRemoteDirectoryOnClean>false</RemoveRemoteDirectoryOnClean>
+    <SkipDeploymentTests>false</SkipDeploymentTests>
+    <MainSourceDirectoryForLocalBuilds>$(ProjectDir)</MainSourceDirectoryForLocalBuilds>
+  </Project>
+  <Build xsi:type="com.visualgdb.build.msbuild">
+    <ToolchainID>
+      <ID>com.visualgdb.raspberry_pi</ID>
+      <Version>
+        <GCC>6.3.0</GCC>
+        <GDB>7.12</GDB>
+        <Revision>1</Revision>
+      </Version>
+    </ToolchainID>
+    <ProjectFile>Amiberry-sdl1.vcxproj</ProjectFile>
+    <RemoteBuildEnvironment>
+      <Records />
+    </RemoteBuildEnvironment>
+    <ParallelJobCount>1</ParallelJobCount>
+    <SuppressDirectoryChangeMessages>true</SuppressDirectoryChangeMessages>
+  </Build>
+  <Debug xsi:type="com.visualgdb.debug.remote">
+    <AdditionalStartupCommands />
+    <AdditionalGDBSettings>
+      <Features>
+        <DisableAutoDetection>false</DisableAutoDetection>
+        <UseFrameParameter>false</UseFrameParameter>
+        <SimpleValuesFlagSupported>false</SimpleValuesFlagSupported>
+        <ListLocalsSupported>false</ListLocalsSupported>
+        <ByteLevelMemoryCommandsAvailable>false</ByteLevelMemoryCommandsAvailable>
+        <ThreadInfoSupported>false</ThreadInfoSupported>
+        <PendingBreakpointsSupported>false</PendingBreakpointsSupported>
+        <SupportTargetCommand>false</SupportTargetCommand>
+        <ReliableBreakpointNotifications>false</ReliableBreakpointNotifications>
+      </Features>
+      <EnableSmartStepping>false</EnableSmartStepping>
+      <FilterSpuriousStoppedNotifications>false</FilterSpuriousStoppedNotifications>
+      <ForceSingleThreadedMode>false</ForceSingleThreadedMode>
+      <UseAppleExtensions>false</UseAppleExtensions>
+      <CanAcceptCommandsWhileRunning>false</CanAcceptCommandsWhileRunning>
+      <MakeLogFile>false</MakeLogFile>
+      <IgnoreModuleEventsWhileStepping>true</IgnoreModuleEventsWhileStepping>
+      <UseRelativePathsOnly>false</UseRelativePathsOnly>
+      <ExitAction>None</ExitAction>
+      <DisableDisassembly>false</DisableDisassembly>
+      <ExamineMemoryWithXCommand>false</ExamineMemoryWithXCommand>
+      <StepIntoNewInstanceEntry>main</StepIntoNewInstanceEntry>
+      <ExamineRegistersInRawFormat>true</ExamineRegistersInRawFormat>
+      <DisableSignals>false</DisableSignals>
+      <EnableAsyncExecutionMode>false</EnableAsyncExecutionMode>
+      <EnableNonStopMode>false</EnableNonStopMode>
+      <MaxBreakpointLimit>0</MaxBreakpointLimit>
+    </AdditionalGDBSettings>
+    <LaunchGDBSettings xsi:type="GDBLaunchParametersNewInstance">
+      <DebuggedProgram>$(TargetPath)</DebuggedProgram>
+      <GDBServerPort>2000</GDBServerPort>
+      <ProgramArguments />
+    </LaunchGDBSettings>
+    <GenerateCtrlBreakInsteadOfCtrlC>false</GenerateCtrlBreakInsteadOfCtrlC>
+    <DeploymentTargetPath>/home/pi/projects/amiberry/$(TargetFileName)</DeploymentTargetPath>
+    <X11WindowMode>Local</X11WindowMode>
+    <KeepConsoleAfterExit>false</KeepConsoleAfterExit>
+    <RunGDBUnderSudo>false</RunGDBUnderSudo>
+    <DeploymentMode>Auto</DeploymentMode>
+    <DeployWhenLaunchedWithoutDebugging>true</DeployWhenLaunchedWithoutDebugging>
+    <SuppressTTYCreation>false</SuppressTTYCreation>
+  </Debug>
+  <CustomBuild>
+    <PreSyncActions />
+    <PreBuildActions />
+    <PostBuildActions />
+    <PreCleanActions />
+    <PostCleanActions />
+  </CustomBuild>
+  <CustomDebug>
+    <PreDebugActions />
+    <PostDebugActions />
+    <DebugStopActions />
+    <BreakMode>Default</BreakMode>
+  </CustomDebug>
+  <CustomShortcuts>
+    <Shortcuts />
+    <ShowMessageAfterExecuting>true</ShowMessageAfterExecuting>
+  </CustomShortcuts>
+  <UserDefinedVariables />
+  <ImportedPropertySheets />
+  <CodeSense>
+    <Enabled>False</Enabled>
+    <CFLAGS />
+    <CXXFLAGS />
+    <ExternalSourceFileList />
+    <ExtraSettings>
+      <HideErrorsInSystemHeaders>true</HideErrorsInSystemHeaders>
+      <SupportLightweightReferenceAnalysis>false</SupportLightweightReferenceAnalysis>
+      <DiscoverySettings>
+        <Mode>Enabled</Mode>
+        <SearchInProjectDir>true</SearchInProjectDir>
+        <SearchInSourceDirs>true</SearchInSourceDirs>
+        <SearchInIncludeSubdirs>true</SearchInIncludeSubdirs>
+        <IgnoredDirs />
+        <IgnoredHeaders />
+      </DiscoverySettings>
+    </ExtraSettings>
+    <CodeAnalyzerSettings>
+      <Enabled>false</Enabled>
+    </CodeAnalyzerSettings>
+  </CodeSense>
+  <BuildContextDirectory>VisualGDB\VisualGDBCache</BuildContextDirectory>
+  <ProgramArgumentsSuggestions />
+</VisualGDBProjectSettings2>
\ No newline at end of file
diff --git a/VisualGDB/Amiberry-sdl1/Amiberry-sdl1.vcxproj b/VisualGDB/Amiberry-sdl1/Amiberry-sdl1.vcxproj
new file mode 100644
index 00000000..ba6bbe0c
--- /dev/null
+++ b/VisualGDB/Amiberry-sdl1/Amiberry-sdl1.vcxproj
@@ -0,0 +1,390 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|VisualGDB">
+      <Configuration>Debug</Configuration>
+      <Platform>VisualGDB</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|VisualGDB">
+      <Configuration>Release</Configuration>
+      <Platform>VisualGDB</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>15.0</VCProjectVersion>
+    <ProjectGuid>{14635D01-67B8-4863-9507-3FA5C8FB4B32}</ProjectGuid>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|VisualGDB'">
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|VisualGDB'">
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|VisualGDB'">
+    <GNUConfigurationType>Debug</GNUConfigurationType>
+    <ToolchainID>com.visualgdb.raspberry_pi</ToolchainID>
+    <ToolchainVersion>6.3.0/7.12/r1</ToolchainVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|VisualGDB'">
+    <ToolchainID>com.visualgdb.raspberry_pi</ToolchainID>
+    <ToolchainVersion>6.3.0/7.12/r1</ToolchainVersion>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|VisualGDB'">
+    <ClCompile>
+      <CPPLanguageStandard>GNUPP14</CPPLanguageStandard>
+      <AdditionalIncludeDirectories>=/usr/include/SDL;=/opt/vc/include;=/opt/vc/include/interface/vmcs_host/linux;=/opt/vc/include/interface/vcos/pthreads;=/usr/include/libxml2;../../src;../../src/osdep;../../src/threaddep;../../src/include;../../src/archivers;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>DEBUG=1;ARMV6T2;USE_ARMNEON;_REENTRANT;AMIBERRY;CPU_arm;ARMV6_ASSEMBLY;USE_SDL1;%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions>-march=armv8-a -mfpu=neon-fp-armv8 -mfloat-abi=hard %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <AdditionalLinkerInputs>;%(Link.AdditionalLinkerInputs)</AdditionalLinkerInputs>
+      <LibrarySearchDirectories>=/opt/vc/lib;%(Link.LibrarySearchDirectories)</LibrarySearchDirectories>
+      <AdditionalLibraryNames>bcm_host;vchiq_arm;vcos;lzma;freetype;ogg;m;SDL;pthread;z;png;rt;xml2;FLAC;mpg123;dl;mpeg2convert;mpeg2;SDL_image;SDL_ttf;guichan;guichan_sdl;%(Link.AdditionalLibraryNames)</AdditionalLibraryNames>
+      <LinkerScript />
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|VisualGDB'">
+    <ClCompile>
+      <CPPLanguageStandard>GNUPP14</CPPLanguageStandard>
+      <AdditionalIncludeDirectories>=/usr/include/SDL;=/opt/vc/include;=/opt/vc/include/interface/vmcs_host/linux;=/opt/vc/include/interface/vcos/pthreads;=/usr/include/libxml2;../../src;../../src/osdep;../../src/threaddep;../../src/include;../../src/archivers;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>NDEBUG=1;RELEASE=1;ARMV6T2;USE_ARMNEON;_REENTRANT;AMIBERRY;CPU_arm;ARMV6_ASSEMBLY;USE_SDL1;%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions>-march=armv8-a -mfpu=neon-fp-armv8 -mfloat-abi=hard %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <AdditionalLinkerInputs>;%(Link.AdditionalLinkerInputs)</AdditionalLinkerInputs>
+      <LibrarySearchDirectories>=/opt/vc/lib;%(Link.LibrarySearchDirectories)</LibrarySearchDirectories>
+      <AdditionalLibraryNames>bcm_host;vchiq_arm;vcos;lzma;freetype;ogg;m;SDL;pthread;z;png;rt;xml2;FLAC;mpg123;dl;mpeg2convert;mpeg2;SDL_image;SDL_ttf;guichan;guichan_sdl;%(Link.AdditionalLibraryNames)</AdditionalLibraryNames>
+      <LinkerScript />
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\src\archivers\7z\7z.h" />
+    <ClInclude Include="..\..\src\archivers\7z\7zAlloc.h" />
+    <ClInclude Include="..\..\src\archivers\7z\7zBuf.h" />
+    <ClInclude Include="..\..\src\archivers\7z\7zCrc.h" />
+    <ClInclude Include="..\..\src\archivers\7z\7zFile.h" />
+    <ClInclude Include="..\..\src\archivers\7z\7zVersion.h" />
+    <ClInclude Include="..\..\src\archivers\7z\Alloc.h" />
+    <ClInclude Include="..\..\src\archivers\7z\Bcj2.h" />
+    <ClInclude Include="..\..\src\archivers\7z\Bra.h" />
+    <ClInclude Include="..\..\src\archivers\7z\CpuArch.h" />
+    <ClInclude Include="..\..\src\archivers\7z\Delta.h" />
+    <ClInclude Include="..\..\src\archivers\7z\LzFind.h" />
+    <ClInclude Include="..\..\src\archivers\7z\LzHash.h" />
+    <ClInclude Include="..\..\src\archivers\7z\Lzma2Dec.h" />
+    <ClInclude Include="..\..\src\archivers\7z\Lzma86.h" />
+    <ClInclude Include="..\..\src\archivers\7z\LzmaDec.h" />
+    <ClInclude Include="..\..\src\archivers\7z\LzmaLib.h" />
+    <ClInclude Include="..\..\src\archivers\7z\RotateDefs.h" />
+    <ClInclude Include="..\..\src\archivers\7z\Sha256.h" />
+    <ClInclude Include="..\..\src\archivers\7z\Types.h" />
+    <ClInclude Include="..\..\src\archivers\7z\Xz.h" />
+    <ClInclude Include="..\..\src\archivers\7z\XzCrc64.h" />
+    <ClInclude Include="..\..\src\archivers\dms\cdata.h" />
+    <ClInclude Include="..\..\src\archivers\dms\crc_csum.h" />
+    <ClInclude Include="..\..\src\archivers\dms\getbits.h" />
+    <ClInclude Include="..\..\src\archivers\dms\maketbl.h" />
+    <ClInclude Include="..\..\src\archivers\dms\pfile.h" />
+    <ClInclude Include="..\..\src\archivers\dms\tables.h" />
+    <ClInclude Include="..\..\src\archivers\dms\u_deep.h" />
+    <ClInclude Include="..\..\src\archivers\dms\u_heavy.h" />
+    <ClInclude Include="..\..\src\archivers\dms\u_init.h" />
+    <ClInclude Include="..\..\src\archivers\dms\u_medium.h" />
+    <ClInclude Include="..\..\src\archivers\dms\u_quick.h" />
+    <ClInclude Include="..\..\src\archivers\dms\u_rle.h" />
+    <ClInclude Include="..\..\src\archivers\lha\lha.h" />
+    <ClInclude Include="..\..\src\archivers\lha\lha_macro.h" />
+    <ClInclude Include="..\..\src\archivers\mp2\kjmp2.h" />
+    <ClInclude Include="..\..\src\archivers\wrp\warp.h" />
+    <ClInclude Include="..\..\src\archivers\zip\unzip.h" />
+    <ClInclude Include="..\..\src\blit.h" />
+    <ClInclude Include="..\..\src\blitfunc.h" />
+    <ClInclude Include="..\..\src\cputbl.h" />
+    <ClInclude Include="..\..\src\include\akiko.h" />
+    <ClInclude Include="..\..\src\include\ar.h" />
+    <ClInclude Include="..\..\src\include\audio.h" />
+    <ClInclude Include="..\..\src\include\autoconf.h" />
+    <ClInclude Include="..\..\src\include\blit.h" />
+    <ClInclude Include="..\..\src\include\blitter.h" />
+    <ClInclude Include="..\..\src\include\blkdev.h" />
+    <ClInclude Include="..\..\src\include\bsdsocket.h" />
+    <ClInclude Include="..\..\src\include\calc.h" />
+    <ClInclude Include="..\..\src\include\cd32_fmv.h" />
+    <ClInclude Include="..\..\src\include\cia.h" />
+    <ClInclude Include="..\..\src\include\commpipe.h" />
+    <ClInclude Include="..\..\src\include\cpummu.h" />
+    <ClInclude Include="..\..\src\include\cpu_prefetch.h" />
+    <ClInclude Include="..\..\src\include\crc32.h" />
+    <ClInclude Include="..\..\src\include\custom.h" />
+    <ClInclude Include="..\..\src\include\devices.h" />
+    <ClInclude Include="..\..\src\include\disk.h" />
+    <ClInclude Include="..\..\src\include\diskutil.h" />
+    <ClInclude Include="..\..\src\include\drawing.h" />
+    <ClInclude Include="..\..\src\include\events.h" />
+    <ClInclude Include="..\..\src\include\execio.h" />
+    <ClInclude Include="..\..\src\include\execlib.h" />
+    <ClInclude Include="..\..\src\include\fdi2raw.h" />
+    <ClInclude Include="..\..\src\include\filesys.h" />
+    <ClInclude Include="..\..\src\include\flags_arm.h" />
+    <ClInclude Include="..\..\src\include\flashrom.h" />
+    <ClInclude Include="..\..\src\include\fpp.h" />
+    <ClInclude Include="..\..\src\include\fsdb.h" />
+    <ClInclude Include="..\..\src\include\fsusage.h" />
+    <ClInclude Include="..\..\src\include\gayle.h" />
+    <ClInclude Include="..\..\src\include\genblitter.h" />
+    <ClInclude Include="..\..\src\include\gensound.h" />
+    <ClInclude Include="..\..\src\include\gfxboard.h" />
+    <ClInclude Include="..\..\src\include\gui.h" />
+    <ClInclude Include="..\..\src\include\ide.h" />
+    <ClInclude Include="..\..\src\include\inputdevice.h" />
+    <ClInclude Include="..\..\src\include\keyboard.h" />
+    <ClInclude Include="..\..\src\include\keybuf.h" />
+    <ClInclude Include="..\..\src\include\mackbd.h" />
+    <ClInclude Include="..\..\src\include\memory.h" />
+    <ClInclude Include="..\..\src\include\mmu_common.h" />
+    <ClInclude Include="..\..\src\include\native2amiga.h" />
+    <ClInclude Include="..\..\src\include\native2amiga_api.h" />
+    <ClInclude Include="..\..\src\include\newcpu.h" />
+    <ClInclude Include="..\..\src\include\options.h" />
+    <ClInclude Include="..\..\src\include\readcpu.h" />
+    <ClInclude Include="..\..\src\include\rommgr.h" />
+    <ClInclude Include="..\..\src\include\rtc.h" />
+    <ClInclude Include="..\..\src\include\rtgmodes.h" />
+    <ClInclude Include="..\..\src\include\savestate.h" />
+    <ClInclude Include="..\..\src\include\scsi.h" />
+    <ClInclude Include="..\..\src\include\statusline.h" />
+    <ClInclude Include="..\..\src\include\sysdeps.h" />
+    <ClInclude Include="..\..\src\include\traps.h" />
+    <ClInclude Include="..\..\src\include\uae.h" />
+    <ClInclude Include="..\..\src\include\uaeresource.h" />
+    <ClInclude Include="..\..\src\include\uae\attributes.h" />
+    <ClInclude Include="..\..\src\include\uae\cdrom.h" />
+    <ClInclude Include="..\..\src\include\uae\io.h" />
+    <ClInclude Include="..\..\src\include\uae\likely.h" />
+    <ClInclude Include="..\..\src\include\uae\mman.h" />
+    <ClInclude Include="..\..\src\include\uae\string.h" />
+    <ClInclude Include="..\..\src\include\uae\types.h" />
+    <ClInclude Include="..\..\src\include\uae\vm.h" />
+    <ClInclude Include="..\..\src\include\xwin.h" />
+    <ClInclude Include="..\..\src\include\zarchive.h" />
+    <ClInclude Include="..\..\src\include\zfile.h" />
+    <ClInclude Include="..\..\src\jit\compemu.h" />
+    <ClInclude Include="..\..\src\jit\comptbl.h" />
+    <ClInclude Include="..\..\src\machdep\m68k.h" />
+    <ClInclude Include="..\..\src\machdep\maccess.h" />
+    <ClInclude Include="..\..\src\machdep\rpt.h" />
+    <ClInclude Include="..\..\src\osdep\amiberry_gfx.h" />
+    <ClInclude Include="..\..\src\osdep\amiberry_rp9.h" />
+    <ClInclude Include="..\..\src\osdep\cda_play.h" />
+    <ClInclude Include="..\..\src\osdep\config.h" />
+    <ClInclude Include="..\..\src\osdep\gui\gui_handling.h" />
+    <ClInclude Include="..\..\src\osdep\gui\sdltruetypefont.hpp" />
+    <ClInclude Include="..\..\src\osdep\gui\SelectorEntry.hpp" />
+    <ClInclude Include="..\..\src\osdep\gui\UaeCheckBox.hpp" />
+    <ClInclude Include="..\..\src\osdep\gui\UaeDropDown.hpp" />
+    <ClInclude Include="..\..\src\osdep\gui\UaeListBox.hpp" />
+    <ClInclude Include="..\..\src\osdep\gui\UaeRadioButton.hpp" />
+    <ClInclude Include="..\..\src\osdep\mp3decoder.h" />
+    <ClInclude Include="..\..\src\osdep\picasso96.h" />
+    <ClInclude Include="..\..\src\osdep\sysconfig.h" />
+    <ClInclude Include="..\..\src\osdep\target.h" />
+    <ClInclude Include="..\..\src\softfloat\softfloat-macros.h" />
+    <ClInclude Include="..\..\src\softfloat\softfloat-specialize.h" />
+    <ClInclude Include="..\..\src\softfloat\softfloat.h" />
+    <ClInclude Include="..\..\src\softfloat\softfloat_fpsp_tables.h" />
+    <ClInclude Include="..\..\src\sounddep\sound.h" />
+    <ClInclude Include="..\..\src\threaddep\thread.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\src\akiko.cpp" />
+    <ClCompile Include="..\..\src\ar.cpp" />
+    <ClCompile Include="..\..\src\archivers\7z\7zAlloc.cpp" />
+    <ClCompile Include="..\..\src\archivers\7z\7zBuf.cpp" />
+    <ClCompile Include="..\..\src\archivers\7z\7zBuf2.c" />
+    <ClCompile Include="..\..\src\archivers\7z\7zCrc.cpp" />
+    <ClCompile Include="..\..\src\archivers\7z\7zCrcOpt.cpp" />
+    <ClCompile Include="..\..\src\archivers\7z\7zDec.cpp" />
+    <ClCompile Include="..\..\src\archivers\7z\7zFile.c" />
+    <ClCompile Include="..\..\src\archivers\7z\7zIn.cpp" />
+    <ClCompile Include="..\..\src\archivers\7z\7zStream.cpp" />
+    <ClCompile Include="..\..\src\archivers\7z\Alloc.c" />
+    <ClCompile Include="..\..\src\archivers\7z\Bcj2.cpp" />
+    <ClCompile Include="..\..\src\archivers\7z\Bra.cpp" />
+    <ClCompile Include="..\..\src\archivers\7z\Bra86.cpp" />
+    <ClCompile Include="..\..\src\archivers\7z\BraIA64.c" />
+    <ClCompile Include="..\..\src\archivers\7z\CpuArch.c" />
+    <ClCompile Include="..\..\src\archivers\7z\Delta.c" />
+    <ClCompile Include="..\..\src\archivers\7z\LzFind.cpp" />
+    <ClCompile Include="..\..\src\archivers\7z\Lzma2Dec.cpp" />
+    <ClCompile Include="..\..\src\archivers\7z\Lzma86Dec.c" />
+    <ClCompile Include="..\..\src\archivers\7z\Lzma86Enc.c" />
+    <ClCompile Include="..\..\src\archivers\7z\LzmaDec.cpp" />
+    <ClCompile Include="..\..\src\archivers\7z\LzmaLib.c" />
+    <ClCompile Include="..\..\src\archivers\7z\Sha256.c" />
+    <ClCompile Include="..\..\src\archivers\7z\Xz.cpp" />
+    <ClCompile Include="..\..\src\archivers\7z\XzCrc64.c" />
+    <ClCompile Include="..\..\src\archivers\7z\XzDec.c" />
+    <ClCompile Include="..\..\src\archivers\7z\XzIn.c" />
+    <ClCompile Include="..\..\src\archivers\dms\crc_csum.cpp" />
+    <ClCompile Include="..\..\src\archivers\dms\getbits.cpp" />
+    <ClCompile Include="..\..\src\archivers\dms\maketbl.cpp" />
+    <ClCompile Include="..\..\src\archivers\dms\pfile.cpp" />
+    <ClCompile Include="..\..\src\archivers\dms\tables.cpp" />
+    <ClCompile Include="..\..\src\archivers\dms\u_deep.cpp" />
+    <ClCompile Include="..\..\src\archivers\dms\u_heavy.cpp" />
+    <ClCompile Include="..\..\src\archivers\dms\u_init.cpp" />
+    <ClCompile Include="..\..\src\archivers\dms\u_medium.cpp" />
+    <ClCompile Include="..\..\src\archivers\dms\u_quick.cpp" />
+    <ClCompile Include="..\..\src\archivers\dms\u_rle.cpp" />
+    <ClCompile Include="..\..\src\archivers\lha\crcio.cpp" />
+    <ClCompile Include="..\..\src\archivers\lha\dhuf.cpp" />
+    <ClCompile Include="..\..\src\archivers\lha\header.cpp" />
+    <ClCompile Include="..\..\src\archivers\lha\huf.cpp" />
+    <ClCompile Include="..\..\src\archivers\lha\larc.cpp" />
+    <ClCompile Include="..\..\src\archivers\lha\lhamaketbl.cpp" />
+    <ClCompile Include="..\..\src\archivers\lha\lharc.cpp" />
+    <ClCompile Include="..\..\src\archivers\lha\shuf.cpp" />
+    <ClCompile Include="..\..\src\archivers\lha\slide.cpp" />
+    <ClCompile Include="..\..\src\archivers\lha\uae_lha.cpp" />
+    <ClCompile Include="..\..\src\archivers\lha\util.cpp" />
+    <ClCompile Include="..\..\src\archivers\lzx\unlzx.cpp" />
+    <ClCompile Include="..\..\src\archivers\mp2\kjmp2.cpp" />
+    <ClCompile Include="..\..\src\archivers\wrp\warp.cpp" />
+    <ClCompile Include="..\..\src\archivers\zip\unzip.cpp" />
+    <ClCompile Include="..\..\src\aros.rom.cpp" />
+    <ClCompile Include="..\..\src\audio.cpp" />
+    <ClCompile Include="..\..\src\autoconf.cpp" />
+    <ClCompile Include="..\..\src\blitfunc.cpp" />
+    <ClCompile Include="..\..\src\blitops.cpp" />
+    <ClCompile Include="..\..\src\blittable.cpp" />
+    <ClCompile Include="..\..\src\blitter.cpp" />
+    <ClCompile Include="..\..\src\blkdev.cpp" />
+    <ClCompile Include="..\..\src\blkdev_cdimage.cpp" />
+    <ClCompile Include="..\..\src\bsdsocket.cpp" />
+    <ClCompile Include="..\..\src\calc.cpp" />
+    <ClCompile Include="..\..\src\cd32_fmv.cpp" />
+    <ClCompile Include="..\..\src\cd32_fmv_genlock.cpp" />
+    <ClCompile Include="..\..\src\cdrom.cpp" />
+    <ClCompile Include="..\..\src\cfgfile.cpp" />
+    <ClCompile Include="..\..\src\cia.cpp" />
+    <ClCompile Include="..\..\src\cpudefs.cpp" />
+    <ClCompile Include="..\..\src\cpuemu_0.cpp" />
+    <ClCompile Include="..\..\src\cpuemu_11.cpp" />
+    <ClCompile Include="..\..\src\cpuemu_4.cpp" />
+    <ClCompile Include="..\..\src\cpuemu_40.cpp" />
+    <ClCompile Include="..\..\src\cpuemu_44.cpp" />
+    <ClCompile Include="..\..\src\cpustbl.cpp" />
+    <ClCompile Include="..\..\src\crc32.cpp" />
+    <ClCompile Include="..\..\src\custom.cpp" />
+    <ClCompile Include="..\..\src\def_icons.cpp" />
+    <ClCompile Include="..\..\src\devices.cpp" />
+    <ClCompile Include="..\..\src\disk.cpp" />
+    <ClCompile Include="..\..\src\diskutil.cpp" />
+    <ClCompile Include="..\..\src\drawing.cpp" />
+    <ClCompile Include="..\..\src\events.cpp" />
+    <ClCompile Include="..\..\src\expansion.cpp" />
+    <ClCompile Include="..\..\src\fdi2raw.cpp" />
+    <ClCompile Include="..\..\src\filesys.cpp" />
+    <ClCompile Include="..\..\src\flashrom.cpp" />
+    <ClCompile Include="..\..\src\fpp.cpp" />
+    <ClCompile Include="..\..\src\fpp_native.cpp" />
+    <ClCompile Include="..\..\src\fpp_softfloat.cpp" />
+    <ClCompile Include="..\..\src\fsdb.cpp" />
+    <ClCompile Include="..\..\src\fsdb_unix.cpp" />
+    <ClCompile Include="..\..\src\fsusage.cpp" />
+    <ClCompile Include="..\..\src\gayle.cpp" />
+    <ClCompile Include="..\..\src\gfxboard.cpp" />
+    <ClCompile Include="..\..\src\gfxutil.cpp" />
+    <ClCompile Include="..\..\src\hardfile.cpp" />
+    <ClCompile Include="..\..\src\hrtmon.rom.cpp" />
+    <ClCompile Include="..\..\src\ide.cpp" />
+    <ClCompile Include="..\..\src\inputdevice.cpp" />
+    <ClCompile Include="..\..\src\jit\compemu.cpp" />
+    <ClCompile Include="..\..\src\jit\compemu_fpp.cpp" />
+    <ClCompile Include="..\..\src\jit\compemu_support.cpp" />
+    <ClCompile Include="..\..\src\jit\compstbl.cpp" />
+    <ClCompile Include="..\..\src\keybuf.cpp" />
+    <ClCompile Include="..\..\src\machdep\support.cpp" />
+    <ClCompile Include="..\..\src\main.cpp" />
+    <ClCompile Include="..\..\src\memory.cpp" />
+    <ClCompile Include="..\..\src\native2amiga.cpp" />
+    <ClCompile Include="..\..\src\newcpu.cpp" />
+    <ClCompile Include="..\..\src\newcpu_common.cpp" />
+    <ClCompile Include="..\..\src\osdep\amiberry.cpp" />
+    <ClCompile Include="..\..\src\osdep\amiberry_filesys.cpp" />
+    <ClCompile Include="..\..\src\osdep\amiberry_gfx.cpp" />
+    <ClCompile Include="..\..\src\osdep\amiberry_gui.cpp" />
+    <ClCompile Include="..\..\src\osdep\amiberry_hardfile.cpp" />
+    <ClCompile Include="..\..\src\osdep\amiberry_input.cpp" />
+    <ClCompile Include="..\..\src\osdep\amiberry_mem.cpp" />
+    <ClCompile Include="..\..\src\osdep\amiberry_rp9.cpp" />
+    <ClCompile Include="..\..\src\osdep\bsdsocket_host.cpp" />
+    <ClCompile Include="..\..\src\osdep\cda_play.cpp" />
+    <ClCompile Include="..\..\src\osdep\charset.cpp" />
+    <ClCompile Include="..\..\src\osdep\fsdb_host.cpp" />
+    <ClCompile Include="..\..\src\osdep\gui\CreateFilesysHardfile.cpp" />
+    <ClCompile Include="..\..\src\osdep\gui\EditFilesysHardfile.cpp" />
+    <ClCompile Include="..\..\src\osdep\gui\EditFilesysVirtual.cpp" />
+    <ClCompile Include="..\..\src\osdep\gui\InGameMessage.cpp" />
+    <ClCompile Include="..\..\src\osdep\gui\main_window.cpp" />
+    <ClCompile Include="..\..\src\osdep\gui\Navigation.cpp" />
+    <ClCompile Include="..\..\src\osdep\gui\PanelChipset.cpp" />
+    <ClCompile Include="..\..\src\osdep\gui\PanelConfig.cpp" />
+    <ClCompile Include="..\..\src\osdep\gui\PanelCPU.cpp" />
+    <ClCompile Include="..\..\src\osdep\gui\PanelCustom.cpp" />
+    <ClCompile Include="..\..\src\osdep\gui\PanelDisplay.cpp" />
+    <ClCompile Include="..\..\src\osdep\gui\PanelFloppy.cpp" />
+    <ClCompile Include="..\..\src\osdep\gui\PanelHD.cpp" />
+    <ClCompile Include="..\..\src\osdep\gui\PanelInput.cpp" />
+    <ClCompile Include="..\..\src\osdep\gui\PanelMisc.cpp" />
+    <ClCompile Include="..\..\src\osdep\gui\PanelPaths.cpp" />
+    <ClCompile Include="..\..\src\osdep\gui\PanelQuickstart.cpp" />
+    <ClCompile Include="..\..\src\osdep\gui\PanelRAM.cpp" />
+    <ClCompile Include="..\..\src\osdep\gui\PanelROM.cpp" />
+    <ClCompile Include="..\..\src\osdep\gui\PanelSavestate.cpp" />
+    <ClCompile Include="..\..\src\osdep\gui\PanelSound.cpp" />
+    <ClCompile Include="..\..\src\osdep\gui\sdltruetypefont.cpp" />
+    <ClCompile Include="..\..\src\osdep\gui\SelectFile.cpp" />
+    <ClCompile Include="..\..\src\osdep\gui\SelectFolder.cpp" />
+    <ClCompile Include="..\..\src\osdep\gui\SelectorEntry.cpp" />
+    <ClCompile Include="..\..\src\osdep\gui\ShowHelp.cpp" />
+    <ClCompile Include="..\..\src\osdep\gui\ShowMessage.cpp" />
+    <ClCompile Include="..\..\src\osdep\gui\UaeCheckBox.cpp" />
+    <ClCompile Include="..\..\src\osdep\gui\UaeDropDown.cpp" />
+    <ClCompile Include="..\..\src\osdep\gui\UaeListBox.cpp" />
+    <ClCompile Include="..\..\src\osdep\gui\UaeRadioButton.cpp" />
+    <ClCompile Include="..\..\src\osdep\keyboard.cpp" />
+    <ClCompile Include="..\..\src\osdep\mp3decoder.cpp" />
+    <ClCompile Include="..\..\src\osdep\neon_helper.s" />
+    <ClCompile Include="..\..\src\osdep\picasso96.cpp" />
+    <ClCompile Include="..\..\src\osdep\sigsegv_handler.cpp" />
+    <ClCompile Include="..\..\src\osdep\writelog.cpp" />
+    <ClCompile Include="..\..\src\readcpu.cpp" />
+    <ClCompile Include="..\..\src\rommgr.cpp" />
+    <ClCompile Include="..\..\src\rtc.cpp" />
+    <ClCompile Include="..\..\src\savestate.cpp" />
+    <ClCompile Include="..\..\src\scsi.cpp" />
+    <ClCompile Include="..\..\src\softfloat\softfloat.cpp" />
+    <ClCompile Include="..\..\src\softfloat\softfloat_decimal.cpp" />
+    <ClCompile Include="..\..\src\softfloat\softfloat_fpsp.cpp" />
+    <ClCompile Include="..\..\src\sounddep\sound.cpp" />
+    <ClCompile Include="..\..\src\statusline.cpp" />
+    <ClCompile Include="..\..\src\traps.cpp" />
+    <ClCompile Include="..\..\src\uaelib.cpp" />
+    <ClCompile Include="..\..\src\uaeresource.cpp" />
+    <ClCompile Include="..\..\src\zfile.cpp" />
+    <ClCompile Include="..\..\src\zfile_archive.cpp" />
+    <None Include="..\..\src\filesys.asm" />
+    <None Include="..\..\src\inputevents.def" />
+    <None Include="Amiberry-sdl1-Debug.vgdbsettings" />
+    <None Include="Amiberry-sdl1-Release.vgdbsettings" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/VisualGDB/Amiberry-sdl1/Amiberry-sdl1.vcxproj.filters b/VisualGDB/Amiberry-sdl1/Amiberry-sdl1.vcxproj.filters
new file mode 100644
index 00000000..26643e14
--- /dev/null
+++ b/VisualGDB/Amiberry-sdl1/Amiberry-sdl1.vcxproj.filters
@@ -0,0 +1,1029 @@
+<?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>{5ed0e8c6-c2c5-4a2f-9b3a-c9f75eeaa77e}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Resource files">
+      <UniqueIdentifier>{cd65eaef-b2a2-456f-95d3-c9cdcf15ecaf}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+    </Filter>
+    <Filter Include="VisualGDB settings">
+      <UniqueIdentifier>{20858d91-f3aa-4f78-bdac-7d891bc8beca}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source files\archivers">
+      <UniqueIdentifier>{c4c649d2-4139-4a0d-a46d-9e31211fd34f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source files\archivers\7z">
+      <UniqueIdentifier>{cf017174-b3ae-45de-b57d-214f58a9f1f3}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source files\archivers\dms">
+      <UniqueIdentifier>{1a7e4d84-1160-4c8e-8f6b-d8ddd68664c8}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source files\archivers\lha">
+      <UniqueIdentifier>{1b087bac-82e2-47b2-b306-e5813265bb2f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source files\archivers\lzx">
+      <UniqueIdentifier>{11d8896a-53ff-4b79-9f85-7fd03414d18c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source files\archivers\mp2">
+      <UniqueIdentifier>{9e3c6b22-1f2d-44dc-a221-72c108165fda}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source files\archivers\wrp">
+      <UniqueIdentifier>{d188f477-8bf7-4d8a-8ba1-96258e40ef25}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source files\archivers\zip">
+      <UniqueIdentifier>{6f6e9044-6e8f-4134-ab75-349568b7d249}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source files\include">
+      <UniqueIdentifier>{eb0727c6-2ef1-4ad7-9464-78fcf926a7e8}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source files\include\uae">
+      <UniqueIdentifier>{5276d135-cc07-483c-9cec-5c9bb4fafe3f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source files\jit">
+      <UniqueIdentifier>{e2a597d0-98eb-44fe-a483-e050e9a2da62}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source files\machdep">
+      <UniqueIdentifier>{bfd98587-a798-42ee-b7cb-1b5582bdad1f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source files\osdep">
+      <UniqueIdentifier>{c84351ee-1907-480f-96e6-c08324cd4ad1}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source files\osdep\gui">
+      <UniqueIdentifier>{d946fd2c-30b2-45d3-9999-ccc3749160b7}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source files\softfloat">
+      <UniqueIdentifier>{628a02d1-51f3-4021-81e5-6103ddf96904}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source files\sounddep">
+      <UniqueIdentifier>{49dfa14b-d5bf-4aa3-a660-12f97ae62bdb}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source files\threaddep">
+      <UniqueIdentifier>{16614409-437c-450b-a649-1a7fadd04898}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Amiberry-sdl1-Debug.vgdbsettings">
+      <Filter>VisualGDB settings</Filter>
+    </None>
+    <None Include="Amiberry-sdl1-Release.vgdbsettings">
+      <Filter>VisualGDB settings</Filter>
+    </None>
+    <ClCompile Include="..\..\src\akiko.cpp">
+      <Filter>Source files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\ar.cpp">
+      <Filter>Source files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\aros.rom.cpp">
+      <Filter>Source files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\audio.cpp">
+      <Filter>Source files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\autoconf.cpp">
+      <Filter>Source files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\blitfunc.cpp">
+      <Filter>Source files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\blitops.cpp">
+      <Filter>Source files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\blittable.cpp">
+      <Filter>Source files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\blitter.cpp">
+      <Filter>Source files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\blkdev.cpp">
+      <Filter>Source files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\blkdev_cdimage.cpp">
+      <Filter>Source files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\bsdsocket.cpp">
+      <Filter>Source files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\calc.cpp">
+      <Filter>Source files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\cd32_fmv.cpp">
+      <Filter>Source files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\cd32_fmv_genlock.cpp">
+      <Filter>Source files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\cdrom.cpp">
+      <Filter>Source files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\cfgfile.cpp">
+      <Filter>Source files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\cia.cpp">
+      <Filter>Source files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\cpudefs.cpp">
+      <Filter>Source files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\cpuemu_0.cpp">
+      <Filter>Source files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\cpuemu_4.cpp">
+      <Filter>Source files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\cpuemu_11.cpp">
+      <Filter>Source files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\cpuemu_40.cpp">
+      <Filter>Source files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\cpuemu_44.cpp">
+      <Filter>Source files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\cpustbl.cpp">
+      <Filter>Source files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\crc32.cpp">
+      <Filter>Source files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\custom.cpp">
+      <Filter>Source files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\def_icons.cpp">
+      <Filter>Source files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\devices.cpp">
+      <Filter>Source files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\disk.cpp">
+      <Filter>Source files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\diskutil.cpp">
+      <Filter>Source files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\drawing.cpp">
+      <Filter>Source files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\events.cpp">
+      <Filter>Source files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\expansion.cpp">
+      <Filter>Source files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\fdi2raw.cpp">
+      <Filter>Source files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filesys.cpp">
+      <Filter>Source files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\flashrom.cpp">
+      <Filter>Source files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\fpp.cpp">
+      <Filter>Source files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\fpp_native.cpp">
+      <Filter>Source files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\fpp_softfloat.cpp">
+      <Filter>Source files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\fsdb.cpp">
+      <Filter>Source files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\fsdb_unix.cpp">
+      <Filter>Source files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\fsusage.cpp">
+      <Filter>Source files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\gayle.cpp">
+      <Filter>Source files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\gfxboard.cpp">
+      <Filter>Source files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\gfxutil.cpp">
+      <Filter>Source files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\hardfile.cpp">
+      <Filter>Source files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\hrtmon.rom.cpp">
+      <Filter>Source files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\ide.cpp">
+      <Filter>Source files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\inputdevice.cpp">
+      <Filter>Source files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\keybuf.cpp">
+      <Filter>Source files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\main.cpp">
+      <Filter>Source files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\memory.cpp">
+      <Filter>Source files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\native2amiga.cpp">
+      <Filter>Source files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\newcpu.cpp">
+      <Filter>Source files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\newcpu_common.cpp">
+      <Filter>Source files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\readcpu.cpp">
+      <Filter>Source files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\rommgr.cpp">
+      <Filter>Source files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\rtc.cpp">
+      <Filter>Source files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\savestate.cpp">
+      <Filter>Source files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\scsi.cpp">
+      <Filter>Source files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\statusline.cpp">
+      <Filter>Source files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\traps.cpp">
+      <Filter>Source files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\uaelib.cpp">
+      <Filter>Source files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\uaeresource.cpp">
+      <Filter>Source files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\zfile.cpp">
+      <Filter>Source files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\zfile_archive.cpp">
+      <Filter>Source files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\src\blit.h">
+      <Filter>Source files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\blitfunc.h">
+      <Filter>Source files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\cputbl.h">
+      <Filter>Source files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\archivers\7z\7z.h">
+      <Filter>Source files\archivers\7z</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\archivers\7z\7zAlloc.h">
+      <Filter>Source files\archivers\7z</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\archivers\7z\7zBuf.h">
+      <Filter>Source files\archivers\7z</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\archivers\7z\7zCrc.h">
+      <Filter>Source files\archivers\7z</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\archivers\7z\7zFile.h">
+      <Filter>Source files\archivers\7z</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\archivers\7z\7zVersion.h">
+      <Filter>Source files\archivers\7z</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\archivers\7z\Alloc.h">
+      <Filter>Source files\archivers\7z</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\archivers\7z\Bcj2.h">
+      <Filter>Source files\archivers\7z</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\archivers\7z\Bra.h">
+      <Filter>Source files\archivers\7z</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\archivers\7z\Delta.h">
+      <Filter>Source files\archivers\7z</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\archivers\7z\LzFind.h">
+      <Filter>Source files\archivers\7z</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\archivers\7z\LzHash.h">
+      <Filter>Source files\archivers\7z</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\archivers\7z\Lzma2Dec.h">
+      <Filter>Source files\archivers\7z</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\archivers\7z\Lzma86.h">
+      <Filter>Source files\archivers\7z</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\archivers\7z\LzmaDec.h">
+      <Filter>Source files\archivers\7z</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\archivers\7z\LzmaLib.h">
+      <Filter>Source files\archivers\7z</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\archivers\7z\RotateDefs.h">
+      <Filter>Source files\archivers\7z</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\archivers\7z\Sha256.h">
+      <Filter>Source files\archivers\7z</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\archivers\7z\Types.h">
+      <Filter>Source files\archivers\7z</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\archivers\7z\Xz.h">
+      <Filter>Source files\archivers\7z</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\archivers\7z\XzCrc64.h">
+      <Filter>Source files\archivers\7z</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\archivers\dms\cdata.h">
+      <Filter>Source files\archivers\dms</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\archivers\dms\crc_csum.h">
+      <Filter>Source files\archivers\dms</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\archivers\dms\getbits.h">
+      <Filter>Source files\archivers\dms</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\archivers\dms\maketbl.h">
+      <Filter>Source files\archivers\dms</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\archivers\dms\pfile.h">
+      <Filter>Source files\archivers\dms</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\archivers\dms\tables.h">
+      <Filter>Source files\archivers\dms</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\archivers\dms\u_deep.h">
+      <Filter>Source files\archivers\dms</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\archivers\dms\u_heavy.h">
+      <Filter>Source files\archivers\dms</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\archivers\dms\u_init.h">
+      <Filter>Source files\archivers\dms</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\archivers\dms\u_medium.h">
+      <Filter>Source files\archivers\dms</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\archivers\dms\u_quick.h">
+      <Filter>Source files\archivers\dms</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\archivers\dms\u_rle.h">
+      <Filter>Source files\archivers\dms</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\archivers\lha\lha.h">
+      <Filter>Source files\archivers\lha</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\archivers\lha\lha_macro.h">
+      <Filter>Source files\archivers\lha</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\archivers\mp2\kjmp2.h">
+      <Filter>Source files\archivers\mp2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\archivers\wrp\warp.h">
+      <Filter>Source files\archivers\wrp</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\archivers\zip\unzip.h">
+      <Filter>Source files\archivers\zip</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\include\akiko.h">
+      <Filter>Source files\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\include\ar.h">
+      <Filter>Source files\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\include\audio.h">
+      <Filter>Source files\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\include\autoconf.h">
+      <Filter>Source files\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\include\blit.h">
+      <Filter>Source files\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\include\blitter.h">
+      <Filter>Source files\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\include\blkdev.h">
+      <Filter>Source files\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\include\bsdsocket.h">
+      <Filter>Source files\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\include\calc.h">
+      <Filter>Source files\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\include\cd32_fmv.h">
+      <Filter>Source files\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\include\cia.h">
+      <Filter>Source files\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\include\commpipe.h">
+      <Filter>Source files\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\include\cpu_prefetch.h">
+      <Filter>Source files\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\include\cpummu.h">
+      <Filter>Source files\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\include\crc32.h">
+      <Filter>Source files\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\include\custom.h">
+      <Filter>Source files\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\include\devices.h">
+      <Filter>Source files\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\include\disk.h">
+      <Filter>Source files\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\include\diskutil.h">
+      <Filter>Source files\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\include\drawing.h">
+      <Filter>Source files\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\include\events.h">
+      <Filter>Source files\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\include\execio.h">
+      <Filter>Source files\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\include\execlib.h">
+      <Filter>Source files\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\include\fdi2raw.h">
+      <Filter>Source files\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\include\filesys.h">
+      <Filter>Source files\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\include\flags_arm.h">
+      <Filter>Source files\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\include\flashrom.h">
+      <Filter>Source files\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\include\fpp.h">
+      <Filter>Source files\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\include\fsdb.h">
+      <Filter>Source files\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\include\fsusage.h">
+      <Filter>Source files\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\include\gayle.h">
+      <Filter>Source files\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\include\genblitter.h">
+      <Filter>Source files\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\include\gensound.h">
+      <Filter>Source files\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\include\gfxboard.h">
+      <Filter>Source files\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\include\gui.h">
+      <Filter>Source files\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\include\ide.h">
+      <Filter>Source files\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\include\inputdevice.h">
+      <Filter>Source files\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\include\keyboard.h">
+      <Filter>Source files\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\include\keybuf.h">
+      <Filter>Source files\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\include\mackbd.h">
+      <Filter>Source files\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\include\memory.h">
+      <Filter>Source files\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\include\mmu_common.h">
+      <Filter>Source files\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\include\native2amiga.h">
+      <Filter>Source files\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\include\native2amiga_api.h">
+      <Filter>Source files\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\include\newcpu.h">
+      <Filter>Source files\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\include\options.h">
+      <Filter>Source files\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\include\readcpu.h">
+      <Filter>Source files\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\include\rommgr.h">
+      <Filter>Source files\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\include\rtc.h">
+      <Filter>Source files\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\include\rtgmodes.h">
+      <Filter>Source files\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\include\savestate.h">
+      <Filter>Source files\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\include\scsi.h">
+      <Filter>Source files\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\include\statusline.h">
+      <Filter>Source files\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\include\sysdeps.h">
+      <Filter>Source files\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\include\traps.h">
+      <Filter>Source files\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\include\uae.h">
+      <Filter>Source files\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\include\uaeresource.h">
+      <Filter>Source files\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\include\xwin.h">
+      <Filter>Source files\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\include\zarchive.h">
+      <Filter>Source files\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\include\zfile.h">
+      <Filter>Source files\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\include\uae\attributes.h">
+      <Filter>Source files\include\uae</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\include\uae\cdrom.h">
+      <Filter>Source files\include\uae</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\include\uae\io.h">
+      <Filter>Source files\include\uae</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\include\uae\likely.h">
+      <Filter>Source files\include\uae</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\include\uae\mman.h">
+      <Filter>Source files\include\uae</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\include\uae\string.h">
+      <Filter>Source files\include\uae</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\include\uae\types.h">
+      <Filter>Source files\include\uae</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\include\uae\vm.h">
+      <Filter>Source files\include\uae</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\jit\compemu.h">
+      <Filter>Source files\jit</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\jit\comptbl.h">
+      <Filter>Source files\jit</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\machdep\m68k.h">
+      <Filter>Source files\machdep</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\machdep\maccess.h">
+      <Filter>Source files\machdep</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\machdep\rpt.h">
+      <Filter>Source files\machdep</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\osdep\amiberry_gfx.h">
+      <Filter>Source files\osdep</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\osdep\amiberry_rp9.h">
+      <Filter>Source files\osdep</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\osdep\cda_play.h">
+      <Filter>Source files\osdep</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\osdep\config.h">
+      <Filter>Source files\osdep</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\osdep\mp3decoder.h">
+      <Filter>Source files\osdep</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\osdep\picasso96.h">
+      <Filter>Source files\osdep</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\osdep\sysconfig.h">
+      <Filter>Source files\osdep</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\osdep\target.h">
+      <Filter>Source files\osdep</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\osdep\gui\gui_handling.h">
+      <Filter>Source files\osdep\gui</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\osdep\gui\sdltruetypefont.hpp">
+      <Filter>Source files\osdep\gui</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\osdep\gui\SelectorEntry.hpp">
+      <Filter>Source files\osdep\gui</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\osdep\gui\UaeCheckBox.hpp">
+      <Filter>Source files\osdep\gui</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\osdep\gui\UaeDropDown.hpp">
+      <Filter>Source files\osdep\gui</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\osdep\gui\UaeListBox.hpp">
+      <Filter>Source files\osdep\gui</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\osdep\gui\UaeRadioButton.hpp">
+      <Filter>Source files\osdep\gui</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\softfloat\softfloat.h">
+      <Filter>Source files\softfloat</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\softfloat\softfloat_fpsp_tables.h">
+      <Filter>Source files\softfloat</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\softfloat\softfloat-macros.h">
+      <Filter>Source files\softfloat</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\softfloat\softfloat-specialize.h">
+      <Filter>Source files\softfloat</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\sounddep\sound.h">
+      <Filter>Source files\sounddep</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\threaddep\thread.h">
+      <Filter>Source files\threaddep</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\archivers\7z\CpuArch.h">
+      <Filter>Source files\archivers\7z</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\src\filesys.asm">
+      <Filter>Source files</Filter>
+    </None>
+    <None Include="..\..\src\inputevents.def">
+      <Filter>Source files</Filter>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\src\archivers\7z\7zAlloc.cpp">
+      <Filter>Source files\archivers\7z</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\archivers\7z\7zBuf.cpp">
+      <Filter>Source files\archivers\7z</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\archivers\7z\7zBuf2.c">
+      <Filter>Source files\archivers\7z</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\archivers\7z\7zCrc.cpp">
+      <Filter>Source files\archivers\7z</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\archivers\7z\7zCrcOpt.cpp">
+      <Filter>Source files\archivers\7z</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\archivers\7z\7zDec.cpp">
+      <Filter>Source files\archivers\7z</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\archivers\7z\7zFile.c">
+      <Filter>Source files\archivers\7z</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\archivers\7z\7zIn.cpp">
+      <Filter>Source files\archivers\7z</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\archivers\7z\7zStream.cpp">
+      <Filter>Source files\archivers\7z</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\archivers\7z\Alloc.c">
+      <Filter>Source files\archivers\7z</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\archivers\7z\Bcj2.cpp">
+      <Filter>Source files\archivers\7z</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\archivers\7z\Bra.cpp">
+      <Filter>Source files\archivers\7z</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\archivers\7z\Bra86.cpp">
+      <Filter>Source files\archivers\7z</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\archivers\7z\BraIA64.c">
+      <Filter>Source files\archivers\7z</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\archivers\7z\Delta.c">
+      <Filter>Source files\archivers\7z</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\archivers\7z\LzFind.cpp">
+      <Filter>Source files\archivers\7z</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\archivers\7z\Lzma2Dec.cpp">
+      <Filter>Source files\archivers\7z</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\archivers\7z\Lzma86Dec.c">
+      <Filter>Source files\archivers\7z</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\archivers\7z\Lzma86Enc.c">
+      <Filter>Source files\archivers\7z</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\archivers\7z\LzmaDec.cpp">
+      <Filter>Source files\archivers\7z</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\archivers\7z\LzmaLib.c">
+      <Filter>Source files\archivers\7z</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\archivers\7z\Sha256.c">
+      <Filter>Source files\archivers\7z</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\archivers\7z\Xz.cpp">
+      <Filter>Source files\archivers\7z</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\archivers\7z\XzCrc64.c">
+      <Filter>Source files\archivers\7z</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\archivers\7z\XzDec.c">
+      <Filter>Source files\archivers\7z</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\archivers\7z\XzIn.c">
+      <Filter>Source files\archivers\7z</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\archivers\dms\crc_csum.cpp">
+      <Filter>Source files\archivers\dms</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\archivers\dms\getbits.cpp">
+      <Filter>Source files\archivers\dms</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\archivers\dms\maketbl.cpp">
+      <Filter>Source files\archivers\dms</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\archivers\dms\pfile.cpp">
+      <Filter>Source files\archivers\dms</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\archivers\dms\tables.cpp">
+      <Filter>Source files\archivers\dms</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\archivers\dms\u_deep.cpp">
+      <Filter>Source files\archivers\dms</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\archivers\dms\u_heavy.cpp">
+      <Filter>Source files\archivers\dms</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\archivers\dms\u_init.cpp">
+      <Filter>Source files\archivers\dms</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\archivers\dms\u_medium.cpp">
+      <Filter>Source files\archivers\dms</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\archivers\dms\u_quick.cpp">
+      <Filter>Source files\archivers\dms</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\archivers\dms\u_rle.cpp">
+      <Filter>Source files\archivers\dms</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\archivers\lha\crcio.cpp">
+      <Filter>Source files\archivers\lha</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\archivers\lha\dhuf.cpp">
+      <Filter>Source files\archivers\lha</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\archivers\lha\header.cpp">
+      <Filter>Source files\archivers\lha</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\archivers\lha\huf.cpp">
+      <Filter>Source files\archivers\lha</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\archivers\lha\larc.cpp">
+      <Filter>Source files\archivers\lha</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\archivers\lha\lhamaketbl.cpp">
+      <Filter>Source files\archivers\lha</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\archivers\lha\lharc.cpp">
+      <Filter>Source files\archivers\lha</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\archivers\lha\shuf.cpp">
+      <Filter>Source files\archivers\lha</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\archivers\lha\slide.cpp">
+      <Filter>Source files\archivers\lha</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\archivers\lha\uae_lha.cpp">
+      <Filter>Source files\archivers\lha</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\archivers\lha\util.cpp">
+      <Filter>Source files\archivers\lha</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\archivers\lzx\unlzx.cpp">
+      <Filter>Source files\archivers\lzx</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\archivers\mp2\kjmp2.cpp">
+      <Filter>Source files\archivers\mp2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\archivers\wrp\warp.cpp">
+      <Filter>Source files\archivers\wrp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\archivers\zip\unzip.cpp">
+      <Filter>Source files\archivers\zip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\jit\compemu.cpp">
+      <Filter>Source files\jit</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\jit\compemu_fpp.cpp">
+      <Filter>Source files\jit</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\jit\compemu_support.cpp">
+      <Filter>Source files\jit</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\jit\compstbl.cpp">
+      <Filter>Source files\jit</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\machdep\support.cpp">
+      <Filter>Source files\machdep</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\osdep\amiberry.cpp">
+      <Filter>Source files\osdep</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\osdep\amiberry_filesys.cpp">
+      <Filter>Source files\osdep</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\osdep\amiberry_gfx.cpp">
+      <Filter>Source files\osdep</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\osdep\amiberry_gui.cpp">
+      <Filter>Source files\osdep</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\osdep\amiberry_hardfile.cpp">
+      <Filter>Source files\osdep</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\osdep\amiberry_input.cpp">
+      <Filter>Source files\osdep</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\osdep\amiberry_mem.cpp">
+      <Filter>Source files\osdep</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\osdep\amiberry_rp9.cpp">
+      <Filter>Source files\osdep</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\osdep\bsdsocket_host.cpp">
+      <Filter>Source files\osdep</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\osdep\cda_play.cpp">
+      <Filter>Source files\osdep</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\osdep\charset.cpp">
+      <Filter>Source files\osdep</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\osdep\fsdb_host.cpp">
+      <Filter>Source files\osdep</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\osdep\keyboard.cpp">
+      <Filter>Source files\osdep</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\osdep\mp3decoder.cpp">
+      <Filter>Source files\osdep</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\osdep\neon_helper.s">
+      <Filter>Source files\osdep</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\osdep\picasso96.cpp">
+      <Filter>Source files\osdep</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\osdep\sigsegv_handler.cpp">
+      <Filter>Source files\osdep</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\osdep\writelog.cpp">
+      <Filter>Source files\osdep</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\osdep\gui\CreateFilesysHardfile.cpp">
+      <Filter>Source files\osdep\gui</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\osdep\gui\EditFilesysHardfile.cpp">
+      <Filter>Source files\osdep\gui</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\osdep\gui\EditFilesysVirtual.cpp">
+      <Filter>Source files\osdep\gui</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\osdep\gui\InGameMessage.cpp">
+      <Filter>Source files\osdep\gui</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\osdep\gui\main_window.cpp">
+      <Filter>Source files\osdep\gui</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\osdep\gui\Navigation.cpp">
+      <Filter>Source files\osdep\gui</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\osdep\gui\PanelChipset.cpp">
+      <Filter>Source files\osdep\gui</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\osdep\gui\PanelConfig.cpp">
+      <Filter>Source files\osdep\gui</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\osdep\gui\PanelCPU.cpp">
+      <Filter>Source files\osdep\gui</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\osdep\gui\PanelCustom.cpp">
+      <Filter>Source files\osdep\gui</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\osdep\gui\PanelDisplay.cpp">
+      <Filter>Source files\osdep\gui</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\osdep\gui\PanelFloppy.cpp">
+      <Filter>Source files\osdep\gui</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\osdep\gui\PanelHD.cpp">
+      <Filter>Source files\osdep\gui</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\osdep\gui\PanelInput.cpp">
+      <Filter>Source files\osdep\gui</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\osdep\gui\PanelMisc.cpp">
+      <Filter>Source files\osdep\gui</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\osdep\gui\PanelPaths.cpp">
+      <Filter>Source files\osdep\gui</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\osdep\gui\PanelQuickstart.cpp">
+      <Filter>Source files\osdep\gui</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\osdep\gui\PanelRAM.cpp">
+      <Filter>Source files\osdep\gui</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\osdep\gui\PanelROM.cpp">
+      <Filter>Source files\osdep\gui</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\osdep\gui\PanelSavestate.cpp">
+      <Filter>Source files\osdep\gui</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\osdep\gui\PanelSound.cpp">
+      <Filter>Source files\osdep\gui</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\osdep\gui\sdltruetypefont.cpp">
+      <Filter>Source files\osdep\gui</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\osdep\gui\SelectFile.cpp">
+      <Filter>Source files\osdep\gui</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\osdep\gui\SelectFolder.cpp">
+      <Filter>Source files\osdep\gui</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\osdep\gui\SelectorEntry.cpp">
+      <Filter>Source files\osdep\gui</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\osdep\gui\ShowHelp.cpp">
+      <Filter>Source files\osdep\gui</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\osdep\gui\ShowMessage.cpp">
+      <Filter>Source files\osdep\gui</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\osdep\gui\UaeCheckBox.cpp">
+      <Filter>Source files\osdep\gui</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\osdep\gui\UaeDropDown.cpp">
+      <Filter>Source files\osdep\gui</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\osdep\gui\UaeListBox.cpp">
+      <Filter>Source files\osdep\gui</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\osdep\gui\UaeRadioButton.cpp">
+      <Filter>Source files\osdep\gui</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\softfloat\softfloat.cpp">
+      <Filter>Source files\softfloat</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\softfloat\softfloat_decimal.cpp">
+      <Filter>Source files\softfloat</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\softfloat\softfloat_fpsp.cpp">
+      <Filter>Source files\softfloat</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\sounddep\sound.cpp">
+      <Filter>Source files\sounddep</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\archivers\7z\CpuArch.c">
+      <Filter>Source files\archivers\7z</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/VisualGDB/Amiberry/Amiberry.sln b/VisualGDB/Amiberry/Amiberry.sln
index 319df981..0c658228 100644
--- a/VisualGDB/Amiberry/Amiberry.sln
+++ b/VisualGDB/Amiberry/Amiberry.sln
@@ -10,25 +10,26 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Amiberry", "Amiberry.vcxpro
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "guisan", "..\guisan\guisan.vcxproj", "{E613050D-EE8C-4ED1-936D-EB9E0E155EA6}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Amiberry-sdl1", "..\Amiberry-sdl1\Amiberry-sdl1.vcxproj", "{14635D01-67B8-4863-9507-3FA5C8FB4B32}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|VisualGDB = Debug|VisualGDB
-		Debug-sdl1|VisualGDB = Debug-sdl1|VisualGDB
 		Release|VisualGDB = Release|VisualGDB
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{FDC6BF55-C4BC-44FB-85A9-3369784716E8}.Debug|VisualGDB.ActiveCfg = Debug|VisualGDB
 		{FDC6BF55-C4BC-44FB-85A9-3369784716E8}.Debug|VisualGDB.Build.0 = Debug|VisualGDB
-		{FDC6BF55-C4BC-44FB-85A9-3369784716E8}.Debug-sdl1|VisualGDB.ActiveCfg = Debug-sdl1|VisualGDB
-		{FDC6BF55-C4BC-44FB-85A9-3369784716E8}.Debug-sdl1|VisualGDB.Build.0 = Debug-sdl1|VisualGDB
 		{FDC6BF55-C4BC-44FB-85A9-3369784716E8}.Release|VisualGDB.ActiveCfg = Release|VisualGDB
 		{FDC6BF55-C4BC-44FB-85A9-3369784716E8}.Release|VisualGDB.Build.0 = Release|VisualGDB
 		{E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Debug|VisualGDB.ActiveCfg = Debug|VisualGDB
 		{E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Debug|VisualGDB.Build.0 = Debug|VisualGDB
-		{E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Debug-sdl1|VisualGDB.ActiveCfg = Debug|VisualGDB
-		{E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Debug-sdl1|VisualGDB.Build.0 = Debug|VisualGDB
 		{E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Release|VisualGDB.ActiveCfg = Release|VisualGDB
 		{E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Release|VisualGDB.Build.0 = Release|VisualGDB
+		{14635D01-67B8-4863-9507-3FA5C8FB4B32}.Debug|VisualGDB.ActiveCfg = Debug|VisualGDB
+		{14635D01-67B8-4863-9507-3FA5C8FB4B32}.Debug|VisualGDB.Build.0 = Debug|VisualGDB
+		{14635D01-67B8-4863-9507-3FA5C8FB4B32}.Release|VisualGDB.ActiveCfg = Release|VisualGDB
+		{14635D01-67B8-4863-9507-3FA5C8FB4B32}.Release|VisualGDB.Build.0 = Release|VisualGDB
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/VisualGDB/Amiberry/Amiberry.vcxproj b/VisualGDB/Amiberry/Amiberry.vcxproj
index dea9a5ed..20db1c8b 100644
--- a/VisualGDB/Amiberry/Amiberry.vcxproj
+++ b/VisualGDB/Amiberry/Amiberry.vcxproj
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug-sdl1|VisualGDB">
-      <Configuration>Debug-sdl1</Configuration>
-      <Platform>VisualGDB</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|VisualGDB">
       <Configuration>Debug</Configuration>
       <Platform>VisualGDB</Platform>
@@ -21,7 +17,6 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|VisualGDB'">
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-sdl1|VisualGDB'" Label="Configuration" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|VisualGDB'">
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -36,12 +31,6 @@
     <ToolchainVersion>6.3.0/7.12/r1</ToolchainVersion>
     <TargetName>$(ProjectName)-sdl2</TargetName>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-sdl1|VisualGDB'">
-    <GNUConfigurationType>Debug</GNUConfigurationType>
-    <ToolchainID>com.visualgdb.raspberry_pi</ToolchainID>
-    <ToolchainVersion>6.3.0/7.12/r1</ToolchainVersion>
-    <TargetName>$(ProjectName)-sdl2</TargetName>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|VisualGDB'">
     <ToolchainID>com.visualgdb.raspberry_pi</ToolchainID>
     <ToolchainVersion>6.3.0/7.12/r1</ToolchainVersion>
@@ -61,21 +50,6 @@
       <LinkerScript />
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-sdl1|VisualGDB'">
-    <ClCompile>
-      <CPPLanguageStandard>GNUPP14</CPPLanguageStandard>
-      <AdditionalIncludeDirectories>=/usr/include/SDL;=/opt/vc/include;=/opt/vc/include/interface/vmcs_host/linux;=/opt/vc/include/interface/vcos/pthreads;=/usr/include/libxml2;../../src;../../src/osdep;../../src/threaddep;../../src/include;../../src/archivers;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>DEBUG=1;ARMV6T2;USE_ARMNEON;_REENTRANT;AMIBERRY;CPU_arm;ARMV6_ASSEMBLY;USE_SDL1;%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions>-march=armv8-a -mfpu=neon-fp-armv8 -mfloat-abi=hard %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <Link>
-      <AdditionalLinkerInputs>;%(Link.AdditionalLinkerInputs)</AdditionalLinkerInputs>
-      <LibrarySearchDirectories>=/opt/vc/lib;%(Link.LibrarySearchDirectories)</LibrarySearchDirectories>
-      <AdditionalLibraryNames>bcm_host;vchiq_arm;vcos;lzma;freetype;ogg;m;SDL;pthread;z;png;rt;xml2;FLAC;mpg123;dl;mpeg2convert;mpeg2;SDL_image;SDL_ttf;guichan;guichan_sdl;%(Link.AdditionalLibraryNames)</AdditionalLibraryNames>
-      <LinkerScript>
-      </LinkerScript>
-    </Link>
-  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|VisualGDB'">
     <ClCompile>
       <CPPLanguageStandard>GNUPP14</CPPLanguageStandard>
@@ -107,6 +81,7 @@
     <ClCompile Include="..\..\src\archivers\7z\Bra.cpp" />
     <ClCompile Include="..\..\src\archivers\7z\Bra86.cpp" />
     <ClCompile Include="..\..\src\archivers\7z\BraIA64.c" />
+    <ClCompile Include="..\..\src\archivers\7z\CpuArch.c" />
     <ClCompile Include="..\..\src\archivers\7z\Delta.c" />
     <ClCompile Include="..\..\src\archivers\7z\LzFind.cpp" />
     <ClCompile Include="..\..\src\archivers\7z\Lzma2Dec.cpp" />
@@ -287,6 +262,7 @@
     <ClInclude Include="..\..\src\archivers\7z\Alloc.h" />
     <ClInclude Include="..\..\src\archivers\7z\Bcj2.h" />
     <ClInclude Include="..\..\src\archivers\7z\Bra.h" />
+    <ClInclude Include="..\..\src\archivers\7z\CpuArch.h" />
     <ClInclude Include="..\..\src\archivers\7z\Delta.h" />
     <ClInclude Include="..\..\src\archivers\7z\LzFind.h" />
     <ClInclude Include="..\..\src\archivers\7z\LzHash.h" />
diff --git a/VisualGDB/Amiberry/Amiberry.vcxproj.filters b/VisualGDB/Amiberry/Amiberry.vcxproj.filters
index 31e956e4..a8775cbd 100644
--- a/VisualGDB/Amiberry/Amiberry.vcxproj.filters
+++ b/VisualGDB/Amiberry/Amiberry.vcxproj.filters
@@ -607,6 +607,9 @@
     <ClCompile Include="..\..\src\hrtmon.rom.cpp">
       <Filter>Source files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\archivers\7z\CpuArch.c">
+      <Filter>Source files\archivers\7z</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\blit.h">
@@ -1008,5 +1011,8 @@
     <ClInclude Include="..\..\src\archivers\zip\unzip.h">
       <Filter>Source files\archivers\zip</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\archivers\7z\CpuArch.h">
+      <Filter>Source files\archivers\7z</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file