From ad66738b128f4113d93db77e7e44d3736853924b Mon Sep 17 00:00:00 2001
From: Dimitris Panokostas <midwan@gmail.com>
Date: Sat, 10 Feb 2018 00:48:09 +0100
Subject: [PATCH] Updated VisualGDB solution with latest changes

---
 VisualGDB/Amiberry-sdl1/Amiberry-sdl1.vcxproj |   8 +
 .../Amiberry-sdl1.vcxproj.filters             |  27 +++
 .../Amiberry-Debug-dispmanx.vgdbsettings      |   4 +-
 .../Amiberry-Debug-rpi1-dispmanx.vgdbsettings | 194 ++++++++++++++++++
 .../Amiberry-Release-dispmanx.vgdbsettings    |   3 +-
 VisualGDB/Amiberry/Amiberry.sln               |  13 +-
 VisualGDB/Amiberry/Amiberry.vcxproj           |  36 +++-
 VisualGDB/Amiberry/Amiberry.vcxproj.filters   |  27 +++
 8 files changed, 307 insertions(+), 5 deletions(-)
 create mode 100644 VisualGDB/Amiberry/Amiberry-Debug-rpi1-dispmanx.vgdbsettings

diff --git a/VisualGDB/Amiberry-sdl1/Amiberry-sdl1.vcxproj b/VisualGDB/Amiberry-sdl1/Amiberry-sdl1.vcxproj
index 7927d4cb..736efd50 100644
--- a/VisualGDB/Amiberry-sdl1/Amiberry-sdl1.vcxproj
+++ b/VisualGDB/Amiberry-sdl1/Amiberry-sdl1.vcxproj
@@ -104,6 +104,8 @@
     <ClInclude Include="..\..\src\archivers\zip\unzip.h" />
     <ClInclude Include="..\..\src\blit.h" />
     <ClInclude Include="..\..\src\blitfunc.h" />
+    <ClInclude Include="..\..\src\caps\CapsAPI.h" />
+    <ClInclude Include="..\..\src\caps\Comtype.h" />
     <ClInclude Include="..\..\src\cputbl.h" />
     <ClInclude Include="..\..\src\include\akiko.h" />
     <ClInclude Include="..\..\src\include\ar.h" />
@@ -161,13 +163,17 @@
     <ClInclude Include="..\..\src\include\traps.h" />
     <ClInclude Include="..\..\src\include\uae.h" />
     <ClInclude Include="..\..\src\include\uaeresource.h" />
+    <ClInclude Include="..\..\src\include\uae\api.h" />
     <ClInclude Include="..\..\src\include\uae\attributes.h" />
+    <ClInclude Include="..\..\src\include\uae\caps.h" />
     <ClInclude Include="..\..\src\include\uae\cdrom.h" />
+    <ClInclude Include="..\..\src\include\uae\dlopen.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\uae.h" />
     <ClInclude Include="..\..\src\include\uae\vm.h" />
     <ClInclude Include="..\..\src\include\xwin.h" />
     <ClInclude Include="..\..\src\include\zarchive.h" />
@@ -265,6 +271,7 @@
     <ClCompile Include="..\..\src\blkdev_cdimage.cpp" />
     <ClCompile Include="..\..\src\bsdsocket.cpp" />
     <ClCompile Include="..\..\src\calc.cpp" />
+    <ClCompile Include="..\..\src\caps\caps_win32.cpp" />
     <ClCompile Include="..\..\src\cd32_fmv.cpp" />
     <ClCompile Include="..\..\src\cd32_fmv_genlock.cpp" />
     <ClCompile Include="..\..\src\cdrom.cpp" />
@@ -283,6 +290,7 @@
     <ClCompile Include="..\..\src\devices.cpp" />
     <ClCompile Include="..\..\src\disk.cpp" />
     <ClCompile Include="..\..\src\diskutil.cpp" />
+    <ClCompile Include="..\..\src\dlopen.cpp" />
     <ClCompile Include="..\..\src\drawing.cpp" />
     <ClCompile Include="..\..\src\events.cpp" />
     <ClCompile Include="..\..\src\expansion.cpp" />
diff --git a/VisualGDB/Amiberry-sdl1/Amiberry-sdl1.vcxproj.filters b/VisualGDB/Amiberry-sdl1/Amiberry-sdl1.vcxproj.filters
index 3b323e10..bbd0da10 100644
--- a/VisualGDB/Amiberry-sdl1/Amiberry-sdl1.vcxproj.filters
+++ b/VisualGDB/Amiberry-sdl1/Amiberry-sdl1.vcxproj.filters
@@ -60,6 +60,9 @@
     <Filter Include="Source files\threaddep">
       <UniqueIdentifier>{16614409-437c-450b-a649-1a7fadd04898}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Source files\caps">
+      <UniqueIdentifier>{5cef2156-ecaa-490f-8423-b3526adf4f9b}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <None Include="Amiberry-sdl1-Debug.vgdbsettings">
@@ -661,6 +664,24 @@
     <ClInclude Include="..\..\src\archivers\7z\CpuArch.h">
       <Filter>Source files\archivers\7z</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\include\uae\dlopen.h">
+      <Filter>Source files\include\uae</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\include\uae\uae.h">
+      <Filter>Source files\include\uae</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\include\uae\caps.h">
+      <Filter>Source files\include\uae</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\include\uae\api.h">
+      <Filter>Source files\include\uae</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\caps\CapsAPI.h">
+      <Filter>Source files\caps</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\caps\Comtype.h">
+      <Filter>Source files\caps</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\filesys.asm">
@@ -998,5 +1019,11 @@
     <ClCompile Include="..\..\src\osdep\gui\PanelAbout.cpp">
       <Filter>Source files\osdep\gui</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\dlopen.cpp">
+      <Filter>Source files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\caps\caps_win32.cpp">
+      <Filter>Source files\caps</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/VisualGDB/Amiberry/Amiberry-Debug-dispmanx.vgdbsettings b/VisualGDB/Amiberry/Amiberry-Debug-dispmanx.vgdbsettings
index b60ba156..97b8a3f4 100644
--- a/VisualGDB/Amiberry/Amiberry-Debug-dispmanx.vgdbsettings
+++ b/VisualGDB/Amiberry/Amiberry-Debug-dispmanx.vgdbsettings
@@ -10,7 +10,7 @@
       <Transport>None</Transport>
     </BuildHost>
     <DeploymentHost>
-      <HostName>192.168.1.121</HostName>
+      <HostName>192.168.1.124</HostName>
       <Transport>SSH</Transport>
       <UserName>pi</UserName>
     </DeploymentHost>
@@ -35,7 +35,6 @@
       </FileMasks>
       <TransferNewFilesOnly>true</TransferNewFilesOnly>
       <IncludeSubdirectories>true</IncludeSubdirectories>
-      <SelectedDirectories />
       <DeleteDisappearedFiles>false</DeleteDisappearedFiles>
       <ApplyGlobalExclusionList>true</ApplyGlobalExclusionList>
     </MainSourceTransferCommand>
@@ -58,6 +57,7 @@
     <ProjectFile>Amiberry.vcxproj</ProjectFile>
     <RemoteBuildEnvironment>
       <Records />
+      <EnvironmentSetupFiles />
     </RemoteBuildEnvironment>
     <ParallelJobCount>1</ParallelJobCount>
     <SuppressDirectoryChangeMessages>true</SuppressDirectoryChangeMessages>
diff --git a/VisualGDB/Amiberry/Amiberry-Debug-rpi1-dispmanx.vgdbsettings b/VisualGDB/Amiberry/Amiberry-Debug-rpi1-dispmanx.vgdbsettings
new file mode 100644
index 00000000..4b007661
--- /dev/null
+++ b/VisualGDB/Amiberry/Amiberry-Debug-rpi1-dispmanx.vgdbsettings
@@ -0,0 +1,194 @@
+<?xml version="1.0"?>
+<VisualGDBProjectSettings2 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <ConfigurationName>Debug-rpi1-dispmanx</ConfigurationName>
+  <Project xsi:type="com.visualgdb.project.linux">
+    <CustomSourceDirectories>
+      <Directories />
+      <PathStyle>MinGWUnixSlash</PathStyle>
+    </CustomSourceDirectories>
+    <BuildHost>
+      <Transport>None</Transport>
+    </BuildHost>
+    <DeploymentHost>
+      <HostName>192.168.1.124</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>
+    <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.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>true</UseFrameParameter>
+        <SimpleValuesFlagSupported>true</SimpleValuesFlagSupported>
+        <ListLocalsSupported>true</ListLocalsSupported>
+        <ByteLevelMemoryCommandsAvailable>true</ByteLevelMemoryCommandsAvailable>
+        <ThreadInfoSupported>true</ThreadInfoSupported>
+        <PendingBreakpointsSupported>true</PendingBreakpointsSupported>
+        <SupportTargetCommand>true</SupportTargetCommand>
+        <ReliableBreakpointNotifications>true</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>true</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>Remote</X11WindowMode>
+    <KeepConsoleAfterExit>false</KeepConsoleAfterExit>
+    <RunGDBUnderSudo>false</RunGDBUnderSudo>
+    <DeploymentMode>Auto</DeploymentMode>
+    <LdLibraryPath>/usr/local/lib</LdLibraryPath>
+    <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>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>
+    </CodeAnalyzerSettings>
+  </CodeSense>
+  <BuildContextDirectory>VisualGDB\VisualGDBCache</BuildContextDirectory>
+  <ProgramArgumentsSuggestions />
+</VisualGDBProjectSettings2>
\ No newline at end of file
diff --git a/VisualGDB/Amiberry/Amiberry-Release-dispmanx.vgdbsettings b/VisualGDB/Amiberry/Amiberry-Release-dispmanx.vgdbsettings
index 7a0ccf31..5546fc8d 100644
--- a/VisualGDB/Amiberry/Amiberry-Release-dispmanx.vgdbsettings
+++ b/VisualGDB/Amiberry/Amiberry-Release-dispmanx.vgdbsettings
@@ -10,7 +10,7 @@
       <Transport>None</Transport>
     </BuildHost>
     <DeploymentHost>
-      <HostName>192.168.1.121</HostName>
+      <HostName>192.168.1.124</HostName>
       <Transport>SSH</Transport>
       <UserName>pi</UserName>
     </DeploymentHost>
@@ -58,6 +58,7 @@
     <ProjectFile>Amiberry.vcxproj</ProjectFile>
     <RemoteBuildEnvironment>
       <Records />
+      <EnvironmentSetupFiles />
     </RemoteBuildEnvironment>
     <ParallelJobCount>1</ParallelJobCount>
     <SuppressDirectoryChangeMessages>true</SuppressDirectoryChangeMessages>
diff --git a/VisualGDB/Amiberry/Amiberry.sln b/VisualGDB/Amiberry/Amiberry.sln
index 742b8c26..44cb5ac4 100644
--- a/VisualGDB/Amiberry/Amiberry.sln
+++ b/VisualGDB/Amiberry/Amiberry.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.27130.2020
+VisualStudioVersion = 15.0.27130.2026
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Amiberry", "Amiberry.vcxproj", "{FDC6BF55-C4BC-44FB-85A9-3369784716E8}"
 	ProjectSection(ProjectDependencies) = postProject
@@ -20,6 +20,7 @@ Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|VisualGDB = Debug|VisualGDB
 		Debug-dispmanx|VisualGDB = Debug-dispmanx|VisualGDB
+		Debug-rpi1-dispmanx|VisualGDB = Debug-rpi1-dispmanx|VisualGDB
 		Release|VisualGDB = Release|VisualGDB
 		Release-dispmanx|VisualGDB = Release-dispmanx|VisualGDB
 	EndGlobalSection
@@ -28,6 +29,8 @@ Global
 		{FDC6BF55-C4BC-44FB-85A9-3369784716E8}.Debug|VisualGDB.Build.0 = Debug|VisualGDB
 		{FDC6BF55-C4BC-44FB-85A9-3369784716E8}.Debug-dispmanx|VisualGDB.ActiveCfg = Debug-dispmanx|VisualGDB
 		{FDC6BF55-C4BC-44FB-85A9-3369784716E8}.Debug-dispmanx|VisualGDB.Build.0 = Debug-dispmanx|VisualGDB
+		{FDC6BF55-C4BC-44FB-85A9-3369784716E8}.Debug-rpi1-dispmanx|VisualGDB.ActiveCfg = Debug-rpi1-dispmanx|VisualGDB
+		{FDC6BF55-C4BC-44FB-85A9-3369784716E8}.Debug-rpi1-dispmanx|VisualGDB.Build.0 = Debug-rpi1-dispmanx|VisualGDB
 		{FDC6BF55-C4BC-44FB-85A9-3369784716E8}.Release|VisualGDB.ActiveCfg = Release|VisualGDB
 		{FDC6BF55-C4BC-44FB-85A9-3369784716E8}.Release|VisualGDB.Build.0 = Release|VisualGDB
 		{FDC6BF55-C4BC-44FB-85A9-3369784716E8}.Release-dispmanx|VisualGDB.ActiveCfg = Release-dispmanx|VisualGDB
@@ -36,6 +39,8 @@ Global
 		{E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Debug|VisualGDB.Build.0 = Debug|VisualGDB
 		{E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Debug-dispmanx|VisualGDB.ActiveCfg = Debug|VisualGDB
 		{E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Debug-dispmanx|VisualGDB.Build.0 = Debug|VisualGDB
+		{E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Debug-rpi1-dispmanx|VisualGDB.ActiveCfg = Debug|VisualGDB
+		{E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Debug-rpi1-dispmanx|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
 		{E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Release-dispmanx|VisualGDB.ActiveCfg = Release|VisualGDB
@@ -44,6 +49,8 @@ Global
 		{14635D01-67B8-4863-9507-3FA5C8FB4B32}.Debug|VisualGDB.Build.0 = Debug|VisualGDB
 		{14635D01-67B8-4863-9507-3FA5C8FB4B32}.Debug-dispmanx|VisualGDB.ActiveCfg = Debug|VisualGDB
 		{14635D01-67B8-4863-9507-3FA5C8FB4B32}.Debug-dispmanx|VisualGDB.Build.0 = Debug|VisualGDB
+		{14635D01-67B8-4863-9507-3FA5C8FB4B32}.Debug-rpi1-dispmanx|VisualGDB.ActiveCfg = Debug|VisualGDB
+		{14635D01-67B8-4863-9507-3FA5C8FB4B32}.Debug-rpi1-dispmanx|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
 		{14635D01-67B8-4863-9507-3FA5C8FB4B32}.Release-dispmanx|VisualGDB.ActiveCfg = Release|VisualGDB
@@ -52,6 +59,8 @@ Global
 		{619EFB8C-E41A-4058-B085-1B8CD22692DD}.Debug|VisualGDB.Build.0 = Debug|VisualGDB
 		{619EFB8C-E41A-4058-B085-1B8CD22692DD}.Debug-dispmanx|VisualGDB.ActiveCfg = Debug|VisualGDB
 		{619EFB8C-E41A-4058-B085-1B8CD22692DD}.Debug-dispmanx|VisualGDB.Build.0 = Debug|VisualGDB
+		{619EFB8C-E41A-4058-B085-1B8CD22692DD}.Debug-rpi1-dispmanx|VisualGDB.ActiveCfg = Debug|VisualGDB
+		{619EFB8C-E41A-4058-B085-1B8CD22692DD}.Debug-rpi1-dispmanx|VisualGDB.Build.0 = Debug|VisualGDB
 		{619EFB8C-E41A-4058-B085-1B8CD22692DD}.Release|VisualGDB.ActiveCfg = Release|VisualGDB
 		{619EFB8C-E41A-4058-B085-1B8CD22692DD}.Release|VisualGDB.Build.0 = Release|VisualGDB
 		{619EFB8C-E41A-4058-B085-1B8CD22692DD}.Release-dispmanx|VisualGDB.ActiveCfg = Release|VisualGDB
@@ -60,6 +69,8 @@ Global
 		{883F2A00-8030-429B-AC7F-E930DDF9568F}.Debug|VisualGDB.Build.0 = Debug|VisualGDB
 		{883F2A00-8030-429B-AC7F-E930DDF9568F}.Debug-dispmanx|VisualGDB.ActiveCfg = Debug|VisualGDB
 		{883F2A00-8030-429B-AC7F-E930DDF9568F}.Debug-dispmanx|VisualGDB.Build.0 = Debug|VisualGDB
+		{883F2A00-8030-429B-AC7F-E930DDF9568F}.Debug-rpi1-dispmanx|VisualGDB.ActiveCfg = Debug|VisualGDB
+		{883F2A00-8030-429B-AC7F-E930DDF9568F}.Debug-rpi1-dispmanx|VisualGDB.Build.0 = Debug|VisualGDB
 		{883F2A00-8030-429B-AC7F-E930DDF9568F}.Release|VisualGDB.ActiveCfg = Release|VisualGDB
 		{883F2A00-8030-429B-AC7F-E930DDF9568F}.Release|VisualGDB.Build.0 = Release|VisualGDB
 		{883F2A00-8030-429B-AC7F-E930DDF9568F}.Release-dispmanx|VisualGDB.ActiveCfg = Release|VisualGDB
diff --git a/VisualGDB/Amiberry/Amiberry.vcxproj b/VisualGDB/Amiberry/Amiberry.vcxproj
index 7a68aba6..19a077d4 100644
--- a/VisualGDB/Amiberry/Amiberry.vcxproj
+++ b/VisualGDB/Amiberry/Amiberry.vcxproj
@@ -5,6 +5,10 @@
       <Configuration>Debug-dispmanx</Configuration>
       <Platform>VisualGDB</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug-rpi1-dispmanx|VisualGDB">
+      <Configuration>Debug-rpi1-dispmanx</Configuration>
+      <Platform>VisualGDB</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|VisualGDB">
       <Configuration>Debug</Configuration>
       <Platform>VisualGDB</Platform>
@@ -26,6 +30,7 @@
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|VisualGDB'">
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-dispmanx|VisualGDB'" Label="Configuration" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-rpi1-dispmanx|VisualGDB'" Label="Configuration" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|VisualGDB'">
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-dispmanx|VisualGDB'" Label="Configuration" />
@@ -47,6 +52,12 @@
     <ToolchainVersion>6.3.0/7.12/r1</ToolchainVersion>
     <TargetName>$(ProjectName)-sdl2</TargetName>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-rpi1-dispmanx|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>
@@ -76,7 +87,22 @@
       <CPPLanguageStandard>GNUPP14</CPPLanguageStandard>
       <AdditionalIncludeDirectories>=/usr/local/include/SDL2;=/usr/include/libxml2;../../src;../../src/osdep;../../src/threaddep;../../src/include;../../src/guisan/include;../../src/archivers;=/opt/vc/include;=/opt/vc/include/interface/vmcs_host/linux;=/opt/vc/include/interface/vcos/pthreads;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>DEBUG=1;ARMV6T2;USE_ARMNEON;_REENTRANT;AMIBERRY;CPU_arm;ARMV6_ASSEMBLY;USE_SDL2;USE_DISPMANX;%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions>-march=armv8-a -mfpu=neon-fp-armv8 -mfloat-abi=hard %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>-march=armv8-a -mfpu=neon-fp-armv8 %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <AdditionalLinkerInputs>;%(Link.AdditionalLinkerInputs)</AdditionalLinkerInputs>
+      <LibrarySearchDirectories>=/usr/local/lib;../../src/guisan/lib;=/opt/vc/lib;%(Link.LibrarySearchDirectories)</LibrarySearchDirectories>
+      <AdditionalLibraryNames>SDL2;pthread;z;png;rt;xml2;FLAC;mpg123;dl;mpeg2convert;mpeg2;SDL2_image;SDL2_ttf;guisan;bcm_host;%(Link.AdditionalLibraryNames)</AdditionalLibraryNames>
+      <LinkerScript>
+      </LinkerScript>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-rpi1-dispmanx|VisualGDB'">
+    <ClCompile>
+      <CPPLanguageStandard>GNUPP14</CPPLanguageStandard>
+      <AdditionalIncludeDirectories>=/usr/local/include/SDL2;=/usr/include/libxml2;../../src;../../src/osdep;../../src/threaddep;../../src/include;../../src/guisan/include;../../src/archivers;=/opt/vc/include;=/opt/vc/include/interface/vmcs_host/linux;=/opt/vc/include/interface/vcos/pthreads;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>DEBUG=1;_REENTRANT;AMIBERRY;CPU_arm;ARMV6_ASSEMBLY;USE_SDL2;USE_DISPMANX;%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions>-march=armv6zk -mtune=arm1176jzf-s -mfpu=vfp %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalLinkerInputs>;%(Link.AdditionalLinkerInputs)</AdditionalLinkerInputs>
@@ -182,6 +208,7 @@
     <ClCompile Include="..\..\src\blkdev_cdimage.cpp" />
     <ClCompile Include="..\..\src\bsdsocket.cpp" />
     <ClCompile Include="..\..\src\calc.cpp" />
+    <ClCompile Include="..\..\src\caps\caps_win32.cpp" />
     <ClCompile Include="..\..\src\cd32_fmv.cpp" />
     <ClCompile Include="..\..\src\cd32_fmv_genlock.cpp" />
     <ClCompile Include="..\..\src\cdrom.cpp" />
@@ -200,6 +227,7 @@
     <ClCompile Include="..\..\src\devices.cpp" />
     <ClCompile Include="..\..\src\disk.cpp" />
     <ClCompile Include="..\..\src\diskutil.cpp" />
+    <ClCompile Include="..\..\src\dlopen.cpp" />
     <ClCompile Include="..\..\src\drawing.cpp" />
     <ClCompile Include="..\..\src\events.cpp" />
     <ClCompile Include="..\..\src\expansion.cpp" />
@@ -342,6 +370,8 @@
     <ClInclude Include="..\..\src\archivers\zip\unzip.h" />
     <ClInclude Include="..\..\src\blit.h" />
     <ClInclude Include="..\..\src\blitfunc.h" />
+    <ClInclude Include="..\..\src\caps\CapsAPI.h" />
+    <ClInclude Include="..\..\src\caps\Comtype.h" />
     <ClInclude Include="..\..\src\cputbl.h" />
     <ClInclude Include="..\..\src\include\akiko.h" />
     <ClInclude Include="..\..\src\include\ar.h" />
@@ -399,13 +429,17 @@
     <ClInclude Include="..\..\src\include\traps.h" />
     <ClInclude Include="..\..\src\include\uae.h" />
     <ClInclude Include="..\..\src\include\uaeresource.h" />
+    <ClInclude Include="..\..\src\include\uae\api.h" />
     <ClInclude Include="..\..\src\include\uae\attributes.h" />
+    <ClInclude Include="..\..\src\include\uae\caps.h" />
     <ClInclude Include="..\..\src\include\uae\cdrom.h" />
+    <ClInclude Include="..\..\src\include\uae\dlopen.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\uae.h" />
     <ClInclude Include="..\..\src\include\uae\vm.h" />
     <ClInclude Include="..\..\src\include\xwin.h" />
     <ClInclude Include="..\..\src\include\zarchive.h" />
diff --git a/VisualGDB/Amiberry/Amiberry.vcxproj.filters b/VisualGDB/Amiberry/Amiberry.vcxproj.filters
index affb2914..bbad1c50 100644
--- a/VisualGDB/Amiberry/Amiberry.vcxproj.filters
+++ b/VisualGDB/Amiberry/Amiberry.vcxproj.filters
@@ -60,6 +60,9 @@
     <Filter Include="Source files\archivers\zip">
       <UniqueIdentifier>{08ca7b92-10d6-48f5-bc08-bc91ccc3a9d0}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Source files\caps">
+      <UniqueIdentifier>{0a52f580-62f7-4e5c-9275-c789d1fe0c19}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <None Include="Amiberry-Debug.vgdbsettings">
@@ -598,6 +601,12 @@
     <ClCompile Include="..\..\src\osdep\gui\PanelAbout.cpp">
       <Filter>Source files\osdep\gui</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\dlopen.cpp">
+      <Filter>Source files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\caps\caps_win32.cpp">
+      <Filter>Source files\caps</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\blit.h">
@@ -990,5 +999,23 @@
     <ClInclude Include="..\..\src\archivers\7z\CpuArch.h">
       <Filter>Source files\archivers\7z</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\include\uae\dlopen.h">
+      <Filter>Source files\include\uae</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\include\uae\uae.h">
+      <Filter>Source files\include\uae</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\include\uae\caps.h">
+      <Filter>Source files\include\uae</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\include\uae\api.h">
+      <Filter>Source files\include\uae</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\caps\CapsAPI.h">
+      <Filter>Source files\caps</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\caps\Comtype.h">
+      <Filter>Source files\caps</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file