From ff5b34f565c8a8c68d08d894beecc8cd9dc5037b Mon Sep 17 00:00:00 2001
From: Dimitris Panokostas <midwan@gmail.com>
Date: Thu, 6 Aug 2020 14:37:28 +0200
Subject: [PATCH] Updated VSLinux settings

---
 VSLinux/Amiberry.sln                  |  67 ++--
 VSLinux/Amiberry.vcxproj              | 155 +++++++-
 VSLinux/Amiberry.vcxproj.filters      | 105 ++++--
 VSLinux/Amiberry.vcxproj.user         |  26 ++
 VSLinux/guisan/guisan.vcxproj         | 398 +++++++++++++--------
 VSLinux/guisan/guisan.vcxproj.filters | 486 +++++++-------------------
 6 files changed, 636 insertions(+), 601 deletions(-)

diff --git a/VSLinux/Amiberry.sln b/VSLinux/Amiberry.sln
index e20217d8..6290e329 100644
--- a/VSLinux/Amiberry.sln
+++ b/VSLinux/Amiberry.sln
@@ -12,67 +12,64 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "guisan", "guisan\guisan.vcx
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug-rockpro64|ARM = Debug-rockpro64|ARM
-		Debug-rockpro64|ARM64 = Debug-rockpro64|ARM64
 		Debug-rpi4|ARM = Debug-rpi4|ARM
 		Debug-rpi4|ARM64 = Debug-rpi4|ARM64
-		Debug-xu4|ARM = Debug-xu4|ARM
-		Debug-xu4|ARM64 = Debug-xu4|ARM64
+		Debug-rpi4-64|ARM = Debug-rpi4-64|ARM
+		Debug-rpi4-64|ARM64 = Debug-rpi4-64|ARM64
 		Release-rpi4|ARM = Release-rpi4|ARM
 		Release-rpi4|ARM64 = Release-rpi4|ARM64
-		Release-xu4|ARM = Release-xu4|ARM
-		Release-xu4|ARM64 = Release-xu4|ARM64
+		Release-rpi4-64|ARM = Release-rpi4-64|ARM
+		Release-rpi4-64|ARM64 = Release-rpi4-64|ARM64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Debug-rockpro64|ARM.ActiveCfg = Debug-rockpro64|ARM
-		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Debug-rockpro64|ARM.Build.0 = Debug-rockpro64|ARM
-		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Debug-rockpro64|ARM64.ActiveCfg = Debug-rockpro64|ARM64
-		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Debug-rockpro64|ARM64.Build.0 = Debug-rockpro64|ARM64
-		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Debug-rockpro64|ARM64.Deploy.0 = Debug-rockpro64|ARM64
 		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Debug-rpi4|ARM.ActiveCfg = Debug|ARM
 		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Debug-rpi4|ARM.Build.0 = Debug|ARM
+		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Debug-rpi4|ARM.Deploy.0 = Debug|ARM
 		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Debug-rpi4|ARM64.ActiveCfg = Debug|ARM64
 		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Debug-rpi4|ARM64.Build.0 = Debug|ARM64
 		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Debug-rpi4|ARM64.Deploy.0 = Debug|ARM64
-		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Debug-xu4|ARM.ActiveCfg = Debug-xu4|ARM
-		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Debug-xu4|ARM.Build.0 = Debug-xu4|ARM
-		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Debug-xu4|ARM64.ActiveCfg = Debug-xu4|ARM64
-		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Debug-xu4|ARM64.Build.0 = Debug-xu4|ARM64
-		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Debug-xu4|ARM64.Deploy.0 = Debug-xu4|ARM64
+		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Debug-rpi4-64|ARM.ActiveCfg = Debug-rpi4-64|ARM
+		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Debug-rpi4-64|ARM.Build.0 = Debug-rpi4-64|ARM
+		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Debug-rpi4-64|ARM.Deploy.0 = Debug-rpi4-64|ARM
+		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Debug-rpi4-64|ARM64.ActiveCfg = Debug-rpi4-64|ARM64
+		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Debug-rpi4-64|ARM64.Build.0 = Debug-rpi4-64|ARM64
+		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Debug-rpi4-64|ARM64.Deploy.0 = Debug-rpi4-64|ARM64
 		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Release-rpi4|ARM.ActiveCfg = Release|ARM
 		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Release-rpi4|ARM.Build.0 = Release|ARM
+		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Release-rpi4|ARM.Deploy.0 = Release|ARM
 		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Release-rpi4|ARM64.ActiveCfg = Release|ARM64
 		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Release-rpi4|ARM64.Build.0 = Release|ARM64
 		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Release-rpi4|ARM64.Deploy.0 = Release|ARM64
-		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Release-xu4|ARM.ActiveCfg = Release-xu4|ARM
-		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Release-xu4|ARM.Build.0 = Release-xu4|ARM
-		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Release-xu4|ARM64.ActiveCfg = Release-xu4|ARM64
-		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Release-xu4|ARM64.Build.0 = Release-xu4|ARM64
-		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Release-xu4|ARM64.Deploy.0 = Release-xu4|ARM64
-		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Debug-rockpro64|ARM.ActiveCfg = Debug-rockpro64|ARM
-		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Debug-rockpro64|ARM64.ActiveCfg = Debug-rockpro64|ARM64
-		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Debug-rockpro64|ARM64.Build.0 = Debug-rockpro64|ARM64
-		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Debug-rockpro64|ARM64.Deploy.0 = Debug-rockpro64|ARM64
+		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Release-rpi4-64|ARM.ActiveCfg = Release-rpi4-64|ARM
+		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Release-rpi4-64|ARM.Build.0 = Release-rpi4-64|ARM
+		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Release-rpi4-64|ARM.Deploy.0 = Release-rpi4-64|ARM
+		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Release-rpi4-64|ARM64.ActiveCfg = Release-rpi4-64|ARM64
+		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Release-rpi4-64|ARM64.Build.0 = Release-rpi4-64|ARM64
+		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Release-rpi4-64|ARM64.Deploy.0 = Release-rpi4-64|ARM64
 		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Debug-rpi4|ARM.ActiveCfg = Debug|ARM
 		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Debug-rpi4|ARM.Build.0 = Debug|ARM
+		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Debug-rpi4|ARM.Deploy.0 = Debug|ARM
 		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Debug-rpi4|ARM64.ActiveCfg = Debug|ARM64
 		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Debug-rpi4|ARM64.Build.0 = Debug|ARM64
 		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Debug-rpi4|ARM64.Deploy.0 = Debug|ARM64
-		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Debug-xu4|ARM.ActiveCfg = Debug-xu4|ARM
-		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Debug-xu4|ARM.Build.0 = Debug-xu4|ARM
-		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Debug-xu4|ARM64.ActiveCfg = Debug-xu4|ARM64
-		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Debug-xu4|ARM64.Build.0 = Debug-xu4|ARM64
-		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Debug-xu4|ARM64.Deploy.0 = Debug-xu4|ARM64
+		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Debug-rpi4-64|ARM.ActiveCfg = Debug-rpi4-64|x64
+		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Debug-rpi4-64|ARM.Build.0 = Debug-rpi4-64|x64
+		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Debug-rpi4-64|ARM.Deploy.0 = Debug-rpi4-64|x64
+		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Debug-rpi4-64|ARM64.ActiveCfg = Debug-rpi4-64|ARM64
+		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Debug-rpi4-64|ARM64.Build.0 = Debug-rpi4-64|ARM64
+		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Debug-rpi4-64|ARM64.Deploy.0 = Debug-rpi4-64|ARM64
 		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Release-rpi4|ARM.ActiveCfg = Release|ARM
 		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Release-rpi4|ARM.Build.0 = Release|ARM
+		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Release-rpi4|ARM.Deploy.0 = Release|ARM
 		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Release-rpi4|ARM64.ActiveCfg = Release|ARM64
 		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Release-rpi4|ARM64.Build.0 = Release|ARM64
 		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Release-rpi4|ARM64.Deploy.0 = Release|ARM64
-		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Release-xu4|ARM.ActiveCfg = Release-xu4|ARM
-		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Release-xu4|ARM.Build.0 = Release-xu4|ARM
-		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Release-xu4|ARM64.ActiveCfg = Release-xu4|ARM64
-		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Release-xu4|ARM64.Build.0 = Release-xu4|ARM64
-		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Release-xu4|ARM64.Deploy.0 = Release-xu4|ARM64
+		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Release-rpi4-64|ARM.ActiveCfg = Release-rpi4-64|ARM
+		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Release-rpi4-64|ARM.Build.0 = Release-rpi4-64|ARM
+		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Release-rpi4-64|ARM.Deploy.0 = Release-rpi4-64|ARM
+		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Release-rpi4-64|ARM64.ActiveCfg = Release-rpi4-64|ARM64
+		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Release-rpi4-64|ARM64.Build.0 = Release-rpi4-64|ARM64
+		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Release-rpi4-64|ARM64.Deploy.0 = Release-rpi4-64|ARM64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/VSLinux/Amiberry.vcxproj b/VSLinux/Amiberry.vcxproj
index 46a6d4fe..6e410eb0 100644
--- a/VSLinux/Amiberry.vcxproj
+++ b/VSLinux/Amiberry.vcxproj
@@ -9,6 +9,14 @@
       <Configuration>Debug-rockpro64</Configuration>
       <Platform>ARM64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug-rpi4-64|ARM">
+      <Configuration>Debug-rpi4-64</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug-rpi4-64|ARM64">
+      <Configuration>Debug-rpi4-64</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug-xu4|ARM">
       <Configuration>Debug-xu4</Configuration>
       <Platform>ARM</Platform>
@@ -25,6 +33,14 @@
       <Configuration>Debug</Configuration>
       <Platform>ARM64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-rpi4-64|ARM">
+      <Configuration>Release-rpi4-64</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-rpi4-64|ARM64">
+      <Configuration>Release-rpi4-64</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release-xu4|ARM">
       <Configuration>Release-xu4</Configuration>
       <Platform>ARM</Platform>
@@ -57,10 +73,18 @@
     <UseDebugLibraries>true</UseDebugLibraries>
     <ConfigurationType>Makefile</ConfigurationType>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-rpi4-64|ARM'" Label="Configuration">
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <ConfigurationType>Makefile</ConfigurationType>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
     <UseDebugLibraries>true</UseDebugLibraries>
     <ConfigurationType>Makefile</ConfigurationType>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-rpi4-64|ARM64'" Label="Configuration">
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <ConfigurationType>Makefile</ConfigurationType>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-xu4|ARM'" Label="Configuration">
     <UseDebugLibraries>true</UseDebugLibraries>
     <ConfigurationType>Makefile</ConfigurationType>
@@ -85,10 +109,18 @@
     <UseDebugLibraries>false</UseDebugLibraries>
     <ConfigurationType>Makefile</ConfigurationType>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-rpi4-64|ARM'" Label="Configuration">
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <ConfigurationType>Makefile</ConfigurationType>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
     <UseDebugLibraries>false</UseDebugLibraries>
     <ConfigurationType>Makefile</ConfigurationType>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-rpi4-64|ARM64'" Label="Configuration">
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <ConfigurationType>Makefile</ConfigurationType>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-xu4|ARM'" Label="Configuration">
     <UseDebugLibraries>false</UseDebugLibraries>
     <ConfigurationType>Makefile</ConfigurationType>
@@ -101,6 +133,10 @@
     <UseDebugLibraries>true</UseDebugLibraries>
     <ConfigurationType>Makefile</ConfigurationType>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-rpi4-64|x86'" Label="Configuration">
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <ConfigurationType>Makefile</ConfigurationType>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-xu4|x86'" Label="Configuration">
     <UseDebugLibraries>true</UseDebugLibraries>
     <ConfigurationType>Makefile</ConfigurationType>
@@ -113,6 +149,10 @@
     <UseDebugLibraries>false</UseDebugLibraries>
     <ConfigurationType>Makefile</ConfigurationType>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-rpi4-64|x86'" Label="Configuration">
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <ConfigurationType>Makefile</ConfigurationType>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-xu4|x86'" Label="Configuration">
     <UseDebugLibraries>false</UseDebugLibraries>
     <ConfigurationType>Makefile</ConfigurationType>
@@ -121,6 +161,10 @@
     <UseDebugLibraries>true</UseDebugLibraries>
     <ConfigurationType>Makefile</ConfigurationType>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-rpi4-64|x64'" Label="Configuration">
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <ConfigurationType>Makefile</ConfigurationType>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-xu4|x64'" Label="Configuration">
     <UseDebugLibraries>true</UseDebugLibraries>
     <ConfigurationType>Makefile</ConfigurationType>
@@ -133,6 +177,10 @@
     <UseDebugLibraries>false</UseDebugLibraries>
     <ConfigurationType>Makefile</ConfigurationType>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-rpi4-64|x64'" Label="Configuration">
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <ConfigurationType>Makefile</ConfigurationType>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-xu4|x64'" Label="Configuration">
     <UseDebugLibraries>false</UseDebugLibraries>
     <ConfigurationType>Makefile</ConfigurationType>
@@ -152,6 +200,15 @@
     </RemoteBuildOutputs>
     <RemoteProjectDir>$(RemoteRootDir)/$(ProjectName)</RemoteProjectDir>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-rpi4-64|ARM'">
+    <RemoteBuildCommandLine>cd ~/projects/Amiberry; make -j4 PLATFORM=rpi4-sdl2</RemoteBuildCommandLine>
+    <RemoteReBuildCommandLine>cd ~/projects/Amiberry; make clean; make -j4 PLATFORM=rpi4-sdl2</RemoteReBuildCommandLine>
+    <RemoteCleanCommandLine>cd ~/projects/Amiberry; make clean</RemoteCleanCommandLine>
+    <NMakeIncludeSearchPath>..\src;..\src\include;..\src\osdep;..\src\archivers;..\external\libguisan\include;C:\SysGCC\raspberry\lib\gcc\arm-linux-gnueabihf\6\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\include\c++\6;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\arm-linux-gnueabihf;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\local\include\SDL2;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\SDL2;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\libxml2;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\opt\vc\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\opt\vc\include\interface\vmcs_host\linux;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\opt\vc\include\interface\vcos\pthreads;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
+    <NMakePreprocessorDefinitions>DEBUG;ARMV6T2;USE_ARMNEON;ARMV6_ASSEMBLY;AMIBERRY;CPU_arm;ARM_HAS_DIV;USE_SDL2;_REENTRANT;_FILE_OFFSET_BITS=64;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
+    <RemoteBuildOutputs />
+    <RemoteProjectDir>$(RemoteRootDir)/$(ProjectName)</RemoteProjectDir>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
     <RemoteBuildCommandLine>cd ~/projects/Amiberry; make -j4 PLATFORM=rpi4-sdl2</RemoteBuildCommandLine>
     <RemoteReBuildCommandLine>cd ~/projects/Amiberry; make clean; make -j4 PLATFORM=rpi4-sdl2</RemoteReBuildCommandLine>
@@ -161,6 +218,15 @@
     <RemoteBuildOutputs />
     <RemoteProjectDir>$(RemoteRootDir)/$(ProjectName)</RemoteProjectDir>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-rpi4-64|ARM64'">
+    <RemoteBuildCommandLine>cd ~/projects/Amiberry; make -j4 PLATFORM=rpi4-sdl2</RemoteBuildCommandLine>
+    <RemoteReBuildCommandLine>cd ~/projects/Amiberry; make clean; make -j4 PLATFORM=rpi4-sdl2</RemoteReBuildCommandLine>
+    <RemoteCleanCommandLine>cd ~/projects/Amiberry; make clean</RemoteCleanCommandLine>
+    <NMakeIncludeSearchPath>..\src;..\src\include;..\src\osdep;..\src\archivers;..\guisan-dev\include;C:\SysGCC\raspberry\lib\gcc\arm-linux-gnueabihf\6\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\include\c++\6;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\arm-linux-gnueabihf;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\local\include\SDL2;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\SDL2;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\libxml2;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\opt\vc\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\opt\vc\include\interface\vmcs_host\linux;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\opt\vc\include\interface\vcos\pthreads;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
+    <NMakePreprocessorDefinitions>DEBUG;ARMV6T2;USE_ARMNEON;ARMV6_ASSEMBLY;AMIBERRY;CPU_arm;ARM_HAS_DIV;USE_SDL2;_REENTRANT;_FILE_OFFSET_BITS=64;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
+    <RemoteBuildOutputs />
+    <RemoteProjectDir>$(RemoteRootDir)/$(ProjectName)</RemoteProjectDir>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-xu4|ARM'">
     <RemoteBuildCommandLine>cd ~/projects/Amiberry; make -j4 PLATFORM=xu4</RemoteBuildCommandLine>
     <RemoteReBuildCommandLine>cd ~/projects/Amiberry; make clean; make -j4 PLATFORM=xu4</RemoteReBuildCommandLine>
@@ -205,6 +271,14 @@
     <NMakePreprocessorDefinitions>ARMV6T2;USE_ARMNEON;ARMV6_ASSEMBLY;AMIBERRY;CPU_arm;ARM_HAS_DIV;USE_SDL2;_REENTRANT;_FILE_OFFSET_BITS=64;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
     <RemoteProjectDir>$(RemoteRootDir)/$(ProjectName)</RemoteProjectDir>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-rpi4-64|ARM'">
+    <NMakeIncludeSearchPath>..\src;..\src\include;..\src\osdep;..\src\archivers;..\external\libguisan\include;C:\SysGCC\raspberry\lib\gcc\arm-linux-gnueabihf\6\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\include\c++\6;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\arm-linux-gnueabihf;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\local\include\SDL2;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\SDL2;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\libxml2;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\opt\vc\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\opt\vc\include\interface\vmcs_host\linux;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\opt\vc\include\interface\vcos\pthreads;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
+    <RemoteBuildCommandLine>cd ~/projects/Amiberry; make -j3 PLATFORM=rpi4-sdl2</RemoteBuildCommandLine>
+    <RemoteReBuildCommandLine>cd ~/projects/Amiberry; make clean; make -j3 PLATFORM=rpi4-sdl2</RemoteReBuildCommandLine>
+    <RemoteCleanCommandLine>cd ~/projects/Amiberry; make clean</RemoteCleanCommandLine>
+    <NMakePreprocessorDefinitions>ARMV6T2;USE_ARMNEON;ARMV6_ASSEMBLY;AMIBERRY;CPU_arm;ARM_HAS_DIV;USE_SDL2;_REENTRANT;_FILE_OFFSET_BITS=64;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
+    <RemoteProjectDir>$(RemoteRootDir)/$(ProjectName)</RemoteProjectDir>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
     <NMakeIncludeSearchPath>..\src;..\src\include;..\src\osdep;..\src\archivers;..\guisan-dev\include;C:\SysGCC\raspberry\lib\gcc\arm-linux-gnueabihf\6\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\include\c++\6;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\arm-linux-gnueabihf;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\local\include\SDL2;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\SDL2;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\libxml2;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\opt\vc\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\opt\vc\include\interface\vmcs_host\linux;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\opt\vc\include\interface\vcos\pthreads;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
     <RemoteBuildCommandLine>cd ~/projects/Amiberry; make -j3 PLATFORM=rpi4-sdl2</RemoteBuildCommandLine>
@@ -213,6 +287,14 @@
     <NMakePreprocessorDefinitions>ARMV6T2;USE_ARMNEON;ARMV6_ASSEMBLY;AMIBERRY;CPU_arm;ARM_HAS_DIV;USE_SDL2;_REENTRANT;_FILE_OFFSET_BITS=64;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
     <RemoteProjectDir>$(RemoteRootDir)/$(ProjectName)</RemoteProjectDir>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-rpi4-64|ARM64'">
+    <NMakeIncludeSearchPath>..\src;..\src\include;..\src\osdep;..\src\archivers;..\guisan-dev\include;C:\SysGCC\raspberry\lib\gcc\arm-linux-gnueabihf\6\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\include\c++\6;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\arm-linux-gnueabihf;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\local\include\SDL2;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\SDL2;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\libxml2;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\opt\vc\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\opt\vc\include\interface\vmcs_host\linux;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\opt\vc\include\interface\vcos\pthreads;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
+    <RemoteBuildCommandLine>cd ~/projects/Amiberry; make -j3 PLATFORM=rpi4-sdl2</RemoteBuildCommandLine>
+    <RemoteReBuildCommandLine>cd ~/projects/Amiberry; make clean; make -j3 PLATFORM=rpi4-sdl2</RemoteReBuildCommandLine>
+    <RemoteCleanCommandLine>cd ~/projects/Amiberry; make clean</RemoteCleanCommandLine>
+    <NMakePreprocessorDefinitions>ARMV6T2;USE_ARMNEON;ARMV6_ASSEMBLY;AMIBERRY;CPU_arm;ARM_HAS_DIV;USE_SDL2;_REENTRANT;_FILE_OFFSET_BITS=64;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
+    <RemoteProjectDir>$(RemoteRootDir)/$(ProjectName)</RemoteProjectDir>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-xu4|ARM'">
     <NMakeIncludeSearchPath>C:\SysGCC\raspberry\lib\gcc\arm-linux-gnueabihf\6\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\include\c++\6;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\arm-linux-gnueabihf;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\SDL2;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\libxml2;..\src;..\src\include;..\src\osdep;..\src\archivers;..\guisan\include;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
     <RemoteBuildCommandLine>cd ~/projects/Amiberry; make -j4 PLATFORM=xu4</RemoteBuildCommandLine>
@@ -248,6 +330,7 @@
       <DeploymentContent>true</DeploymentContent>
     </Image>
     <Image Include="..\data\amiberry-logo.png" />
+    <Image Include="..\data\amiberry.png" />
     <Image Include="..\data\amigainfo.ico" />
     <Image Include="..\data\chip.ico">
       <DeploymentContent>true</DeploymentContent>
@@ -296,9 +379,6 @@
   </ItemGroup>
   <ItemGroup>
     <Font Include="..\data\AmigaTopaz.ttf" />
-    <Font Include="..\data\Topaznew.ttf">
-      <DeploymentContent>true</DeploymentContent>
-    </Font>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\conf\amiberry.conf">
@@ -308,9 +388,6 @@
       <DeploymentContent>false</DeploymentContent>
     </None>
     <None Include="..\src\aks.def" />
-    <None Include="..\src\filesys.asm">
-      <DeploymentContent>true</DeploymentContent>
-    </None>
     <None Include="..\src\inputevents.def">
       <DeploymentContent>true</DeploymentContent>
     </None>
@@ -320,9 +397,6 @@
     <None Include="..\src\osdep\aarch64_helper.s" />
     <None Include="..\src\osdep\arm_helper.s" />
     <None Include="..\src\osdep\neon_helper.s" />
-    <None Include="..\src\table68k">
-      <DeploymentContent>true</DeploymentContent>
-    </None>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\src\akiko.cpp">
@@ -420,12 +494,15 @@
     <ClCompile Include="..\src\cdrom.cpp">
       <DeploymentContent>false</DeploymentContent>
     </ClCompile>
+    <ClCompile Include="..\src\cdtv.cpp" />
+    <ClCompile Include="..\src\cdtvcr.cpp" />
     <ClCompile Include="..\src\cfgfile.cpp">
       <DeploymentContent>false</DeploymentContent>
     </ClCompile>
     <ClCompile Include="..\src\cia.cpp">
       <DeploymentContent>false</DeploymentContent>
     </ClCompile>
+    <ClCompile Include="..\src\consolehook.cpp" />
     <ClCompile Include="..\src\cpudefs.cpp">
       <DeploymentContent>false</DeploymentContent>
     </ClCompile>
@@ -503,6 +580,7 @@
     <ClCompile Include="..\src\inputdevice.cpp">
       <DeploymentContent>false</DeploymentContent>
     </ClCompile>
+    <ClCompile Include="..\src\isofs.cpp" />
     <ClCompile Include="..\src\jit\codegen_arm.cpp.in" />
     <ClCompile Include="..\src\jit\compemu.cpp" />
     <ClCompile Include="..\src\jit\compemu_fpp.cpp" />
@@ -543,6 +621,7 @@
     <ClCompile Include="..\src\osdep\bsdsocket_host.cpp" />
     <ClCompile Include="..\src\osdep\cda_play.cpp" />
     <ClCompile Include="..\src\osdep\charset.cpp" />
+    <ClCompile Include="..\src\osdep\clipboard.cpp" />
     <ClCompile Include="..\src\osdep\fsdb_host.cpp" />
     <ClCompile Include="..\src\osdep\gui\CreateFilesysHardfile.cpp" />
     <ClCompile Include="..\src\osdep\gui\EditFilesysHardfile.cpp" />
@@ -561,6 +640,7 @@
     <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\PanelPrio.cpp" />
     <ClCompile Include="..\src\osdep\gui\PanelQuickstart.cpp" />
     <ClCompile Include="..\src\osdep\gui\PanelRAM.cpp" />
     <ClCompile Include="..\src\osdep\gui\PanelROM.cpp" />
@@ -571,10 +651,6 @@
     <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\amiberry_hardfile.cpp" />
     <ClCompile Include="..\src\osdep\keyboard.cpp" />
     <ClCompile Include="..\src\osdep\mp3decoder.cpp" />
@@ -594,7 +670,9 @@
     <ClCompile Include="..\src\savestate.cpp">
       <DeploymentContent>false</DeploymentContent>
     </ClCompile>
+    <ClCompile Include="..\src\scp.cpp" />
     <ClCompile Include="..\src\scsi.cpp" />
+    <ClCompile Include="..\src\scsiemul.cpp" />
     <ClCompile Include="..\src\sinctable.cpp.in">
       <DeploymentContent>false</DeploymentContent>
     </ClCompile>
@@ -602,15 +680,18 @@
     <ClCompile Include="..\src\statusline.cpp">
       <DeploymentContent>false</DeploymentContent>
     </ClCompile>
+    <ClCompile Include="..\src\tabletlibrary.cpp" />
     <ClCompile Include="..\src\traps.cpp">
       <DeploymentContent>false</DeploymentContent>
     </ClCompile>
+    <ClCompile Include="..\src\uaeexe.cpp" />
     <ClCompile Include="..\src\uaelib.cpp">
       <DeploymentContent>false</DeploymentContent>
     </ClCompile>
     <ClCompile Include="..\src\uaeresource.cpp">
       <DeploymentContent>false</DeploymentContent>
     </ClCompile>
+    <ClCompile Include="..\src\vm.cpp" />
     <ClCompile Include="..\src\zfile.cpp">
       <DeploymentContent>false</DeploymentContent>
     </ClCompile>
@@ -674,9 +755,14 @@
     <ClInclude Include="..\src\include\bsdsocket.h" />
     <ClInclude Include="..\src\include\calc.h" />
     <ClInclude Include="..\src\include\cd32_fmv.h" />
+    <ClInclude Include="..\src\include\cdtv.h" />
+    <ClInclude Include="..\src\include\cdtvcr.h" />
     <ClInclude Include="..\src\include\cia.h" />
+    <ClInclude Include="..\src\include\clipboard.h" />
     <ClInclude Include="..\src\include\commpipe.h" />
+    <ClInclude Include="..\src\include\consolehook.h" />
     <ClInclude Include="..\src\include\cpummu.h" />
+    <ClInclude Include="..\src\include\cpummu030.h" />
     <ClInclude Include="..\src\include\cputbl.h" />
     <ClInclude Include="..\src\include\cpu_prefetch.h" />
     <ClInclude Include="..\src\include\crc32.h" />
@@ -701,6 +787,8 @@
     <ClInclude Include="..\src\include\gui.h" />
     <ClInclude Include="..\src\include\ide.h" />
     <ClInclude Include="..\src\include\inputdevice.h" />
+    <ClInclude Include="..\src\include\isofs.h" />
+    <ClInclude Include="..\src\include\isofs_api.h" />
     <ClInclude Include="..\src\include\keyboard.h" />
     <ClInclude Include="..\src\include\keybuf.h" />
     <ClInclude Include="..\src\include\memory.h" />
@@ -714,11 +802,15 @@
     <ClInclude Include="..\src\include\rtc.h" />
     <ClInclude Include="..\src\include\rtgmodes.h" />
     <ClInclude Include="..\src\include\savestate.h" />
+    <ClInclude Include="..\src\include\scp.h" />
     <ClInclude Include="..\src\include\scsi.h" />
+    <ClInclude Include="..\src\include\scsidev.h" />
     <ClInclude Include="..\src\include\statusline.h" />
     <ClInclude Include="..\src\include\sysdeps.h" />
+    <ClInclude Include="..\src\include\tabletlibrary.h" />
     <ClInclude Include="..\src\include\traps.h" />
     <ClInclude Include="..\src\include\uae.h" />
+    <ClInclude Include="..\src\include\uaeexe.h" />
     <ClInclude Include="..\src\include\uaeresource.h" />
     <ClInclude Include="..\src\include\uae\caps.h" />
     <ClInclude Include="..\src\include\uae\dlopen.h" />
@@ -727,6 +819,7 @@
     <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" />
     <ClInclude Include="..\src\include\zfile.h" />
@@ -746,10 +839,6 @@
     <ClInclude Include="..\src\osdep\config.h" />
     <ClInclude Include="..\src\osdep\gui\gui_handling.h" />
     <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" />
@@ -762,11 +851,21 @@
       <Command>cp ~/projects/Amiberry/amiberry ~/projects/amiberry/</Command>
     </RemotePostBuildEvent>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-rpi4-64|ARM'">
+    <RemotePostBuildEvent>
+      <Command>cp ~/projects/Amiberry/amiberry ~/projects/amiberry/</Command>
+    </RemotePostBuildEvent>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
     <RemotePostBuildEvent>
       <Command>cp ~/projects/Amiberry/amiberry ~/projects/amiberry/</Command>
     </RemotePostBuildEvent>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-rpi4-64|ARM64'">
+    <RemotePostBuildEvent>
+      <Command>cp ~/projects/Amiberry/amiberry ~/projects/amiberry/</Command>
+    </RemotePostBuildEvent>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-xu4|ARM'">
     <RemotePostBuildEvent>
       <Command>cp ~/projects/Amiberry/amiberry ~/projects/amiberry/</Command>
@@ -792,11 +891,21 @@
       <Message>Copy binary to launch location</Message>
     </RemotePostBuildEvent>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-rpi4-64|ARM'">
+    <RemotePostBuildEvent>
+      <Message>Copy binary to launch location</Message>
+    </RemotePostBuildEvent>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
     <RemotePostBuildEvent>
       <Message>Copy binary to launch location</Message>
     </RemotePostBuildEvent>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-rpi4-64|ARM64'">
+    <RemotePostBuildEvent>
+      <Message>Copy binary to launch location</Message>
+    </RemotePostBuildEvent>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-xu4|ARM'">
     <RemotePostBuildEvent>
       <Message>Copy binary to launch location</Message>
@@ -823,12 +932,24 @@
       <Message>Copy binary to launch location</Message>
     </RemotePostBuildEvent>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-rpi4-64|ARM'">
+    <RemotePostBuildEvent>
+      <Command>cp ~/projects/Amiberry/amiberry ~/projects/amiberry/</Command>
+      <Message>Copy binary to launch location</Message>
+    </RemotePostBuildEvent>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
     <RemotePostBuildEvent>
       <Command>cp ~/projects/Amiberry/amiberry ~/projects/amiberry/</Command>
       <Message>Copy binary to launch location</Message>
     </RemotePostBuildEvent>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-rpi4-64|ARM64'">
+    <RemotePostBuildEvent>
+      <Command>cp ~/projects/Amiberry/amiberry ~/projects/amiberry/</Command>
+      <Message>Copy binary to launch location</Message>
+    </RemotePostBuildEvent>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-xu4|ARM'">
     <RemotePostBuildEvent>
       <Command>cp ~/projects/Amiberry/amiberry ~/projects/amiberry/</Command>
diff --git a/VSLinux/Amiberry.vcxproj.filters b/VSLinux/Amiberry.vcxproj.filters
index 38599805..227aae0c 100644
--- a/VSLinux/Amiberry.vcxproj.filters
+++ b/VSLinux/Amiberry.vcxproj.filters
@@ -143,26 +143,20 @@
     <Image Include="..\data\controller.png">
       <Filter>data</Filter>
     </Image>
+    <Image Include="..\data\amiberry.png">
+      <Filter>data</Filter>
+    </Image>
   </ItemGroup>
   <ItemGroup>
-    <Font Include="..\data\Topaznew.ttf">
-      <Filter>data</Filter>
-    </Font>
     <Font Include="..\data\AmigaTopaz.ttf">
       <Filter>data</Filter>
     </Font>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\Makefile" />
-    <None Include="..\src\filesys.asm">
-      <Filter>src</Filter>
-    </None>
     <None Include="..\src\inputevents.def">
       <Filter>src</Filter>
     </None>
-    <None Include="..\src\table68k">
-      <Filter>src</Filter>
-    </None>
     <None Include="..\src\osdep\neon_helper.s">
       <Filter>src\osdep</Filter>
     </None>
@@ -564,18 +558,6 @@
     <ClCompile Include="..\src\osdep\gui\ShowMessage.cpp">
       <Filter>src\osdep\gui</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\osdep\gui\UaeCheckBox.cpp">
-      <Filter>src\osdep\gui</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\osdep\gui\UaeDropDown.cpp">
-      <Filter>src\osdep\gui</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\osdep\gui\UaeListBox.cpp">
-      <Filter>src\osdep\gui</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\osdep\gui\UaeRadioButton.cpp">
-      <Filter>src\osdep\gui</Filter>
-    </ClCompile>
     <ClCompile Include="..\src\sounddep\sound.cpp">
       <Filter>src\sounddep</Filter>
     </ClCompile>
@@ -741,6 +723,39 @@
     <ClCompile Include="..\src\caps\caps_amiberry.cpp">
       <Filter>src\caps</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\cdtv.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\cdtvcr.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\consolehook.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\isofs.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\scp.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\scsiemul.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\tabletlibrary.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\uaeexe.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\vm.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\osdep\clipboard.cpp">
+      <Filter>src\osdep</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\osdep\gui\PanelPrio.cpp">
+      <Filter>src\osdep\gui</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\src\archivers\7z\7zBuf.h">
@@ -1004,18 +1019,6 @@
     <ClInclude Include="..\src\osdep\gui\SelectorEntry.hpp">
       <Filter>src\osdep\gui</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\osdep\gui\UaeCheckBox.hpp">
-      <Filter>src\osdep\gui</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\osdep\gui\UaeDropDown.hpp">
-      <Filter>src\osdep\gui</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\osdep\gui\UaeListBox.hpp">
-      <Filter>src\osdep\gui</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\osdep\gui\UaeRadioButton.hpp">
-      <Filter>src\osdep\gui</Filter>
-    </ClInclude>
     <ClInclude Include="..\src\sounddep\sound.h">
       <Filter>src\sounddep</Filter>
     </ClInclude>
@@ -1154,5 +1157,41 @@
     <ClInclude Include="..\src\jit\codegen_armA64.h">
       <Filter>src\jit</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\include\uae\vm.h">
+      <Filter>src\include\uae</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\cdtv.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\cdtvcr.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\clipboard.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\consolehook.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\cpummu030.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\isofs.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\isofs_api.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\scp.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\tabletlibrary.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\uaeexe.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\scsidev.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/VSLinux/Amiberry.vcxproj.user b/VSLinux/Amiberry.vcxproj.user
index f25b9741..b3e4ac89 100644
--- a/VSLinux/Amiberry.vcxproj.user
+++ b/VSLinux/Amiberry.vcxproj.user
@@ -6,6 +6,14 @@
     <DebuggerFlavor>LinuxDebugger</DebuggerFlavor>
     <PreLaunchCommand>
     </PreLaunchCommand>
+    <RemoteTarget>-1706257654;argon (username=, port=22, authentication=Password)</RemoteTarget>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-rpi4-64|ARM'">
+    <RemoteDebuggerCommand>~/projects/amiberry/amiberry</RemoteDebuggerCommand>
+    <RemoteDebuggerWorkingDirectory>~/projects/amiberry</RemoteDebuggerWorkingDirectory>
+    <DebuggerFlavor>LinuxDebugger</DebuggerFlavor>
+    <PreLaunchCommand />
+    <RemoteTarget>-1706257654;argon (username=, port=22, authentication=Password)</RemoteTarget>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
     <RemoteDebuggerCommand>/home/pi/projects/amiberry/amiberry</RemoteDebuggerCommand>
@@ -13,6 +21,12 @@
     <DebuggerFlavor>LinuxDebugger</DebuggerFlavor>
     <PreLaunchCommand />
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-rpi4-64|ARM64'">
+    <RemoteDebuggerCommand>/home/pi/projects/amiberry/amiberry</RemoteDebuggerCommand>
+    <RemoteDebuggerWorkingDirectory>/home/pi/projects/amiberry</RemoteDebuggerWorkingDirectory>
+    <DebuggerFlavor>LinuxDebugger</DebuggerFlavor>
+    <PreLaunchCommand />
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-xu4|ARM'">
     <RemoteDebuggerCommand>/home/pigaming/projects/Amiberry/amiberry-xu4</RemoteDebuggerCommand>
     <RemoteDebuggerWorkingDirectory>/home/pigaming/projects/Amiberry</RemoteDebuggerWorkingDirectory>
@@ -33,12 +47,24 @@
     <DebuggerFlavor>LinuxDebugger</DebuggerFlavor>
     <PreLaunchCommand>export DEBUG=0</PreLaunchCommand>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-rpi4-64|ARM'">
+    <RemoteDebuggerCommand>projects/amiberry/amiberry-sdl2-dev</RemoteDebuggerCommand>
+    <RemoteDebuggerWorkingDirectory>projects/amiberry</RemoteDebuggerWorkingDirectory>
+    <DebuggerFlavor>LinuxDebugger</DebuggerFlavor>
+    <PreLaunchCommand>export DEBUG=0</PreLaunchCommand>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
     <RemoteDebuggerCommand>projects/amiberry/amiberry-sdl2-dev</RemoteDebuggerCommand>
     <RemoteDebuggerWorkingDirectory>projects/amiberry</RemoteDebuggerWorkingDirectory>
     <DebuggerFlavor>LinuxDebugger</DebuggerFlavor>
     <PreLaunchCommand>export DEBUG=0</PreLaunchCommand>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-rpi4-64|ARM64'">
+    <RemoteDebuggerCommand>projects/amiberry/amiberry-sdl2-dev</RemoteDebuggerCommand>
+    <RemoteDebuggerWorkingDirectory>projects/amiberry</RemoteDebuggerWorkingDirectory>
+    <DebuggerFlavor>LinuxDebugger</DebuggerFlavor>
+    <PreLaunchCommand>export DEBUG=0</PreLaunchCommand>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-xu4|ARM'">
     <RemoteDebuggerCommand>projects/amiberry/amiberry-sdl2-dev</RemoteDebuggerCommand>
     <RemoteDebuggerWorkingDirectory>projects/amiberry</RemoteDebuggerWorkingDirectory>
diff --git a/VSLinux/guisan/guisan.vcxproj b/VSLinux/guisan/guisan.vcxproj
index 80dbfeea..eb8dcf54 100644
--- a/VSLinux/guisan/guisan.vcxproj
+++ b/VSLinux/guisan/guisan.vcxproj
@@ -17,6 +17,22 @@
       <Configuration>Debug-rockpro64</Configuration>
       <Platform>x86</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug-rpi4-64|ARM">
+      <Configuration>Debug-rpi4-64</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug-rpi4-64|ARM64">
+      <Configuration>Debug-rpi4-64</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug-rpi4-64|x64">
+      <Configuration>Debug-rpi4-64</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug-rpi4-64|x86">
+      <Configuration>Debug-rpi4-64</Configuration>
+      <Platform>x86</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug-xu4|ARM">
       <Configuration>Debug-xu4</Configuration>
       <Platform>ARM</Platform>
@@ -41,6 +57,22 @@
       <Configuration>Debug</Configuration>
       <Platform>ARM64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-rpi4-64|ARM">
+      <Configuration>Release-rpi4-64</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-rpi4-64|ARM64">
+      <Configuration>Release-rpi4-64</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-rpi4-64|x64">
+      <Configuration>Release-rpi4-64</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-rpi4-64|x86">
+      <Configuration>Release-rpi4-64</Configuration>
+      <Platform>x86</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release-xu4|ARM">
       <Configuration>Release-xu4</Configuration>
       <Platform>ARM</Platform>
@@ -98,11 +130,21 @@
     <ConfigurationType>Makefile</ConfigurationType>
     <RemoteRootDir>~/projects/Amiberry/src</RemoteRootDir>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-rpi4-64|ARM'" Label="Configuration">
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <ConfigurationType>Makefile</ConfigurationType>
+    <RemoteRootDir>~/projects/Amiberry/src</RemoteRootDir>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
     <UseDebugLibraries>true</UseDebugLibraries>
     <ConfigurationType>Makefile</ConfigurationType>
     <RemoteRootDir>~/projects/Amiberry/src</RemoteRootDir>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-rpi4-64|ARM64'" Label="Configuration">
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <ConfigurationType>Makefile</ConfigurationType>
+    <RemoteRootDir>~/projects/Amiberry/src</RemoteRootDir>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-xu4|ARM'" Label="Configuration">
     <UseDebugLibraries>true</UseDebugLibraries>
     <ConfigurationType>Makefile</ConfigurationType>
@@ -128,11 +170,21 @@
     <ConfigurationType>Makefile</ConfigurationType>
     <RemoteRootDir>~/projects/Amiberry/src</RemoteRootDir>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-rpi4-64|ARM'" Label="Configuration">
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <ConfigurationType>Makefile</ConfigurationType>
+    <RemoteRootDir>~/projects/Amiberry/src</RemoteRootDir>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
     <UseDebugLibraries>false</UseDebugLibraries>
     <ConfigurationType>Makefile</ConfigurationType>
     <RemoteRootDir>~/projects/Amiberry/src</RemoteRootDir>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-rpi4-64|ARM64'" Label="Configuration">
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <ConfigurationType>Makefile</ConfigurationType>
+    <RemoteRootDir>~/projects/Amiberry/src</RemoteRootDir>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-xu4|ARM'" Label="Configuration">
     <UseDebugLibraries>false</UseDebugLibraries>
     <ConfigurationType>Makefile</ConfigurationType>
@@ -147,6 +199,10 @@
     <UseDebugLibraries>true</UseDebugLibraries>
     <ConfigurationType>Makefile</ConfigurationType>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-rpi4-64|x86'" Label="Configuration">
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <ConfigurationType>Makefile</ConfigurationType>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-xu4|x86'" Label="Configuration">
     <UseDebugLibraries>true</UseDebugLibraries>
     <ConfigurationType>Makefile</ConfigurationType>
@@ -159,6 +215,10 @@
     <UseDebugLibraries>false</UseDebugLibraries>
     <ConfigurationType>Makefile</ConfigurationType>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-rpi4-64|x86'" Label="Configuration">
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <ConfigurationType>Makefile</ConfigurationType>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-xu4|x86'" Label="Configuration">
     <UseDebugLibraries>false</UseDebugLibraries>
     <ConfigurationType>Makefile</ConfigurationType>
@@ -167,6 +227,10 @@
     <UseDebugLibraries>true</UseDebugLibraries>
     <ConfigurationType>Makefile</ConfigurationType>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-rpi4-64|x64'" Label="Configuration">
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <ConfigurationType>Makefile</ConfigurationType>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-xu4|x64'" Label="Configuration">
     <UseDebugLibraries>true</UseDebugLibraries>
     <ConfigurationType>Makefile</ConfigurationType>
@@ -179,6 +243,10 @@
     <UseDebugLibraries>false</UseDebugLibraries>
     <ConfigurationType>Makefile</ConfigurationType>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-rpi4-64|x64'" Label="Configuration">
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <ConfigurationType>Makefile</ConfigurationType>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-xu4|x64'" Label="Configuration">
     <UseDebugLibraries>false</UseDebugLibraries>
     <ConfigurationType>Makefile</ConfigurationType>
@@ -189,200 +257,226 @@
   <ImportGroup Label="PropertySheets" />
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
-    <RemoteBuildCommandLine>cd ~/projects/Amiberry/guisan-dev/; make all</RemoteBuildCommandLine>
-    <RemoteCleanCommandLine>cd ~/projects/Amiberry/guisan-dev/; make clean</RemoteCleanCommandLine>
-    <RemoteReBuildCommandLine>cd ~/projects/Amiberry/guisan-dev/; make clean; make all</RemoteReBuildCommandLine>
+    <RemoteBuildCommandLine>cd ~/projects/Amiberry/external/libguisan/; make all</RemoteBuildCommandLine>
+    <RemoteCleanCommandLine>cd ~/projects/Amiberry/external/libguisan/; make clean</RemoteCleanCommandLine>
+    <RemoteReBuildCommandLine>cd ~/projects/Amiberry/external/libguisan/; make clean; make all</RemoteReBuildCommandLine>
+    <NMakeIncludeSearchPath>C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\SDL2;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
+    <RemoteProjectDir>$(RemoteRootDir)/$(ProjectName)-dev</RemoteProjectDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-rpi4-64|ARM'">
+    <RemoteBuildCommandLine>cd ~/projects/Amiberry/external/libguisan/; make all</RemoteBuildCommandLine>
+    <RemoteCleanCommandLine>cd ~/projects/Amiberry/external/libguisan/; make clean</RemoteCleanCommandLine>
+    <RemoteReBuildCommandLine>cd ~/projects/Amiberry/external/libguisan/; make clean; make all</RemoteReBuildCommandLine>
     <NMakeIncludeSearchPath>C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\SDL2;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
     <RemoteProjectDir>$(RemoteRootDir)/$(ProjectName)-dev</RemoteProjectDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
-    <RemoteBuildCommandLine>cd ~/projects/Amiberry/guisan-dev/; make all</RemoteBuildCommandLine>
-    <RemoteCleanCommandLine>cd ~/projects/Amiberry/guisan-dev/; make clean</RemoteCleanCommandLine>
-    <RemoteReBuildCommandLine>cd ~/projects/Amiberry/guisan-dev/; make clean; make all</RemoteReBuildCommandLine>
+    <RemoteBuildCommandLine>cd ~/projects/Amiberry/external/libguisan/; make all</RemoteBuildCommandLine>
+    <RemoteCleanCommandLine>cd ~/projects/Amiberry/external/libguisan/; make clean</RemoteCleanCommandLine>
+    <RemoteReBuildCommandLine>cd ~/projects/Amiberry/external/libguisan/; make clean; make all</RemoteReBuildCommandLine>
+    <NMakeIncludeSearchPath>C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\SDL2;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
+    <RemoteProjectDir>$(RemoteRootDir)/$(ProjectName)-dev</RemoteProjectDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-rpi4-64|ARM64'">
+    <RemoteBuildCommandLine>cd ~/projects/Amiberry/external/libguisan/; make all</RemoteBuildCommandLine>
+    <RemoteCleanCommandLine>cd ~/projects/Amiberry/external/libguisan/; make clean</RemoteCleanCommandLine>
+    <RemoteReBuildCommandLine>cd ~/projects/Amiberry/external/libguisan/; make clean; make all</RemoteReBuildCommandLine>
     <NMakeIncludeSearchPath>C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\SDL2;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
     <RemoteProjectDir>$(RemoteRootDir)/$(ProjectName)-dev</RemoteProjectDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-xu4|ARM'">
-    <RemoteBuildCommandLine>cd ~/projects/Amiberry/guisan-dev/; make all</RemoteBuildCommandLine>
-    <RemoteCleanCommandLine>cd ~/projects/Amiberry/guisan-dev/; make clean</RemoteCleanCommandLine>
-    <RemoteReBuildCommandLine>cd ~/projects/Amiberry/guisan-dev/; make clean; make all</RemoteReBuildCommandLine>
+    <RemoteBuildCommandLine>cd ~/projects/Amiberry/external/libguisan/; make all</RemoteBuildCommandLine>
+    <RemoteCleanCommandLine>cd ~/projects/Amiberry/external/libguisan/; make clean</RemoteCleanCommandLine>
+    <RemoteReBuildCommandLine>cd ~/projects/Amiberry/external/libguisan/; make clean; make all</RemoteReBuildCommandLine>
     <NMakeIncludeSearchPath>C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\SDL2;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
     <RemoteProjectDir>$(RemoteRootDir)/$(ProjectName)-dev</RemoteProjectDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-xu4|ARM64'">
-    <RemoteBuildCommandLine>cd ~/projects/Amiberry/guisan-dev/; make all</RemoteBuildCommandLine>
-    <RemoteCleanCommandLine>cd ~/projects/Amiberry/guisan-dev/; make clean</RemoteCleanCommandLine>
-    <RemoteReBuildCommandLine>cd ~/projects/Amiberry/guisan-dev/; make clean; make all</RemoteReBuildCommandLine>
+    <RemoteBuildCommandLine>cd ~/projects/Amiberry/external/libguisan/; make all</RemoteBuildCommandLine>
+    <RemoteCleanCommandLine>cd ~/projects/Amiberry/external/libguisan/; make clean</RemoteCleanCommandLine>
+    <RemoteReBuildCommandLine>cd ~/projects/Amiberry/external/libguisan/; make clean; make all</RemoteReBuildCommandLine>
     <NMakeIncludeSearchPath>C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\SDL2;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
     <RemoteProjectDir>$(RemoteRootDir)/$(ProjectName)-dev</RemoteProjectDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-rockpro64|ARM'">
-    <RemoteBuildCommandLine>cd ~/projects/Amiberry/guisan-dev/; make all</RemoteBuildCommandLine>
-    <RemoteCleanCommandLine>cd ~/projects/Amiberry/guisan-dev/; make clean</RemoteCleanCommandLine>
-    <RemoteReBuildCommandLine>cd ~/projects/Amiberry/guisan-dev/; make clean; make all</RemoteReBuildCommandLine>
+    <RemoteBuildCommandLine>cd ~/projects/Amiberry/external/libguisan/; make all</RemoteBuildCommandLine>
+    <RemoteCleanCommandLine>cd ~/projects/Amiberry/external/libguisan/; make clean</RemoteCleanCommandLine>
+    <RemoteReBuildCommandLine>cd ~/projects/Amiberry/external/libguisan/; make clean; make all</RemoteReBuildCommandLine>
     <NMakeIncludeSearchPath>C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\SDL2;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
     <RemoteProjectDir>$(RemoteRootDir)/$(ProjectName)-dev</RemoteProjectDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-rockpro64|ARM64'">
-    <RemoteBuildCommandLine>cd ~/projects/Amiberry/guisan-dev/; make all</RemoteBuildCommandLine>
-    <RemoteCleanCommandLine>cd ~/projects/Amiberry/guisan-dev/; make clean</RemoteCleanCommandLine>
-    <RemoteReBuildCommandLine>cd ~/projects/Amiberry/guisan-dev/; make clean; make all</RemoteReBuildCommandLine>
+    <RemoteBuildCommandLine>cd ~/projects/Amiberry/external/libguisan/; make all</RemoteBuildCommandLine>
+    <RemoteCleanCommandLine>cd ~/projects/Amiberry/external/libguisan/; make clean</RemoteCleanCommandLine>
+    <RemoteReBuildCommandLine>cd ~/projects/Amiberry/external/libguisan/; make clean; make all</RemoteReBuildCommandLine>
     <NMakeIncludeSearchPath>C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\SDL2;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
     <RemoteProjectDir>$(RemoteRootDir)/$(ProjectName)-dev</RemoteProjectDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
-    <RemoteBuildCommandLine>cd ~/projects/Amiberry-sdl2/guisan-dev/; make all</RemoteBuildCommandLine>
-    <RemoteReBuildCommandLine>cd ~/projects/Amiberry-sdl2/guisan-dev/; make clean; make all</RemoteReBuildCommandLine>
-    <RemoteCleanCommandLine>cd ~/projects/Amiberry-sdl2/guisan-dev/; make clean</RemoteCleanCommandLine>
+    <RemoteBuildCommandLine>cd ~/projects/Amiberry-sdl2/external/libguisan/; make all</RemoteBuildCommandLine>
+    <RemoteReBuildCommandLine>cd ~/projects/Amiberry-sdl2/external/libguisan/; make clean; make all</RemoteReBuildCommandLine>
+    <RemoteCleanCommandLine>cd ~/projects/Amiberry-sdl2/external/libguisan/; make clean</RemoteCleanCommandLine>
+    <RemoteProjectDir>$(RemoteRootDir)/$(ProjectName)-dev</RemoteProjectDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-rpi4-64|ARM'">
+    <RemoteBuildCommandLine>cd ~/projects/Amiberry-sdl2/external/libguisan/; make all</RemoteBuildCommandLine>
+    <RemoteReBuildCommandLine>cd ~/projects/Amiberry-sdl2/external/libguisan/; make clean; make all</RemoteReBuildCommandLine>
+    <RemoteCleanCommandLine>cd ~/projects/Amiberry-sdl2/external/libguisan/; make clean</RemoteCleanCommandLine>
     <RemoteProjectDir>$(RemoteRootDir)/$(ProjectName)-dev</RemoteProjectDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
-    <RemoteBuildCommandLine>cd ~/projects/Amiberry-sdl2/guisan-dev/; make all</RemoteBuildCommandLine>
-    <RemoteReBuildCommandLine>cd ~/projects/Amiberry-sdl2/guisan-dev/; make clean; make all</RemoteReBuildCommandLine>
-    <RemoteCleanCommandLine>cd ~/projects/Amiberry-sdl2/guisan-dev/; make clean</RemoteCleanCommandLine>
+    <RemoteBuildCommandLine>cd ~/projects/Amiberry-sdl2/external/libguisan/; make all</RemoteBuildCommandLine>
+    <RemoteReBuildCommandLine>cd ~/projects/Amiberry-sdl2/external/libguisan/; make clean; make all</RemoteReBuildCommandLine>
+    <RemoteCleanCommandLine>cd ~/projects/Amiberry-sdl2/external/libguisan/; make clean</RemoteCleanCommandLine>
+    <RemoteProjectDir>$(RemoteRootDir)/$(ProjectName)-dev</RemoteProjectDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-rpi4-64|ARM64'">
+    <RemoteBuildCommandLine>cd ~/projects/Amiberry-sdl2/external/libguisan/; make all</RemoteBuildCommandLine>
+    <RemoteReBuildCommandLine>cd ~/projects/Amiberry-sdl2/external/libguisan/; make clean; make all</RemoteReBuildCommandLine>
+    <RemoteCleanCommandLine>cd ~/projects/Amiberry-sdl2/external/libguisan/; make clean</RemoteCleanCommandLine>
     <RemoteProjectDir>$(RemoteRootDir)/$(ProjectName)-dev</RemoteProjectDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-xu4|ARM'">
-    <RemoteBuildCommandLine>cd ~/projects/Amiberry-sdl2/guisan-dev/; make all</RemoteBuildCommandLine>
-    <RemoteReBuildCommandLine>cd ~/projects/Amiberry-sdl2/guisan-dev/; make clean; make all</RemoteReBuildCommandLine>
-    <RemoteCleanCommandLine>cd ~/projects/Amiberry-sdl2/guisan-dev/; make clean</RemoteCleanCommandLine>
+    <RemoteBuildCommandLine>cd ~/projects/Amiberry-sdl2/external/libguisan/; make all</RemoteBuildCommandLine>
+    <RemoteReBuildCommandLine>cd ~/projects/Amiberry-sdl2/external/libguisan/; make clean; make all</RemoteReBuildCommandLine>
+    <RemoteCleanCommandLine>cd ~/projects/Amiberry-sdl2/external/libguisan/; make clean</RemoteCleanCommandLine>
     <RemoteProjectDir>$(RemoteRootDir)/$(ProjectName)-dev</RemoteProjectDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-xu4|ARM64'">
-    <RemoteBuildCommandLine>cd ~/projects/Amiberry-sdl2/guisan-dev/; make all</RemoteBuildCommandLine>
-    <RemoteReBuildCommandLine>cd ~/projects/Amiberry-sdl2/guisan-dev/; make clean; make all</RemoteReBuildCommandLine>
-    <RemoteCleanCommandLine>cd ~/projects/Amiberry-sdl2/guisan-dev/; make clean</RemoteCleanCommandLine>
+    <RemoteBuildCommandLine>cd ~/projects/Amiberry-sdl2/external/libguisan/; make all</RemoteBuildCommandLine>
+    <RemoteReBuildCommandLine>cd ~/projects/Amiberry-sdl2/external/libguisan/; make clean; make all</RemoteReBuildCommandLine>
+    <RemoteCleanCommandLine>cd ~/projects/Amiberry-sdl2/external/libguisan/; make clean</RemoteCleanCommandLine>
     <RemoteProjectDir>$(RemoteRootDir)/$(ProjectName)-dev</RemoteProjectDir>
   </PropertyGroup>
   <ItemGroup>
-    <None Include="..\..\guisan-dev\lib\.keep">
+    <None Include="..\..\external\libguisan\lib\.keep">
       <DeploymentContent>true</DeploymentContent>
     </None>
-    <None Include="..\..\guisan-dev\Makefile" />
+    <None Include="..\..\external\libguisan\Makefile" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\guisan-dev\include\guisan.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\actionevent.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\actionlistener.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\basiccontainer.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\cliprectangle.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\color.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\deathlistener.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\defaultfont.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\event.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\exception.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\focushandler.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\focuslistener.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\font.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\genericinput.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\glut.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\graphics.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\gui.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\image.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\imagefont.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\imageloader.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\input.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\inputevent.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\key.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\keyevent.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\keyinput.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\keylistener.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\listmodel.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\mouseevent.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\mouseinput.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\mouselistener.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\opengl.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\opengl\openglgraphics.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\opengl\openglimage.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\opengl\openglsdlimageloader.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\platform.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\rectangle.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\sdl.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\sdl\sdl2graphics.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\sdl\sdlgraphics.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\sdl\sdlimage.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\sdl\sdlimageloader.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\sdl\sdlinput.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\sdl\sdlpixel.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\sdl\sdltruetypefont.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\selectionevent.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\selectionlistener.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widget.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgetlistener.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\button.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\checkbox.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\container.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\dropdown.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\icon.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\imagebutton.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\imagetextbutton.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\inputbox.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\label.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\listbox.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\messagebox.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\progressbar.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\radiobutton.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\scrollarea.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\slider.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\tab.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\tabbedarea.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\textbox.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\textfield.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\window.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\x.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\actionevent.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\actionlistener.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\basiccontainer.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\cliprectangle.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\color.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\deathlistener.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\defaultfont.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\event.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\exception.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\focushandler.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\focuslistener.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\font.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\genericinput.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\glut.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\graphics.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\gui.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\image.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\imagefont.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\imageloader.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\input.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\inputevent.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\key.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\keyevent.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\keyinput.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\keylistener.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\listmodel.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\mouseevent.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\mouseinput.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\mouselistener.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\opengl.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\opengl\openglgraphics.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\opengl\openglimage.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\opengl\openglsdlimageloader.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\platform.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\rectangle.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\sdl.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\sdl\sdl2graphics.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\sdl\sdlgraphics.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\sdl\sdlimage.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\sdl\sdlimageloader.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\sdl\sdlinput.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\sdl\sdlpixel.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\sdl\sdltruetypefont.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\selectionevent.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\selectionlistener.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widget.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgetlistener.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\button.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\checkbox.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\container.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\dropdown.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\icon.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\imagebutton.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\imagetextbutton.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\inputbox.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\label.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\listbox.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\messagebox.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\progressbar.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\radiobutton.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\scrollarea.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\slider.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\tab.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\tabbedarea.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\textbox.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\textfield.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\window.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\x.hpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\guisan-dev\src\actionevent.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\basiccontainer.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\cliprectangle.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\color.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\defaultfont.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\event.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\exception.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\focushandler.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\font.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\genericinput.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\graphics.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\gui.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\guisan.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\image.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\imagefont.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\inputevent.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\key.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\keyevent.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\keyinput.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\mouseevent.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\mouseinput.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\opengl\opengl.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\opengl\openglgraphics.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\opengl\openglimage.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\rectangle.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\sdl\sdl.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\sdl\sdl2graphics.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\sdl\sdlgraphics.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\sdl\sdlimage.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\sdl\sdlimageloader.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\sdl\sdlinput.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\sdl\sdltruetypefont.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\selectionevent.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\widget.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\widgets\button.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\widgets\checkbox.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\widgets\container.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\widgets\dropdown.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\widgets\icon.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\widgets\imagebutton.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\widgets\label.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\widgets\listbox.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\widgets\progressbar.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\widgets\radiobutton.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\widgets\scrollarea.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\widgets\slider.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\widgets\tab.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\widgets\tabbedarea.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\widgets\textbox.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\widgets\textfield.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\widgets\window.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\actionevent.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\basiccontainer.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\cliprectangle.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\color.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\defaultfont.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\event.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\exception.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\focushandler.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\font.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\genericinput.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\graphics.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\gui.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\guisan.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\image.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\imagefont.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\inputevent.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\key.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\keyevent.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\keyinput.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\mouseevent.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\mouseinput.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\opengl\opengl.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\opengl\openglgraphics.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\opengl\openglimage.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\rectangle.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\sdl\sdl.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\sdl\sdl2graphics.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\sdl\sdlgraphics.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\sdl\sdlimage.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\sdl\sdlimageloader.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\sdl\sdlinput.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\sdl\sdltruetypefont.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\selectionevent.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widget.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\button.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\checkbox.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\container.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\dropdown.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\icon.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\imagebutton.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\label.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\listbox.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\progressbar.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\radiobutton.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\scrollarea.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\slider.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\tab.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\tabbedarea.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\textbox.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\textfield.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\window.cpp" />
   </ItemGroup>
   <ItemDefinitionGroup />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/VSLinux/guisan/guisan.vcxproj.filters b/VSLinux/guisan/guisan.vcxproj.filters
index 29ff7ed1..2c853dbb 100644
--- a/VSLinux/guisan/guisan.vcxproj.filters
+++ b/VSLinux/guisan/guisan.vcxproj.filters
@@ -33,373 +33,131 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\guisan-dev\lib\.keep">
-      <Filter>lib</Filter>
-    </None>
-    <None Include="..\..\guisan-dev\Makefile" />
+    <None Include="..\..\external\libguisan\lib\.keep" />
+    <None Include="..\..\external\libguisan\Makefile" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\guisan-dev\include\guisan.hpp">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\actionevent.hpp">
-      <Filter>include\guisan</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\actionlistener.hpp">
-      <Filter>include\guisan</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\basiccontainer.hpp">
-      <Filter>include\guisan</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\cliprectangle.hpp">
-      <Filter>include\guisan</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\color.hpp">
-      <Filter>include\guisan</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\deathlistener.hpp">
-      <Filter>include\guisan</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\defaultfont.hpp">
-      <Filter>include\guisan</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\event.hpp">
-      <Filter>include\guisan</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\exception.hpp">
-      <Filter>include\guisan</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\focushandler.hpp">
-      <Filter>include\guisan</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\focuslistener.hpp">
-      <Filter>include\guisan</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\font.hpp">
-      <Filter>include\guisan</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\genericinput.hpp">
-      <Filter>include\guisan</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\glut.hpp">
-      <Filter>include\guisan</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\graphics.hpp">
-      <Filter>include\guisan</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\gui.hpp">
-      <Filter>include\guisan</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\image.hpp">
-      <Filter>include\guisan</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\imagefont.hpp">
-      <Filter>include\guisan</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\imageloader.hpp">
-      <Filter>include\guisan</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\input.hpp">
-      <Filter>include\guisan</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\inputevent.hpp">
-      <Filter>include\guisan</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\key.hpp">
-      <Filter>include\guisan</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\keyevent.hpp">
-      <Filter>include\guisan</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\keyinput.hpp">
-      <Filter>include\guisan</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\keylistener.hpp">
-      <Filter>include\guisan</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\listmodel.hpp">
-      <Filter>include\guisan</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\mouseevent.hpp">
-      <Filter>include\guisan</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\mouseinput.hpp">
-      <Filter>include\guisan</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\mouselistener.hpp">
-      <Filter>include\guisan</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\opengl.hpp">
-      <Filter>include\guisan</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\platform.hpp">
-      <Filter>include\guisan</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\rectangle.hpp">
-      <Filter>include\guisan</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\sdl.hpp">
-      <Filter>include\guisan</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\selectionevent.hpp">
-      <Filter>include\guisan</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\selectionlistener.hpp">
-      <Filter>include\guisan</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widget.hpp">
-      <Filter>include\guisan</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgetlistener.hpp">
-      <Filter>include\guisan</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\x.hpp">
-      <Filter>include\guisan</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\opengl\openglgraphics.hpp">
-      <Filter>include\guisan\opengl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\opengl\openglimage.hpp">
-      <Filter>include\guisan\opengl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\opengl\openglsdlimageloader.hpp">
-      <Filter>include\guisan\opengl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\sdl\sdlgraphics.hpp">
-      <Filter>include\guisan\sdl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\sdl\sdlimage.hpp">
-      <Filter>include\guisan\sdl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\sdl\sdlimageloader.hpp">
-      <Filter>include\guisan\sdl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\sdl\sdlinput.hpp">
-      <Filter>include\guisan\sdl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\sdl\sdlpixel.hpp">
-      <Filter>include\guisan\sdl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\sdl\sdltruetypefont.hpp">
-      <Filter>include\guisan\sdl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\button.hpp">
-      <Filter>include\guisan\widgets</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\checkbox.hpp">
-      <Filter>include\guisan\widgets</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\container.hpp">
-      <Filter>include\guisan\widgets</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\dropdown.hpp">
-      <Filter>include\guisan\widgets</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\icon.hpp">
-      <Filter>include\guisan\widgets</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\imagebutton.hpp">
-      <Filter>include\guisan\widgets</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\label.hpp">
-      <Filter>include\guisan\widgets</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\listbox.hpp">
-      <Filter>include\guisan\widgets</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\radiobutton.hpp">
-      <Filter>include\guisan\widgets</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\scrollarea.hpp">
-      <Filter>include\guisan\widgets</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\slider.hpp">
-      <Filter>include\guisan\widgets</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\tab.hpp">
-      <Filter>include\guisan\widgets</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\tabbedarea.hpp">
-      <Filter>include\guisan\widgets</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\textbox.hpp">
-      <Filter>include\guisan\widgets</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\textfield.hpp">
-      <Filter>include\guisan\widgets</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\window.hpp">
-      <Filter>include\guisan\widgets</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\progressbar.hpp">
-      <Filter>include\guisan\widgets</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\imagetextbutton.hpp">
-      <Filter>include\guisan\widgets</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\inputbox.hpp">
-      <Filter>include\guisan\widgets</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\messagebox.hpp">
-      <Filter>include\guisan\widgets</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\sdl\sdl2graphics.hpp">
-      <Filter>include\guisan\sdl</Filter>
-    </ClInclude>
+    <ClInclude Include="..\..\external\libguisan\include\guisan.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\actionevent.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\actionlistener.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\basiccontainer.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\cliprectangle.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\color.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\deathlistener.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\defaultfont.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\event.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\exception.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\focushandler.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\focuslistener.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\font.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\genericinput.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\glut.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\graphics.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\gui.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\image.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\imagefont.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\imageloader.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\input.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\inputevent.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\key.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\keyevent.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\keyinput.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\keylistener.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\listmodel.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\mouseevent.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\mouseinput.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\mouselistener.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\opengl.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\opengl\openglgraphics.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\opengl\openglimage.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\opengl\openglsdlimageloader.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\platform.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\rectangle.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\sdl.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\sdl\sdl2graphics.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\sdl\sdlgraphics.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\sdl\sdlimage.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\sdl\sdlimageloader.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\sdl\sdlinput.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\sdl\sdlpixel.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\sdl\sdltruetypefont.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\selectionevent.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\selectionlistener.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widget.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgetlistener.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\button.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\checkbox.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\container.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\dropdown.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\icon.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\imagebutton.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\imagetextbutton.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\inputbox.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\label.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\listbox.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\messagebox.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\progressbar.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\radiobutton.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\scrollarea.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\slider.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\tab.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\tabbedarea.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\textbox.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\textfield.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\window.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\x.hpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\guisan-dev\src\actionevent.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\basiccontainer.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\cliprectangle.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\color.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\defaultfont.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\event.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\exception.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\focushandler.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\font.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\genericinput.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\graphics.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\gui.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\image.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\imagefont.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\inputevent.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\key.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\keyevent.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\keyinput.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\mouseevent.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\mouseinput.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\rectangle.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\selectionevent.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\widget.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\opengl\opengl.cpp">
-      <Filter>src\opengl</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\opengl\openglgraphics.cpp">
-      <Filter>src\opengl</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\opengl\openglimage.cpp">
-      <Filter>src\opengl</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\sdl\sdl.cpp">
-      <Filter>src\sdl</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\sdl\sdlgraphics.cpp">
-      <Filter>src\sdl</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\sdl\sdlimage.cpp">
-      <Filter>src\sdl</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\sdl\sdlimageloader.cpp">
-      <Filter>src\sdl</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\sdl\sdlinput.cpp">
-      <Filter>src\sdl</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\sdl\sdltruetypefont.cpp">
-      <Filter>src\sdl</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\widgets\button.cpp">
-      <Filter>src\widgets</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\widgets\checkbox.cpp">
-      <Filter>src\widgets</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\widgets\container.cpp">
-      <Filter>src\widgets</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\widgets\dropdown.cpp">
-      <Filter>src\widgets</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\widgets\icon.cpp">
-      <Filter>src\widgets</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\widgets\imagebutton.cpp">
-      <Filter>src\widgets</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\widgets\label.cpp">
-      <Filter>src\widgets</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\widgets\listbox.cpp">
-      <Filter>src\widgets</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\widgets\radiobutton.cpp">
-      <Filter>src\widgets</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\widgets\scrollarea.cpp">
-      <Filter>src\widgets</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\widgets\slider.cpp">
-      <Filter>src\widgets</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\widgets\tab.cpp">
-      <Filter>src\widgets</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\widgets\tabbedarea.cpp">
-      <Filter>src\widgets</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\widgets\textbox.cpp">
-      <Filter>src\widgets</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\widgets\textfield.cpp">
-      <Filter>src\widgets</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\widgets\window.cpp">
-      <Filter>src\widgets</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\widgets\progressbar.cpp">
-      <Filter>src\widgets</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\guisan.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\sdl\sdl2graphics.cpp">
-      <Filter>src\sdl</Filter>
-    </ClCompile>
+    <ClCompile Include="..\..\external\libguisan\src\actionevent.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\basiccontainer.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\cliprectangle.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\color.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\defaultfont.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\event.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\exception.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\focushandler.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\font.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\genericinput.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\graphics.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\gui.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\guisan.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\image.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\imagefont.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\inputevent.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\key.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\keyevent.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\keyinput.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\mouseevent.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\mouseinput.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\opengl\opengl.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\opengl\openglgraphics.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\opengl\openglimage.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\rectangle.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\sdl\sdl.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\sdl\sdl2graphics.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\sdl\sdlgraphics.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\sdl\sdlimage.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\sdl\sdlimageloader.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\sdl\sdlinput.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\sdl\sdltruetypefont.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\selectionevent.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widget.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\button.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\checkbox.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\container.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\dropdown.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\icon.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\imagebutton.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\label.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\listbox.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\progressbar.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\radiobutton.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\scrollarea.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\slider.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\tab.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\tabbedarea.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\textbox.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\textfield.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\window.cpp" />
   </ItemGroup>
 </Project>
\ No newline at end of file