From 2cde1a04e2b3ff5ab7dd6d44cfe5b4f04a141755 Mon Sep 17 00:00:00 2001
From: Dimitris Panokostas <midwan@gmail.com>
Date: Sat, 3 Mar 2018 19:02:02 +0100
Subject: [PATCH] VisualGDB updates

---
 ...iberry-RPI1-Debug.vgdbsettings.midwan.user |  17 ++
 ...erry-RPI1-Release.vgdbsettings.midwan.user |  17 ++
 VisualGDB/Amiberry-RPI1/Amiberry-RPI1.vcxproj |  10 +-
 .../Amiberry-Debug-dispmanx.vgdbsettings      |   2 +-
 .../Amiberry-Debug-rpi1-dispmanx.vgdbsettings | 194 ------------
 .../Amiberry/Amiberry-Debug.vgdbsettings      |   2 +-
 .../Amiberry-Release-dispmanx.vgdbsettings    |   2 +-
 .../Amiberry/Amiberry-Release.vgdbsettings    |   2 +-
 VisualGDB/Amiberry/Amiberry.sln               |  78 ++++-
 VisualGDB/Amiberry/Amiberry.vcxproj           |  42 +--
 VisualGDB/guisan/guisan.vcxproj               | 246 +++++++--------
 VisualGDB/guisan/guisan.vcxproj.filters       | 288 +++++++++---------
 12 files changed, 395 insertions(+), 505 deletions(-)
 create mode 100644 VisualGDB/Amiberry-RPI1/Amiberry-RPI1-Debug.vgdbsettings.midwan.user
 create mode 100644 VisualGDB/Amiberry-RPI1/Amiberry-RPI1-Release.vgdbsettings.midwan.user
 delete mode 100644 VisualGDB/Amiberry/Amiberry-Debug-rpi1-dispmanx.vgdbsettings

diff --git a/VisualGDB/Amiberry-RPI1/Amiberry-RPI1-Debug.vgdbsettings.midwan.user b/VisualGDB/Amiberry-RPI1/Amiberry-RPI1-Debug.vgdbsettings.midwan.user
new file mode 100644
index 00000000..be8d5823
--- /dev/null
+++ b/VisualGDB/Amiberry-RPI1/Amiberry-RPI1-Debug.vgdbsettings.midwan.user
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<VisualGDBUserPreferences xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <UserDefinedVariableValues />
+  <DebugPreferences>
+    <CatchpointConfiguration>
+      <Throw>false</Throw>
+      <Rethrow>false</Rethrow>
+      <Catch>false</Catch>
+      <Exec>false</Exec>
+      <Fork>false</Fork>
+      <Vfork>false</Vfork>
+      <Syscalls />
+    </CatchpointConfiguration>
+    <MaskInterruptsWhileStepping>false</MaskInterruptsWhileStepping>
+    <MemoryWindowPreferences />
+  </DebugPreferences>
+</VisualGDBUserPreferences>
\ No newline at end of file
diff --git a/VisualGDB/Amiberry-RPI1/Amiberry-RPI1-Release.vgdbsettings.midwan.user b/VisualGDB/Amiberry-RPI1/Amiberry-RPI1-Release.vgdbsettings.midwan.user
new file mode 100644
index 00000000..be8d5823
--- /dev/null
+++ b/VisualGDB/Amiberry-RPI1/Amiberry-RPI1-Release.vgdbsettings.midwan.user
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<VisualGDBUserPreferences xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <UserDefinedVariableValues />
+  <DebugPreferences>
+    <CatchpointConfiguration>
+      <Throw>false</Throw>
+      <Rethrow>false</Rethrow>
+      <Catch>false</Catch>
+      <Exec>false</Exec>
+      <Fork>false</Fork>
+      <Vfork>false</Vfork>
+      <Syscalls />
+    </CatchpointConfiguration>
+    <MaskInterruptsWhileStepping>false</MaskInterruptsWhileStepping>
+    <MemoryWindowPreferences />
+  </DebugPreferences>
+</VisualGDBUserPreferences>
\ No newline at end of file
diff --git a/VisualGDB/Amiberry-RPI1/Amiberry-RPI1.vcxproj b/VisualGDB/Amiberry-RPI1/Amiberry-RPI1.vcxproj
index 9450b25f..10975391 100644
--- a/VisualGDB/Amiberry-RPI1/Amiberry-RPI1.vcxproj
+++ b/VisualGDB/Amiberry-RPI1/Amiberry-RPI1.vcxproj
@@ -38,13 +38,13 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|VisualGDB'">
     <ClCompile>
       <CPPLanguageStandard>GNUPP14</CPPLanguageStandard>
-      <AdditionalIncludeDirectories>=/usr/local/include/SDL2;=/usr/include/libxml2;../../src;../../src/osdep;../../src/threaddep;../../src/include;../../guisan/include;../../src/archivers;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>=/usr/local/include/SDL2;=/usr/include/libxml2;../../src;../../src/osdep;../../src/threaddep;../../src/include;../../guisan-dev/include;../../src/archivers;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>DEBUG=1;_REENTRANT;AMIBERRY;CPU_arm;ARMV6_ASSEMBLY;ARM_HAS_DIV;USE_SDL2;%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalOptions>-march=armv6zk -mtune=arm1176jzf-s -mfpu=vfp %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalLinkerInputs>;%(Link.AdditionalLinkerInputs)</AdditionalLinkerInputs>
-      <LibrarySearchDirectories>=/usr/local/lib;../../guisan/lib;%(Link.LibrarySearchDirectories)</LibrarySearchDirectories>
+      <LibrarySearchDirectories>=/usr/local/lib;../../guisan-dev/lib;%(Link.LibrarySearchDirectories)</LibrarySearchDirectories>
       <AdditionalLibraryNames>SDL2;pthread;z;png;rt;xml2;FLAC;mpg123;dl;mpeg2convert;mpeg2;SDL2_image;SDL2_ttf;guisan;%(Link.AdditionalLibraryNames)</AdditionalLibraryNames>
       <LinkerScript />
     </Link>
@@ -52,13 +52,13 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|VisualGDB'">
     <ClCompile>
       <CPPLanguageStandard>GNUPP14</CPPLanguageStandard>
-      <AdditionalIncludeDirectories>=/usr/local/include/SDL2;=/usr/include/libxml2;../../src;../../src/osdep;../../src/threaddep;../../src/include;../../guisan/include;../../src/archivers;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG=1;RELEASE=1;_REENTRANT;AMIBERRY;CPU_arm;ARMV6_ASSEMBLY;USE_SDL2;%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>=/usr/local/include/SDL2;=/usr/include/libxml2;../../src;../../src/osdep;../../src/threaddep;../../src/include;../../guisan-dev/include;../../src/archivers;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>NDEBUG=1;RELEASE=1;_REENTRANT;AMIBERRY;CPU_arm;ARMV6_ASSEMBLY;ARM_HAS_DIV;USE_SDL2;%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalOptions>-march=armv6zk -mtune=arm1176jzf-s -mfpu=vfp %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalLinkerInputs>;%(Link.AdditionalLinkerInputs)</AdditionalLinkerInputs>
-      <LibrarySearchDirectories>=/usr/local/lib;../../guisan/lib;%(Link.LibrarySearchDirectories)</LibrarySearchDirectories>
+      <LibrarySearchDirectories>=/usr/local/lib;../../guisan-dev/lib;%(Link.LibrarySearchDirectories)</LibrarySearchDirectories>
       <AdditionalLibraryNames>SDL2;pthread;z;png;rt;xml2;FLAC;mpg123;dl;mpeg2convert;mpeg2;SDL2_image;SDL2_ttf;guisan;%(Link.AdditionalLibraryNames)</AdditionalLibraryNames>
       <LinkerScript />
     </Link>
diff --git a/VisualGDB/Amiberry/Amiberry-Debug-dispmanx.vgdbsettings b/VisualGDB/Amiberry/Amiberry-Debug-dispmanx.vgdbsettings
index c71096c0..16400246 100644
--- a/VisualGDB/Amiberry/Amiberry-Debug-dispmanx.vgdbsettings
+++ b/VisualGDB/Amiberry/Amiberry-Debug-dispmanx.vgdbsettings
@@ -10,7 +10,7 @@
       <Transport>None</Transport>
     </BuildHost>
     <DeploymentHost>
-      <HostName>192.168.1.124</HostName>
+      <HostName>192.168.1.233</HostName>
       <Transport>SSH</Transport>
       <UserName>pi</UserName>
     </DeploymentHost>
diff --git a/VisualGDB/Amiberry/Amiberry-Debug-rpi1-dispmanx.vgdbsettings b/VisualGDB/Amiberry/Amiberry-Debug-rpi1-dispmanx.vgdbsettings
deleted file mode 100644
index 4b007661..00000000
--- a/VisualGDB/Amiberry/Amiberry-Debug-rpi1-dispmanx.vgdbsettings
+++ /dev/null
@@ -1,194 +0,0 @@
-<?xml version="1.0"?>
-<VisualGDBProjectSettings2 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <ConfigurationName>Debug-rpi1-dispmanx</ConfigurationName>
-  <Project xsi:type="com.visualgdb.project.linux">
-    <CustomSourceDirectories>
-      <Directories />
-      <PathStyle>MinGWUnixSlash</PathStyle>
-    </CustomSourceDirectories>
-    <BuildHost>
-      <Transport>None</Transport>
-    </BuildHost>
-    <DeploymentHost>
-      <HostName>192.168.1.124</HostName>
-      <Transport>SSH</Transport>
-      <UserName>pi</UserName>
-    </DeploymentHost>
-    <MainSourceTransferCommand>
-      <SkipWhenRunningCommandList>false</SkipWhenRunningCommandList>
-      <RemoteHost>
-        <Transport>None</Transport>
-      </RemoteHost>
-      <LocalDirectory>$(ProjectDir)</LocalDirectory>
-      <RemoteDirectory>/tmp/VisualGDB/$(ProjectDirUnixStyle)</RemoteDirectory>
-      <FileMasks>
-        <string>*.cpp</string>
-        <string>*.h</string>
-        <string>*.hpp</string>
-        <string>*.c</string>
-        <string>*.cc</string>
-        <string>*.cxx</string>
-        <string>*.mak</string>
-        <string>Makefile</string>
-        <string>*.txt</string>
-        <string>*.cmake</string>
-      </FileMasks>
-      <TransferNewFilesOnly>true</TransferNewFilesOnly>
-      <IncludeSubdirectories>true</IncludeSubdirectories>
-      <SelectedDirectories />
-      <DeleteDisappearedFiles>false</DeleteDisappearedFiles>
-      <ApplyGlobalExclusionList>true</ApplyGlobalExclusionList>
-    </MainSourceTransferCommand>
-    <AllowChangingHostForMainCommands>false</AllowChangingHostForMainCommands>
-    <SkipBuildIfNoSourceFilesChanged>false</SkipBuildIfNoSourceFilesChanged>
-    <IgnoreFileTransferErrors>false</IgnoreFileTransferErrors>
-    <RemoveRemoteDirectoryOnClean>false</RemoveRemoteDirectoryOnClean>
-    <SkipDeploymentTests>false</SkipDeploymentTests>
-    <MainSourceDirectoryForLocalBuilds>$(ProjectDir)</MainSourceDirectoryForLocalBuilds>
-  </Project>
-  <Build xsi:type="com.visualgdb.build.msbuild">
-    <ToolchainID>
-      <ID>com.visualgdb.raspberry_pi</ID>
-      <Version>
-        <GCC>6.3.0</GCC>
-        <GDB>7.12</GDB>
-        <Revision>1</Revision>
-      </Version>
-    </ToolchainID>
-    <ProjectFile>Amiberry.vcxproj</ProjectFile>
-    <RemoteBuildEnvironment>
-      <Records />
-    </RemoteBuildEnvironment>
-    <ParallelJobCount>1</ParallelJobCount>
-    <SuppressDirectoryChangeMessages>true</SuppressDirectoryChangeMessages>
-  </Build>
-  <Debug xsi:type="com.visualgdb.debug.remote">
-    <AdditionalStartupCommands />
-    <AdditionalGDBSettings>
-      <Features>
-        <DisableAutoDetection>false</DisableAutoDetection>
-        <UseFrameParameter>true</UseFrameParameter>
-        <SimpleValuesFlagSupported>true</SimpleValuesFlagSupported>
-        <ListLocalsSupported>true</ListLocalsSupported>
-        <ByteLevelMemoryCommandsAvailable>true</ByteLevelMemoryCommandsAvailable>
-        <ThreadInfoSupported>true</ThreadInfoSupported>
-        <PendingBreakpointsSupported>true</PendingBreakpointsSupported>
-        <SupportTargetCommand>true</SupportTargetCommand>
-        <ReliableBreakpointNotifications>true</ReliableBreakpointNotifications>
-      </Features>
-      <EnableSmartStepping>false</EnableSmartStepping>
-      <FilterSpuriousStoppedNotifications>false</FilterSpuriousStoppedNotifications>
-      <ForceSingleThreadedMode>false</ForceSingleThreadedMode>
-      <UseAppleExtensions>false</UseAppleExtensions>
-      <CanAcceptCommandsWhileRunning>false</CanAcceptCommandsWhileRunning>
-      <MakeLogFile>false</MakeLogFile>
-      <IgnoreModuleEventsWhileStepping>true</IgnoreModuleEventsWhileStepping>
-      <UseRelativePathsOnly>false</UseRelativePathsOnly>
-      <ExitAction>None</ExitAction>
-      <DisableDisassembly>false</DisableDisassembly>
-      <ExamineMemoryWithXCommand>false</ExamineMemoryWithXCommand>
-      <StepIntoNewInstanceEntry>main</StepIntoNewInstanceEntry>
-      <ExamineRegistersInRawFormat>true</ExamineRegistersInRawFormat>
-      <DisableSignals>false</DisableSignals>
-      <EnableAsyncExecutionMode>true</EnableAsyncExecutionMode>
-      <EnableNonStopMode>false</EnableNonStopMode>
-      <MaxBreakpointLimit>0</MaxBreakpointLimit>
-    </AdditionalGDBSettings>
-    <LaunchGDBSettings xsi:type="GDBLaunchParametersNewInstance">
-      <DebuggedProgram>$(TargetPath)</DebuggedProgram>
-      <GDBServerPort>2000</GDBServerPort>
-      <ProgramArguments />
-    </LaunchGDBSettings>
-    <GenerateCtrlBreakInsteadOfCtrlC>false</GenerateCtrlBreakInsteadOfCtrlC>
-    <DeploymentTargetPath>/home/pi/projects/amiberry/$(TargetFileName)</DeploymentTargetPath>
-    <X11WindowMode>Remote</X11WindowMode>
-    <KeepConsoleAfterExit>false</KeepConsoleAfterExit>
-    <RunGDBUnderSudo>false</RunGDBUnderSudo>
-    <DeploymentMode>Auto</DeploymentMode>
-    <LdLibraryPath>/usr/local/lib</LdLibraryPath>
-    <DeployWhenLaunchedWithoutDebugging>true</DeployWhenLaunchedWithoutDebugging>
-    <SuppressTTYCreation>false</SuppressTTYCreation>
-  </Debug>
-  <CustomBuild>
-    <PreSyncActions />
-    <PreBuildActions />
-    <PostBuildActions />
-    <PreCleanActions />
-    <PostCleanActions />
-  </CustomBuild>
-  <CustomDebug>
-    <PreDebugActions />
-    <PostDebugActions />
-    <DebugStopActions />
-    <BreakMode>Default</BreakMode>
-  </CustomDebug>
-  <CustomShortcuts>
-    <Shortcuts />
-    <ShowMessageAfterExecuting>true</ShowMessageAfterExecuting>
-  </CustomShortcuts>
-  <UserDefinedVariables />
-  <ImportedPropertySheets />
-  <CodeSense>
-    <Enabled>False</Enabled>
-    <CFLAGS />
-    <CXXFLAGS />
-    <ExternalSourceFileList />
-    <ExtraSettings>
-      <HideErrorsInSystemHeaders>true</HideErrorsInSystemHeaders>
-      <SupportLightweightReferenceAnalysis>false</SupportLightweightReferenceAnalysis>
-      <DiscoverySettings>
-        <Mode>Enabled</Mode>
-        <SearchInProjectDir>true</SearchInProjectDir>
-        <SearchInSourceDirs>true</SearchInSourceDirs>
-        <SearchInIncludeSubdirs>true</SearchInIncludeSubdirs>
-        <IgnoredDirs />
-        <IgnoredHeaders />
-      </DiscoverySettings>
-    </ExtraSettings>
-    <CodeAnalyzerSettings>
-      <Enabled>true</Enabled>
-      <SelectedAnalyzers>
-        <string>core.builtin.BuiltinFunctions</string>
-        <string>core.builtin.NoReturnFunctions</string>
-        <string>core.CallAndMessage</string>
-        <string>core.DivideZero</string>
-        <string>core.DynamicTypePropagation</string>
-        <string>core.NonNullParamChecker</string>
-        <string>core.NullDereference</string>
-        <string>core.StackAddressEscape</string>
-        <string>core.UndefinedBinaryOperatorResult</string>
-        <string>core.uninitialized.ArraySubscript</string>
-        <string>core.uninitialized.Assign</string>
-        <string>core.uninitialized.Branch</string>
-        <string>core.uninitialized.CapturedBlockVariable</string>
-        <string>core.uninitialized.UndefReturn</string>
-        <string>core.VLASize</string>
-        <string>cplusplus.NewDelete</string>
-        <string>cplusplus.NewDeleteLeaks</string>
-        <string>deadcode.DeadStores</string>
-        <string>nullability.NullPassedToNonnull</string>
-        <string>nullability.NullReturnedFromNonnull</string>
-        <string>security.insecureAPI.getpw</string>
-        <string>security.insecureAPI.gets</string>
-        <string>security.insecureAPI.mkstemp</string>
-        <string>security.insecureAPI.mktemp</string>
-        <string>security.insecureAPI.UncheckedReturn</string>
-        <string>security.insecureAPI.vfork</string>
-        <string>unix.API</string>
-        <string>unix.cstring.BadSizeArg</string>
-        <string>unix.cstring.NullArg</string>
-        <string>unix.Malloc</string>
-        <string>unix.MallocSizeof</string>
-        <string>unix.MismatchedDeallocator</string>
-        <string>unix.Vfork</string>
-      </SelectedAnalyzers>
-      <ExtraArguments>
-        <string>-analyzer-store=region</string>
-        <string>-analyzer-opt-analyze-nested-blocks</string>
-        <string>-analyzer-eagerly-assume</string>
-      </ExtraArguments>
-    </CodeAnalyzerSettings>
-  </CodeSense>
-  <BuildContextDirectory>VisualGDB\VisualGDBCache</BuildContextDirectory>
-  <ProgramArgumentsSuggestions />
-</VisualGDBProjectSettings2>
\ No newline at end of file
diff --git a/VisualGDB/Amiberry/Amiberry-Debug.vgdbsettings b/VisualGDB/Amiberry/Amiberry-Debug.vgdbsettings
index 34dae797..8d89dd92 100644
--- a/VisualGDB/Amiberry/Amiberry-Debug.vgdbsettings
+++ b/VisualGDB/Amiberry/Amiberry-Debug.vgdbsettings
@@ -10,7 +10,7 @@
       <Transport>None</Transport>
     </BuildHost>
     <DeploymentHost>
-      <HostName>192.168.1.124</HostName>
+      <HostName>192.168.1.233</HostName>
       <Transport>SSH</Transport>
       <UserName>pi</UserName>
     </DeploymentHost>
diff --git a/VisualGDB/Amiberry/Amiberry-Release-dispmanx.vgdbsettings b/VisualGDB/Amiberry/Amiberry-Release-dispmanx.vgdbsettings
index 4a1af365..acb62dc6 100644
--- a/VisualGDB/Amiberry/Amiberry-Release-dispmanx.vgdbsettings
+++ b/VisualGDB/Amiberry/Amiberry-Release-dispmanx.vgdbsettings
@@ -10,7 +10,7 @@
       <Transport>None</Transport>
     </BuildHost>
     <DeploymentHost>
-      <HostName>192.168.1.124</HostName>
+      <HostName>192.168.1.233</HostName>
       <Transport>SSH</Transport>
       <UserName>pi</UserName>
     </DeploymentHost>
diff --git a/VisualGDB/Amiberry/Amiberry-Release.vgdbsettings b/VisualGDB/Amiberry/Amiberry-Release.vgdbsettings
index 0f1f8b31..260af7e5 100644
--- a/VisualGDB/Amiberry/Amiberry-Release.vgdbsettings
+++ b/VisualGDB/Amiberry/Amiberry-Release.vgdbsettings
@@ -10,7 +10,7 @@
       <Transport>None</Transport>
     </BuildHost>
     <DeploymentHost>
-      <HostName>192.168.1.124</HostName>
+      <HostName>192.168.1.233</HostName>
       <Transport>SSH</Transport>
       <UserName>pi</UserName>
     </DeploymentHost>
diff --git a/VisualGDB/Amiberry/Amiberry.sln b/VisualGDB/Amiberry/Amiberry.sln
index e37875a2..fa8f9411 100644
--- a/VisualGDB/Amiberry/Amiberry.sln
+++ b/VisualGDB/Amiberry/Amiberry.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.27130.2026
+VisualStudioVersion = 15.0.27130.2036
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Amiberry", "Amiberry.vcxproj", "{FDC6BF55-C4BC-44FB-85A9-3369784716E8}"
 	ProjectSection(ProjectDependencies) = postProject
@@ -21,59 +21,135 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|VisualGDB = Debug|VisualGDB
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Debug-dispmanx|VisualGDB = Debug-dispmanx|VisualGDB
+		Debug-dispmanx|x64 = Debug-dispmanx|x64
+		Debug-dispmanx|x86 = Debug-dispmanx|x86
 		Release|VisualGDB = Release|VisualGDB
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
 		Release-dispmanx|VisualGDB = Release-dispmanx|VisualGDB
+		Release-dispmanx|x64 = Release-dispmanx|x64
+		Release-dispmanx|x86 = Release-dispmanx|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{FDC6BF55-C4BC-44FB-85A9-3369784716E8}.Debug|VisualGDB.ActiveCfg = Debug|VisualGDB
 		{FDC6BF55-C4BC-44FB-85A9-3369784716E8}.Debug|VisualGDB.Build.0 = Debug|VisualGDB
+		{FDC6BF55-C4BC-44FB-85A9-3369784716E8}.Debug|x64.ActiveCfg = Debug|VisualGDB
+		{FDC6BF55-C4BC-44FB-85A9-3369784716E8}.Debug|x86.ActiveCfg = Debug|VisualGDB
 		{FDC6BF55-C4BC-44FB-85A9-3369784716E8}.Debug-dispmanx|VisualGDB.ActiveCfg = Debug-dispmanx|VisualGDB
 		{FDC6BF55-C4BC-44FB-85A9-3369784716E8}.Debug-dispmanx|VisualGDB.Build.0 = Debug-dispmanx|VisualGDB
+		{FDC6BF55-C4BC-44FB-85A9-3369784716E8}.Debug-dispmanx|x64.ActiveCfg = Debug-dispmanx|VisualGDB
+		{FDC6BF55-C4BC-44FB-85A9-3369784716E8}.Debug-dispmanx|x86.ActiveCfg = Debug-dispmanx|VisualGDB
 		{FDC6BF55-C4BC-44FB-85A9-3369784716E8}.Release|VisualGDB.ActiveCfg = Release|VisualGDB
 		{FDC6BF55-C4BC-44FB-85A9-3369784716E8}.Release|VisualGDB.Build.0 = Release|VisualGDB
+		{FDC6BF55-C4BC-44FB-85A9-3369784716E8}.Release|x64.ActiveCfg = Release|VisualGDB
+		{FDC6BF55-C4BC-44FB-85A9-3369784716E8}.Release|x86.ActiveCfg = Release|VisualGDB
 		{FDC6BF55-C4BC-44FB-85A9-3369784716E8}.Release-dispmanx|VisualGDB.ActiveCfg = Release-dispmanx|VisualGDB
 		{FDC6BF55-C4BC-44FB-85A9-3369784716E8}.Release-dispmanx|VisualGDB.Build.0 = Release-dispmanx|VisualGDB
+		{FDC6BF55-C4BC-44FB-85A9-3369784716E8}.Release-dispmanx|x64.ActiveCfg = Release-dispmanx|VisualGDB
+		{FDC6BF55-C4BC-44FB-85A9-3369784716E8}.Release-dispmanx|x86.ActiveCfg = Release-dispmanx|VisualGDB
 		{E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Debug|VisualGDB.ActiveCfg = Debug|VisualGDB
 		{E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Debug|VisualGDB.Build.0 = Debug|VisualGDB
+		{E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Debug|x64.ActiveCfg = Debug|VisualGDB
+		{E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Debug|x86.ActiveCfg = Debug|VisualGDB
 		{E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Debug-dispmanx|VisualGDB.ActiveCfg = Debug|VisualGDB
 		{E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Debug-dispmanx|VisualGDB.Build.0 = Debug|VisualGDB
+		{E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Debug-dispmanx|x64.ActiveCfg = Release|VisualGDB
+		{E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Debug-dispmanx|x64.Build.0 = Release|VisualGDB
+		{E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Debug-dispmanx|x86.ActiveCfg = Release|VisualGDB
+		{E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Debug-dispmanx|x86.Build.0 = Release|VisualGDB
 		{E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Release|VisualGDB.ActiveCfg = Release|VisualGDB
 		{E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Release|VisualGDB.Build.0 = Release|VisualGDB
+		{E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Release|x64.ActiveCfg = Release|VisualGDB
+		{E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Release|x86.ActiveCfg = Release|VisualGDB
 		{E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Release-dispmanx|VisualGDB.ActiveCfg = Release|VisualGDB
 		{E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Release-dispmanx|VisualGDB.Build.0 = Release|VisualGDB
+		{E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Release-dispmanx|x64.ActiveCfg = Release|VisualGDB
+		{E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Release-dispmanx|x64.Build.0 = Release|VisualGDB
+		{E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Release-dispmanx|x86.ActiveCfg = Release|VisualGDB
+		{E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Release-dispmanx|x86.Build.0 = Release|VisualGDB
 		{14635D01-67B8-4863-9507-3FA5C8FB4B32}.Debug|VisualGDB.ActiveCfg = Debug|VisualGDB
 		{14635D01-67B8-4863-9507-3FA5C8FB4B32}.Debug|VisualGDB.Build.0 = Debug|VisualGDB
+		{14635D01-67B8-4863-9507-3FA5C8FB4B32}.Debug|x64.ActiveCfg = Debug|VisualGDB
+		{14635D01-67B8-4863-9507-3FA5C8FB4B32}.Debug|x86.ActiveCfg = Debug|VisualGDB
 		{14635D01-67B8-4863-9507-3FA5C8FB4B32}.Debug-dispmanx|VisualGDB.ActiveCfg = Debug|VisualGDB
 		{14635D01-67B8-4863-9507-3FA5C8FB4B32}.Debug-dispmanx|VisualGDB.Build.0 = Debug|VisualGDB
+		{14635D01-67B8-4863-9507-3FA5C8FB4B32}.Debug-dispmanx|x64.ActiveCfg = Release|VisualGDB
+		{14635D01-67B8-4863-9507-3FA5C8FB4B32}.Debug-dispmanx|x64.Build.0 = Release|VisualGDB
+		{14635D01-67B8-4863-9507-3FA5C8FB4B32}.Debug-dispmanx|x86.ActiveCfg = Release|VisualGDB
+		{14635D01-67B8-4863-9507-3FA5C8FB4B32}.Debug-dispmanx|x86.Build.0 = Release|VisualGDB
 		{14635D01-67B8-4863-9507-3FA5C8FB4B32}.Release|VisualGDB.ActiveCfg = Release|VisualGDB
 		{14635D01-67B8-4863-9507-3FA5C8FB4B32}.Release|VisualGDB.Build.0 = Release|VisualGDB
+		{14635D01-67B8-4863-9507-3FA5C8FB4B32}.Release|x64.ActiveCfg = Release|VisualGDB
+		{14635D01-67B8-4863-9507-3FA5C8FB4B32}.Release|x86.ActiveCfg = Release|VisualGDB
 		{14635D01-67B8-4863-9507-3FA5C8FB4B32}.Release-dispmanx|VisualGDB.ActiveCfg = Release|VisualGDB
 		{14635D01-67B8-4863-9507-3FA5C8FB4B32}.Release-dispmanx|VisualGDB.Build.0 = Release|VisualGDB
+		{14635D01-67B8-4863-9507-3FA5C8FB4B32}.Release-dispmanx|x64.ActiveCfg = Release|VisualGDB
+		{14635D01-67B8-4863-9507-3FA5C8FB4B32}.Release-dispmanx|x64.Build.0 = Release|VisualGDB
+		{14635D01-67B8-4863-9507-3FA5C8FB4B32}.Release-dispmanx|x86.ActiveCfg = Release|VisualGDB
+		{14635D01-67B8-4863-9507-3FA5C8FB4B32}.Release-dispmanx|x86.Build.0 = Release|VisualGDB
 		{619EFB8C-E41A-4058-B085-1B8CD22692DD}.Debug|VisualGDB.ActiveCfg = Debug|VisualGDB
 		{619EFB8C-E41A-4058-B085-1B8CD22692DD}.Debug|VisualGDB.Build.0 = Debug|VisualGDB
+		{619EFB8C-E41A-4058-B085-1B8CD22692DD}.Debug|x64.ActiveCfg = Debug|VisualGDB
+		{619EFB8C-E41A-4058-B085-1B8CD22692DD}.Debug|x86.ActiveCfg = Debug|VisualGDB
 		{619EFB8C-E41A-4058-B085-1B8CD22692DD}.Debug-dispmanx|VisualGDB.ActiveCfg = Debug|VisualGDB
 		{619EFB8C-E41A-4058-B085-1B8CD22692DD}.Debug-dispmanx|VisualGDB.Build.0 = Debug|VisualGDB
+		{619EFB8C-E41A-4058-B085-1B8CD22692DD}.Debug-dispmanx|x64.ActiveCfg = Release|VisualGDB
+		{619EFB8C-E41A-4058-B085-1B8CD22692DD}.Debug-dispmanx|x64.Build.0 = Release|VisualGDB
+		{619EFB8C-E41A-4058-B085-1B8CD22692DD}.Debug-dispmanx|x86.ActiveCfg = Release|VisualGDB
+		{619EFB8C-E41A-4058-B085-1B8CD22692DD}.Debug-dispmanx|x86.Build.0 = Release|VisualGDB
 		{619EFB8C-E41A-4058-B085-1B8CD22692DD}.Release|VisualGDB.ActiveCfg = Release|VisualGDB
 		{619EFB8C-E41A-4058-B085-1B8CD22692DD}.Release|VisualGDB.Build.0 = Release|VisualGDB
+		{619EFB8C-E41A-4058-B085-1B8CD22692DD}.Release|x64.ActiveCfg = Release|VisualGDB
+		{619EFB8C-E41A-4058-B085-1B8CD22692DD}.Release|x86.ActiveCfg = Release|VisualGDB
 		{619EFB8C-E41A-4058-B085-1B8CD22692DD}.Release-dispmanx|VisualGDB.ActiveCfg = Release|VisualGDB
 		{619EFB8C-E41A-4058-B085-1B8CD22692DD}.Release-dispmanx|VisualGDB.Build.0 = Release|VisualGDB
+		{619EFB8C-E41A-4058-B085-1B8CD22692DD}.Release-dispmanx|x64.ActiveCfg = Release|VisualGDB
+		{619EFB8C-E41A-4058-B085-1B8CD22692DD}.Release-dispmanx|x64.Build.0 = Release|VisualGDB
+		{619EFB8C-E41A-4058-B085-1B8CD22692DD}.Release-dispmanx|x86.ActiveCfg = Release|VisualGDB
+		{619EFB8C-E41A-4058-B085-1B8CD22692DD}.Release-dispmanx|x86.Build.0 = Release|VisualGDB
 		{883F2A00-8030-429B-AC7F-E930DDF9568F}.Debug|VisualGDB.ActiveCfg = Debug|VisualGDB
 		{883F2A00-8030-429B-AC7F-E930DDF9568F}.Debug|VisualGDB.Build.0 = Debug|VisualGDB
+		{883F2A00-8030-429B-AC7F-E930DDF9568F}.Debug|x64.ActiveCfg = Debug|VisualGDB
+		{883F2A00-8030-429B-AC7F-E930DDF9568F}.Debug|x86.ActiveCfg = Debug|VisualGDB
 		{883F2A00-8030-429B-AC7F-E930DDF9568F}.Debug-dispmanx|VisualGDB.ActiveCfg = Debug|VisualGDB
 		{883F2A00-8030-429B-AC7F-E930DDF9568F}.Debug-dispmanx|VisualGDB.Build.0 = Debug|VisualGDB
+		{883F2A00-8030-429B-AC7F-E930DDF9568F}.Debug-dispmanx|x64.ActiveCfg = Release|VisualGDB
+		{883F2A00-8030-429B-AC7F-E930DDF9568F}.Debug-dispmanx|x64.Build.0 = Release|VisualGDB
+		{883F2A00-8030-429B-AC7F-E930DDF9568F}.Debug-dispmanx|x86.ActiveCfg = Release|VisualGDB
+		{883F2A00-8030-429B-AC7F-E930DDF9568F}.Debug-dispmanx|x86.Build.0 = Release|VisualGDB
 		{883F2A00-8030-429B-AC7F-E930DDF9568F}.Release|VisualGDB.ActiveCfg = Release|VisualGDB
 		{883F2A00-8030-429B-AC7F-E930DDF9568F}.Release|VisualGDB.Build.0 = Release|VisualGDB
+		{883F2A00-8030-429B-AC7F-E930DDF9568F}.Release|x64.ActiveCfg = Release|VisualGDB
+		{883F2A00-8030-429B-AC7F-E930DDF9568F}.Release|x86.ActiveCfg = Release|VisualGDB
 		{883F2A00-8030-429B-AC7F-E930DDF9568F}.Release-dispmanx|VisualGDB.ActiveCfg = Release|VisualGDB
 		{883F2A00-8030-429B-AC7F-E930DDF9568F}.Release-dispmanx|VisualGDB.Build.0 = Release|VisualGDB
+		{883F2A00-8030-429B-AC7F-E930DDF9568F}.Release-dispmanx|x64.ActiveCfg = Release|VisualGDB
+		{883F2A00-8030-429B-AC7F-E930DDF9568F}.Release-dispmanx|x64.Build.0 = Release|VisualGDB
+		{883F2A00-8030-429B-AC7F-E930DDF9568F}.Release-dispmanx|x86.ActiveCfg = Release|VisualGDB
+		{883F2A00-8030-429B-AC7F-E930DDF9568F}.Release-dispmanx|x86.Build.0 = Release|VisualGDB
 		{740C6C27-4C85-4927-A508-49116A0D36F9}.Debug|VisualGDB.ActiveCfg = Debug|VisualGDB
 		{740C6C27-4C85-4927-A508-49116A0D36F9}.Debug|VisualGDB.Build.0 = Debug|VisualGDB
+		{740C6C27-4C85-4927-A508-49116A0D36F9}.Debug|x64.ActiveCfg = Debug|VisualGDB
+		{740C6C27-4C85-4927-A508-49116A0D36F9}.Debug|x86.ActiveCfg = Debug|VisualGDB
 		{740C6C27-4C85-4927-A508-49116A0D36F9}.Debug-dispmanx|VisualGDB.ActiveCfg = Debug|VisualGDB
 		{740C6C27-4C85-4927-A508-49116A0D36F9}.Debug-dispmanx|VisualGDB.Build.0 = Debug|VisualGDB
+		{740C6C27-4C85-4927-A508-49116A0D36F9}.Debug-dispmanx|x64.ActiveCfg = Release|VisualGDB
+		{740C6C27-4C85-4927-A508-49116A0D36F9}.Debug-dispmanx|x64.Build.0 = Release|VisualGDB
+		{740C6C27-4C85-4927-A508-49116A0D36F9}.Debug-dispmanx|x86.ActiveCfg = Release|VisualGDB
+		{740C6C27-4C85-4927-A508-49116A0D36F9}.Debug-dispmanx|x86.Build.0 = Release|VisualGDB
 		{740C6C27-4C85-4927-A508-49116A0D36F9}.Release|VisualGDB.ActiveCfg = Release|VisualGDB
 		{740C6C27-4C85-4927-A508-49116A0D36F9}.Release|VisualGDB.Build.0 = Release|VisualGDB
+		{740C6C27-4C85-4927-A508-49116A0D36F9}.Release|x64.ActiveCfg = Release|VisualGDB
+		{740C6C27-4C85-4927-A508-49116A0D36F9}.Release|x86.ActiveCfg = Release|VisualGDB
 		{740C6C27-4C85-4927-A508-49116A0D36F9}.Release-dispmanx|VisualGDB.ActiveCfg = Release|VisualGDB
 		{740C6C27-4C85-4927-A508-49116A0D36F9}.Release-dispmanx|VisualGDB.Build.0 = Release|VisualGDB
+		{740C6C27-4C85-4927-A508-49116A0D36F9}.Release-dispmanx|x64.ActiveCfg = Release|VisualGDB
+		{740C6C27-4C85-4927-A508-49116A0D36F9}.Release-dispmanx|x64.Build.0 = Release|VisualGDB
+		{740C6C27-4C85-4927-A508-49116A0D36F9}.Release-dispmanx|x86.ActiveCfg = Release|VisualGDB
+		{740C6C27-4C85-4927-A508-49116A0D36F9}.Release-dispmanx|x86.Build.0 = Release|VisualGDB
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/VisualGDB/Amiberry/Amiberry.vcxproj b/VisualGDB/Amiberry/Amiberry.vcxproj
index 10759fed..1daf6016 100644
--- a/VisualGDB/Amiberry/Amiberry.vcxproj
+++ b/VisualGDB/Amiberry/Amiberry.vcxproj
@@ -5,10 +5,6 @@
       <Configuration>Debug-dispmanx</Configuration>
       <Platform>VisualGDB</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug-rpi1-dispmanx|VisualGDB">
-      <Configuration>Debug-rpi1-dispmanx</Configuration>
-      <Platform>VisualGDB</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|VisualGDB">
       <Configuration>Debug</Configuration>
       <Platform>VisualGDB</Platform>
@@ -30,7 +26,6 @@
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|VisualGDB'">
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-dispmanx|VisualGDB'" Label="Configuration" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-rpi1-dispmanx|VisualGDB'" Label="Configuration" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|VisualGDB'">
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-dispmanx|VisualGDB'" Label="Configuration" />
@@ -52,12 +47,6 @@
     <ToolchainVersion>6.3.0/7.12/r1</ToolchainVersion>
     <TargetName>$(ProjectName)-sdl2</TargetName>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-rpi1-dispmanx|VisualGDB'">
-    <GNUConfigurationType>Debug</GNUConfigurationType>
-    <ToolchainID>com.visualgdb.raspberry_pi</ToolchainID>
-    <ToolchainVersion>6.3.0/7.12/r1</ToolchainVersion>
-    <TargetName>$(ProjectName)-sdl2</TargetName>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|VisualGDB'">
     <ToolchainID>com.visualgdb.raspberry_pi</ToolchainID>
     <ToolchainVersion>6.3.0/7.12/r1</ToolchainVersion>
@@ -71,13 +60,13 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|VisualGDB'">
     <ClCompile>
       <CPPLanguageStandard>GNUPP14</CPPLanguageStandard>
-      <AdditionalIncludeDirectories>=/usr/local/include/SDL2;=/usr/include/libxml2;../../src;../../src/osdep;../../src/threaddep;../../src/include;../../guisan/include;../../src/archivers;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>=/usr/local/include/SDL2;=/usr/include/libxml2;../../src;../../src/osdep;../../src/threaddep;../../src/include;../../guisan-dev/include;../../src/archivers;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>DEBUG=1;ARMV6T2;USE_ARMNEON;ARM_HAS_DIV;_REENTRANT;AMIBERRY;CPU_arm;ARMV6_ASSEMBLY;USE_SDL2;%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalOptions>-march=armv8-a -mfpu=neon-fp-armv8 -mfloat-abi=hard %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalLinkerInputs>;%(Link.AdditionalLinkerInputs)</AdditionalLinkerInputs>
-      <LibrarySearchDirectories>=/usr/local/lib;../../guisan/lib;%(Link.LibrarySearchDirectories)</LibrarySearchDirectories>
+      <LibrarySearchDirectories>=/usr/local/lib;../../guisan-dev/lib;%(Link.LibrarySearchDirectories)</LibrarySearchDirectories>
       <AdditionalLibraryNames>SDL2;pthread;z;png;rt;xml2;FLAC;mpg123;dl;mpeg2convert;mpeg2;SDL2_image;SDL2_ttf;guisan;%(Link.AdditionalLibraryNames)</AdditionalLibraryNames>
       <LinkerScript />
     </Link>
@@ -85,28 +74,13 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-dispmanx|VisualGDB'">
     <ClCompile>
       <CPPLanguageStandard>GNUPP14</CPPLanguageStandard>
-      <AdditionalIncludeDirectories>=/usr/local/include/SDL2;=/usr/include/libxml2;../../src;../../src/osdep;../../src/threaddep;../../src/include;../../guisan/include;../../src/archivers;=/opt/vc/include;=/opt/vc/include/interface/vmcs_host/linux;=/opt/vc/include/interface/vcos/pthreads;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>=/usr/local/include/SDL2;=/usr/include/libxml2;../../src;../../src/osdep;../../src/threaddep;../../src/include;../../guisan-dev/include;../../src/archivers;=/opt/vc/include;=/opt/vc/include/interface/vmcs_host/linux;=/opt/vc/include/interface/vcos/pthreads;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>DEBUG=1;ARMV6T2;USE_ARMNEON;ARM_HAS_DIV;_REENTRANT;AMIBERRY;CPU_arm;ARMV6_ASSEMBLY;USE_SDL2;USE_DISPMANX;%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalOptions>-march=armv8-a -mfpu=neon-fp-armv8 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalLinkerInputs>;%(Link.AdditionalLinkerInputs)</AdditionalLinkerInputs>
-      <LibrarySearchDirectories>=/usr/local/lib;../../guisan/lib;=/opt/vc/lib;%(Link.LibrarySearchDirectories)</LibrarySearchDirectories>
-      <AdditionalLibraryNames>SDL2;pthread;z;png;rt;xml2;FLAC;mpg123;dl;mpeg2convert;mpeg2;SDL2_image;SDL2_ttf;guisan;bcm_host;%(Link.AdditionalLibraryNames)</AdditionalLibraryNames>
-      <LinkerScript>
-      </LinkerScript>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-rpi1-dispmanx|VisualGDB'">
-    <ClCompile>
-      <CPPLanguageStandard>GNUPP14</CPPLanguageStandard>
-      <AdditionalIncludeDirectories>=/usr/local/include/SDL2;=/usr/include/libxml2;../../src;../../src/osdep;../../src/threaddep;../../src/include;../../guisan/include;../../src/archivers;=/opt/vc/include;=/opt/vc/include/interface/vmcs_host/linux;=/opt/vc/include/interface/vcos/pthreads;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>DEBUG=1;_REENTRANT;AMIBERRY;CPU_arm;ARMV6_ASSEMBLY;USE_SDL2;USE_DISPMANX;%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions>-march=armv6zk -mtune=arm1176jzf-s -mfpu=vfp %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <Link>
-      <AdditionalLinkerInputs>;%(Link.AdditionalLinkerInputs)</AdditionalLinkerInputs>
-      <LibrarySearchDirectories>=/usr/local/lib;../../guisan/lib;=/opt/vc/lib;%(Link.LibrarySearchDirectories)</LibrarySearchDirectories>
+      <LibrarySearchDirectories>=/usr/local/lib;../../guisan-dev/lib;=/opt/vc/lib;%(Link.LibrarySearchDirectories)</LibrarySearchDirectories>
       <AdditionalLibraryNames>SDL2;pthread;z;png;rt;xml2;FLAC;mpg123;dl;mpeg2convert;mpeg2;SDL2_image;SDL2_ttf;guisan;bcm_host;%(Link.AdditionalLibraryNames)</AdditionalLibraryNames>
       <LinkerScript>
       </LinkerScript>
@@ -115,13 +89,13 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|VisualGDB'">
     <ClCompile>
       <CPPLanguageStandard>GNUPP14</CPPLanguageStandard>
-      <AdditionalIncludeDirectories>=/usr/local/include/SDL2;=/usr/include/libxml2;../../src;../../src/osdep;../../src/threaddep;../../src/include;../../guisan/include;../../src/archivers;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>=/usr/local/include/SDL2;=/usr/include/libxml2;../../src;../../src/osdep;../../src/threaddep;../../src/include;../../guisan-dev/include;../../src/archivers;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG=1;RELEASE=1;ARMV6T2;USE_ARMNEON;ARM_HAS_DIV;_REENTRANT;AMIBERRY;CPU_arm;ARMV6_ASSEMBLY;USE_SDL2;%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalOptions>-march=armv8-a -mfpu=neon-fp-armv8 -mfloat-abi=hard %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalLinkerInputs>;%(Link.AdditionalLinkerInputs)</AdditionalLinkerInputs>
-      <LibrarySearchDirectories>=/usr/local/lib;../../guisan/lib;%(Link.LibrarySearchDirectories)</LibrarySearchDirectories>
+      <LibrarySearchDirectories>=/usr/local/lib;../../guisan-dev/lib;%(Link.LibrarySearchDirectories)</LibrarySearchDirectories>
       <AdditionalLibraryNames>SDL2;pthread;z;png;rt;xml2;FLAC;mpg123;dl;mpeg2convert;mpeg2;SDL2_image;SDL2_ttf;guisan;%(Link.AdditionalLibraryNames)</AdditionalLibraryNames>
       <LinkerScript />
     </Link>
@@ -129,13 +103,13 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-dispmanx|VisualGDB'">
     <ClCompile>
       <CPPLanguageStandard>GNUPP14</CPPLanguageStandard>
-      <AdditionalIncludeDirectories>=/usr/local/include/SDL2;=/usr/include/libxml2;../../src;../../src/osdep;../../src/threaddep;../../src/include;../../guisan/include;../../src/archivers;=/opt/vc/include;=/opt/vc/include/interface/vmcs_host/linux;=/opt/vc/include/interface/vcos/pthreads;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>=/usr/local/include/SDL2;=/usr/include/libxml2;../../src;../../src/osdep;../../src/threaddep;../../src/include;../../guisan-dev/include;../../src/archivers;=/opt/vc/include;=/opt/vc/include/interface/vmcs_host/linux;=/opt/vc/include/interface/vcos/pthreads;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG=1;RELEASE=1;ARMV6T2;USE_ARMNEON;ARM_HAS_DIV;_REENTRANT;AMIBERRY;CPU_arm;ARMV6_ASSEMBLY;USE_SDL2;USE_DISPMANX;%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalOptions>-march=armv8-a -mfpu=neon-fp-armv8 -mfloat-abi=hard %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalLinkerInputs>;%(Link.AdditionalLinkerInputs)</AdditionalLinkerInputs>
-      <LibrarySearchDirectories>=/usr/local/lib;../../guisan/lib;=/opt/vc/lib;%(Link.LibrarySearchDirectories)</LibrarySearchDirectories>
+      <LibrarySearchDirectories>=/usr/local/lib;../../guisan-dev/lib;=/opt/vc/lib;%(Link.LibrarySearchDirectories)</LibrarySearchDirectories>
       <AdditionalLibraryNames>SDL2;pthread;z;png;rt;xml2;FLAC;mpg123;dl;mpeg2convert;mpeg2;SDL2_image;SDL2_ttf;guisan;bcm_host;%(Link.AdditionalLibraryNames)</AdditionalLibraryNames>
       <LinkerScript>
       </LinkerScript>
diff --git a/VisualGDB/guisan/guisan.vcxproj b/VisualGDB/guisan/guisan.vcxproj
index 2d39dad4..de180d39 100644
--- a/VisualGDB/guisan/guisan.vcxproj
+++ b/VisualGDB/guisan/guisan.vcxproj
@@ -30,95 +30,95 @@
     <ToolchainID>com.visualgdb.raspberry_pi</ToolchainID>
     <ToolchainVersion>6.3.0/7.12/r1</ToolchainVersion>
     <GNUTargetType>StaticLibrary</GNUTargetType>
-    <OutDir>$(SolutionDir)..\..\guisan\lib\</OutDir>
+    <OutDir>$(SolutionDir)..\..\guisan-dev\lib\</OutDir>
     <TargetName>lib$(ProjectName)</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|VisualGDB'">
     <ToolchainID>com.visualgdb.raspberry_pi</ToolchainID>
     <ToolchainVersion>6.3.0/7.12/r1</ToolchainVersion>
     <GNUTargetType>StaticLibrary</GNUTargetType>
-    <OutDir>$(SolutionDir)..\..\guisan\lib\</OutDir>
+    <OutDir>$(SolutionDir)..\..\guisan-dev\lib\</OutDir>
     <TargetName>lib$(ProjectName)</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|VisualGDB'">
     <ClCompile>
       <CPPLanguageStandard>GNUPP14</CPPLanguageStandard>
-      <AdditionalIncludeDirectories>=/usr/local/include/SDL2;=/opt/vc/include;=/opt/vc/include/interface/vcos/pthreads;=/opt/vc/include/interface/vmcs_host/linux;../../guisan/include;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>=/usr/local/include/SDL2;=/opt/vc/include;=/opt/vc/include/interface/vcos/pthreads;=/opt/vc/include/interface/vmcs_host/linux;../../guisan-dev/include;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>DEBUG=1;_REENTRANT;%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalOptions>-march=armv8-a -mfpu=neon-fp-armv8 -mfloat-abi=hard %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalLinkerInputs>;%(Link.AdditionalLinkerInputs)</AdditionalLinkerInputs>
-      <LibrarySearchDirectories>;%(Link.LibrarySearchDirectories)</LibrarySearchDirectories>
-      <AdditionalLibraryNames>;%(Link.AdditionalLibraryNames)</AdditionalLibraryNames>
+      <LibrarySearchDirectories>=/usr/local/lib;%(Link.LibrarySearchDirectories)</LibrarySearchDirectories>
+      <AdditionalLibraryNames>SDL2;%(Link.AdditionalLibraryNames)</AdditionalLibraryNames>
       <LinkerScript />
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|VisualGDB'">
     <ClCompile>
       <CPPLanguageStandard>GNUPP14</CPPLanguageStandard>
-      <AdditionalIncludeDirectories>=/usr/local/include/SDL2;=/opt/vc/include;=/opt/vc/include/interface/vcos/pthreads;=/opt/vc/include/interface/vmcs_host/linux;../../guisan/include;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>=/usr/local/include/SDL2;=/opt/vc/include;=/opt/vc/include/interface/vcos/pthreads;=/opt/vc/include/interface/vmcs_host/linux;../../guisan-dev/include;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG=1;RELEASE=1;_REENTRANT;%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalOptions>-march=armv8-a -mfpu=neon-fp-armv8 -mfloat-abi=hard %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalLinkerInputs>;%(Link.AdditionalLinkerInputs)</AdditionalLinkerInputs>
-      <LibrarySearchDirectories>;%(Link.LibrarySearchDirectories)</LibrarySearchDirectories>
-      <AdditionalLibraryNames>;%(Link.AdditionalLibraryNames)</AdditionalLibraryNames>
+      <LibrarySearchDirectories>=/usr/local/lib;%(Link.LibrarySearchDirectories)</LibrarySearchDirectories>
+      <AdditionalLibraryNames>SDL2;%(Link.AdditionalLibraryNames)</AdditionalLibraryNames>
       <LinkerScript />
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\guisan\src\actionevent.cpp" />
-    <ClCompile Include="..\..\guisan\src\basiccontainer.cpp" />
-    <ClCompile Include="..\..\guisan\src\cliprectangle.cpp" />
-    <ClCompile Include="..\..\guisan\src\color.cpp" />
-    <ClCompile Include="..\..\guisan\src\defaultfont.cpp" />
-    <ClCompile Include="..\..\guisan\src\event.cpp" />
-    <ClCompile Include="..\..\guisan\src\exception.cpp" />
-    <ClCompile Include="..\..\guisan\src\focushandler.cpp" />
-    <ClCompile Include="..\..\guisan\src\font.cpp" />
-    <ClCompile Include="..\..\guisan\src\genericinput.cpp" />
-    <ClCompile Include="..\..\guisan\src\graphics.cpp" />
-    <ClCompile Include="..\..\guisan\src\gui.cpp" />
-    <ClCompile Include="..\..\guisan\src\guisan.cpp" />
-    <ClCompile Include="..\..\guisan\src\image.cpp" />
-    <ClCompile Include="..\..\guisan\src\imagefont.cpp" />
-    <ClCompile Include="..\..\guisan\src\inputevent.cpp" />
-    <ClCompile Include="..\..\guisan\src\key.cpp" />
-    <ClCompile Include="..\..\guisan\src\keyevent.cpp" />
-    <ClCompile Include="..\..\guisan\src\keyinput.cpp" />
-    <ClCompile Include="..\..\guisan\src\mouseevent.cpp" />
-    <ClCompile Include="..\..\guisan\src\mouseinput.cpp" />
-    <ClCompile Include="..\..\guisan\src\opengl\opengl.cpp" />
-    <ClCompile Include="..\..\guisan\src\opengl\openglgraphics.cpp" />
-    <ClCompile Include="..\..\guisan\src\opengl\openglimage.cpp" />
-    <ClCompile Include="..\..\guisan\src\rectangle.cpp" />
-    <ClCompile Include="..\..\guisan\src\sdl\sdl.cpp" />
-    <ClCompile Include="..\..\guisan\src\sdl\sdlgraphics.cpp" />
-    <ClCompile Include="..\..\guisan\src\sdl\sdlimage.cpp" />
-    <ClCompile Include="..\..\guisan\src\sdl\sdlimageloader.cpp" />
-    <ClCompile Include="..\..\guisan\src\sdl\sdlinput.cpp" />
-    <ClCompile Include="..\..\guisan\src\sdl\sdltruetypefont.cpp" />
-    <ClCompile Include="..\..\guisan\src\selectionevent.cpp" />
-    <ClCompile Include="..\..\guisan\src\widget.cpp" />
-    <ClCompile Include="..\..\guisan\src\widgets\button.cpp" />
-    <ClCompile Include="..\..\guisan\src\widgets\checkbox.cpp" />
-    <ClCompile Include="..\..\guisan\src\widgets\container.cpp" />
-    <ClCompile Include="..\..\guisan\src\widgets\dropdown.cpp" />
-    <ClCompile Include="..\..\guisan\src\widgets\icon.cpp" />
-    <ClCompile Include="..\..\guisan\src\widgets\imagebutton.cpp" />
-    <ClCompile Include="..\..\guisan\src\widgets\label.cpp" />
-    <ClCompile Include="..\..\guisan\src\widgets\listbox.cpp" />
-    <ClCompile Include="..\..\guisan\src\widgets\progressbar.cpp" />
-    <ClCompile Include="..\..\guisan\src\widgets\radiobutton.cpp" />
-    <ClCompile Include="..\..\guisan\src\widgets\scrollarea.cpp" />
-    <ClCompile Include="..\..\guisan\src\widgets\slider.cpp" />
-    <ClCompile Include="..\..\guisan\src\widgets\tab.cpp" />
-    <ClCompile Include="..\..\guisan\src\widgets\tabbedarea.cpp" />
-    <ClCompile Include="..\..\guisan\src\widgets\textbox.cpp" />
-    <ClCompile Include="..\..\guisan\src\widgets\textfield.cpp" />
-    <ClCompile Include="..\..\guisan\src\widgets\window.cpp" />
+    <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\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" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
@@ -128,70 +128,70 @@
     <None Include="guisan-Release.vgdbsettings" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\guisan\include\guisan.hpp" />
-    <ClInclude Include="..\..\guisan\include\guisan\actionevent.hpp" />
-    <ClInclude Include="..\..\guisan\include\guisan\actionlistener.hpp" />
-    <ClInclude Include="..\..\guisan\include\guisan\basiccontainer.hpp" />
-    <ClInclude Include="..\..\guisan\include\guisan\cliprectangle.hpp" />
-    <ClInclude Include="..\..\guisan\include\guisan\color.hpp" />
-    <ClInclude Include="..\..\guisan\include\guisan\deathlistener.hpp" />
-    <ClInclude Include="..\..\guisan\include\guisan\defaultfont.hpp" />
-    <ClInclude Include="..\..\guisan\include\guisan\event.hpp" />
-    <ClInclude Include="..\..\guisan\include\guisan\exception.hpp" />
-    <ClInclude Include="..\..\guisan\include\guisan\focushandler.hpp" />
-    <ClInclude Include="..\..\guisan\include\guisan\focuslistener.hpp" />
-    <ClInclude Include="..\..\guisan\include\guisan\font.hpp" />
-    <ClInclude Include="..\..\guisan\include\guisan\genericinput.hpp" />
-    <ClInclude Include="..\..\guisan\include\guisan\glut.hpp" />
-    <ClInclude Include="..\..\guisan\include\guisan\graphics.hpp" />
-    <ClInclude Include="..\..\guisan\include\guisan\gui.hpp" />
-    <ClInclude Include="..\..\guisan\include\guisan\image.hpp" />
-    <ClInclude Include="..\..\guisan\include\guisan\imagefont.hpp" />
-    <ClInclude Include="..\..\guisan\include\guisan\imageloader.hpp" />
-    <ClInclude Include="..\..\guisan\include\guisan\input.hpp" />
-    <ClInclude Include="..\..\guisan\include\guisan\inputevent.hpp" />
-    <ClInclude Include="..\..\guisan\include\guisan\key.hpp" />
-    <ClInclude Include="..\..\guisan\include\guisan\keyevent.hpp" />
-    <ClInclude Include="..\..\guisan\include\guisan\keyinput.hpp" />
-    <ClInclude Include="..\..\guisan\include\guisan\keylistener.hpp" />
-    <ClInclude Include="..\..\guisan\include\guisan\listmodel.hpp" />
-    <ClInclude Include="..\..\guisan\include\guisan\mouseevent.hpp" />
-    <ClInclude Include="..\..\guisan\include\guisan\mouseinput.hpp" />
-    <ClInclude Include="..\..\guisan\include\guisan\mouselistener.hpp" />
-    <ClInclude Include="..\..\guisan\include\guisan\opengl.hpp" />
-    <ClInclude Include="..\..\guisan\include\guisan\opengl\openglgraphics.hpp" />
-    <ClInclude Include="..\..\guisan\include\guisan\opengl\openglimage.hpp" />
-    <ClInclude Include="..\..\guisan\include\guisan\opengl\openglsdlimageloader.hpp" />
-    <ClInclude Include="..\..\guisan\include\guisan\platform.hpp" />
-    <ClInclude Include="..\..\guisan\include\guisan\rectangle.hpp" />
-    <ClInclude Include="..\..\guisan\include\guisan\sdl.hpp" />
-    <ClInclude Include="..\..\guisan\include\guisan\sdl\sdlgraphics.hpp" />
-    <ClInclude Include="..\..\guisan\include\guisan\sdl\sdlimage.hpp" />
-    <ClInclude Include="..\..\guisan\include\guisan\sdl\sdlimageloader.hpp" />
-    <ClInclude Include="..\..\guisan\include\guisan\sdl\sdlinput.hpp" />
-    <ClInclude Include="..\..\guisan\include\guisan\sdl\sdlpixel.hpp" />
-    <ClInclude Include="..\..\guisan\include\guisan\sdl\sdltruetypefont.hpp" />
-    <ClInclude Include="..\..\guisan\include\guisan\selectionevent.hpp" />
-    <ClInclude Include="..\..\guisan\include\guisan\selectionlistener.hpp" />
-    <ClInclude Include="..\..\guisan\include\guisan\widget.hpp" />
-    <ClInclude Include="..\..\guisan\include\guisan\widgetlistener.hpp" />
-    <ClInclude Include="..\..\guisan\include\guisan\widgets\button.hpp" />
-    <ClInclude Include="..\..\guisan\include\guisan\widgets\checkbox.hpp" />
-    <ClInclude Include="..\..\guisan\include\guisan\widgets\container.hpp" />
-    <ClInclude Include="..\..\guisan\include\guisan\widgets\dropdown.hpp" />
-    <ClInclude Include="..\..\guisan\include\guisan\widgets\icon.hpp" />
-    <ClInclude Include="..\..\guisan\include\guisan\widgets\imagebutton.hpp" />
-    <ClInclude Include="..\..\guisan\include\guisan\widgets\label.hpp" />
-    <ClInclude Include="..\..\guisan\include\guisan\widgets\listbox.hpp" />
-    <ClInclude Include="..\..\guisan\include\guisan\widgets\progressbar.hpp" />
-    <ClInclude Include="..\..\guisan\include\guisan\widgets\radiobutton.hpp" />
-    <ClInclude Include="..\..\guisan\include\guisan\widgets\scrollarea.hpp" />
-    <ClInclude Include="..\..\guisan\include\guisan\widgets\slider.hpp" />
-    <ClInclude Include="..\..\guisan\include\guisan\widgets\tab.hpp" />
-    <ClInclude Include="..\..\guisan\include\guisan\widgets\tabbedarea.hpp" />
-    <ClInclude Include="..\..\guisan\include\guisan\widgets\textbox.hpp" />
-    <ClInclude Include="..\..\guisan\include\guisan\widgets\textfield.hpp" />
-    <ClInclude Include="..\..\guisan\include\guisan\widgets\window.hpp" />
-    <ClInclude Include="..\..\guisan\include\guisan\x.hpp" />
+    <ClInclude Include="..\..\guisan-dev\include\guisan.hpp" />
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\actionevent.hpp" />
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\actionlistener.hpp" />
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\basiccontainer.hpp" />
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\cliprectangle.hpp" />
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\color.hpp" />
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\deathlistener.hpp" />
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\defaultfont.hpp" />
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\event.hpp" />
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\exception.hpp" />
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\focushandler.hpp" />
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\focuslistener.hpp" />
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\font.hpp" />
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\genericinput.hpp" />
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\glut.hpp" />
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\graphics.hpp" />
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\gui.hpp" />
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\image.hpp" />
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\imagefont.hpp" />
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\imageloader.hpp" />
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\input.hpp" />
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\inputevent.hpp" />
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\key.hpp" />
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\keyevent.hpp" />
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\keyinput.hpp" />
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\keylistener.hpp" />
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\listmodel.hpp" />
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\mouseevent.hpp" />
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\mouseinput.hpp" />
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\mouselistener.hpp" />
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\opengl.hpp" />
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\opengl\openglgraphics.hpp" />
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\opengl\openglimage.hpp" />
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\opengl\openglsdlimageloader.hpp" />
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\platform.hpp" />
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\rectangle.hpp" />
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\sdl.hpp" />
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\sdl\sdlgraphics.hpp" />
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\sdl\sdlimage.hpp" />
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\sdl\sdlimageloader.hpp" />
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\sdl\sdlinput.hpp" />
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\sdl\sdlpixel.hpp" />
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\sdl\sdltruetypefont.hpp" />
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\selectionevent.hpp" />
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\selectionlistener.hpp" />
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\widget.hpp" />
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\widgetlistener.hpp" />
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\widgets\button.hpp" />
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\widgets\checkbox.hpp" />
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\widgets\container.hpp" />
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\widgets\dropdown.hpp" />
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\widgets\icon.hpp" />
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\widgets\imagebutton.hpp" />
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\widgets\label.hpp" />
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\widgets\listbox.hpp" />
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\widgets\progressbar.hpp" />
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\widgets\radiobutton.hpp" />
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\widgets\scrollarea.hpp" />
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\widgets\slider.hpp" />
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\widgets\tab.hpp" />
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\widgets\tabbedarea.hpp" />
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\widgets\textbox.hpp" />
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\widgets\textfield.hpp" />
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\widgets\window.hpp" />
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\x.hpp" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/VisualGDB/guisan/guisan.vcxproj.filters b/VisualGDB/guisan/guisan.vcxproj.filters
index 68449b42..c738214b 100644
--- a/VisualGDB/guisan/guisan.vcxproj.filters
+++ b/VisualGDB/guisan/guisan.vcxproj.filters
@@ -27,13 +27,13 @@
     <Filter Include="Header files\guisan">
       <UniqueIdentifier>{cf6c4dda-c8e0-4f50-8a65-a8fbd9796c62}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Header files\guisan\opengl">
+    <Filter Include="Header files\guisan-dev\opengl">
       <UniqueIdentifier>{d8d6bb85-3423-4047-9b28-f08fc4969a77}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Header files\guisan\sdl">
+    <Filter Include="Header files\guisan-dev\sdl">
       <UniqueIdentifier>{cc2572e2-eafa-4be7-afdf-10cb5b4f9d08}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Header files\guisan\widgets">
+    <Filter Include="Header files\guisan-dev\widgets">
       <UniqueIdentifier>{8925d54e-e927-41ea-8347-a90faa63124b}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
@@ -46,352 +46,352 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\guisan\src\actionevent.cpp">
+    <ClCompile Include="..\..\guisan-dev\src\actionevent.cpp">
       <Filter>Source files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan\src\basiccontainer.cpp">
+    <ClCompile Include="..\..\guisan-dev\src\basiccontainer.cpp">
       <Filter>Source files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan\src\cliprectangle.cpp">
+    <ClCompile Include="..\..\guisan-dev\src\cliprectangle.cpp">
       <Filter>Source files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan\src\color.cpp">
+    <ClCompile Include="..\..\guisan-dev\src\color.cpp">
       <Filter>Source files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan\src\defaultfont.cpp">
+    <ClCompile Include="..\..\guisan-dev\src\defaultfont.cpp">
       <Filter>Source files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan\src\event.cpp">
+    <ClCompile Include="..\..\guisan-dev\src\event.cpp">
       <Filter>Source files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan\src\exception.cpp">
+    <ClCompile Include="..\..\guisan-dev\src\exception.cpp">
       <Filter>Source files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan\src\focushandler.cpp">
+    <ClCompile Include="..\..\guisan-dev\src\focushandler.cpp">
       <Filter>Source files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan\src\font.cpp">
+    <ClCompile Include="..\..\guisan-dev\src\font.cpp">
       <Filter>Source files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan\src\genericinput.cpp">
+    <ClCompile Include="..\..\guisan-dev\src\genericinput.cpp">
       <Filter>Source files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan\src\graphics.cpp">
+    <ClCompile Include="..\..\guisan-dev\src\graphics.cpp">
       <Filter>Source files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan\src\gui.cpp">
+    <ClCompile Include="..\..\guisan-dev\src\gui.cpp">
       <Filter>Source files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan\src\guisan.cpp">
+    <ClCompile Include="..\..\guisan-dev\src\guisan.cpp">
       <Filter>Source files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan\src\image.cpp">
+    <ClCompile Include="..\..\guisan-dev\src\image.cpp">
       <Filter>Source files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan\src\imagefont.cpp">
+    <ClCompile Include="..\..\guisan-dev\src\imagefont.cpp">
       <Filter>Source files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan\src\inputevent.cpp">
+    <ClCompile Include="..\..\guisan-dev\src\inputevent.cpp">
       <Filter>Source files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan\src\key.cpp">
+    <ClCompile Include="..\..\guisan-dev\src\key.cpp">
       <Filter>Source files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan\src\keyevent.cpp">
+    <ClCompile Include="..\..\guisan-dev\src\keyevent.cpp">
       <Filter>Source files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan\src\keyinput.cpp">
+    <ClCompile Include="..\..\guisan-dev\src\keyinput.cpp">
       <Filter>Source files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan\src\mouseevent.cpp">
+    <ClCompile Include="..\..\guisan-dev\src\mouseevent.cpp">
       <Filter>Source files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan\src\mouseinput.cpp">
+    <ClCompile Include="..\..\guisan-dev\src\mouseinput.cpp">
       <Filter>Source files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan\src\rectangle.cpp">
+    <ClCompile Include="..\..\guisan-dev\src\rectangle.cpp">
       <Filter>Source files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan\src\selectionevent.cpp">
+    <ClCompile Include="..\..\guisan-dev\src\selectionevent.cpp">
       <Filter>Source files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan\src\widget.cpp">
+    <ClCompile Include="..\..\guisan-dev\src\widget.cpp">
       <Filter>Source files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan\src\opengl\opengl.cpp">
+    <ClCompile Include="..\..\guisan-dev\src\opengl\opengl.cpp">
       <Filter>Source files\opengl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan\src\opengl\openglgraphics.cpp">
+    <ClCompile Include="..\..\guisan-dev\src\opengl\openglgraphics.cpp">
       <Filter>Source files\opengl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan\src\opengl\openglimage.cpp">
+    <ClCompile Include="..\..\guisan-dev\src\opengl\openglimage.cpp">
       <Filter>Source files\opengl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan\src\sdl\sdl.cpp">
+    <ClCompile Include="..\..\guisan-dev\src\sdl\sdl.cpp">
       <Filter>Source files\sdl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan\src\sdl\sdlgraphics.cpp">
+    <ClCompile Include="..\..\guisan-dev\src\sdl\sdlgraphics.cpp">
       <Filter>Source files\sdl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan\src\sdl\sdlimage.cpp">
+    <ClCompile Include="..\..\guisan-dev\src\sdl\sdlimage.cpp">
       <Filter>Source files\sdl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan\src\sdl\sdlimageloader.cpp">
+    <ClCompile Include="..\..\guisan-dev\src\sdl\sdlimageloader.cpp">
       <Filter>Source files\sdl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan\src\sdl\sdlinput.cpp">
+    <ClCompile Include="..\..\guisan-dev\src\sdl\sdlinput.cpp">
       <Filter>Source files\sdl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan\src\sdl\sdltruetypefont.cpp">
+    <ClCompile Include="..\..\guisan-dev\src\sdl\sdltruetypefont.cpp">
       <Filter>Source files\sdl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan\src\widgets\button.cpp">
+    <ClCompile Include="..\..\guisan-dev\src\widgets\button.cpp">
       <Filter>Source files\widgets</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan\src\widgets\checkbox.cpp">
+    <ClCompile Include="..\..\guisan-dev\src\widgets\checkbox.cpp">
       <Filter>Source files\widgets</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan\src\widgets\container.cpp">
+    <ClCompile Include="..\..\guisan-dev\src\widgets\container.cpp">
       <Filter>Source files\widgets</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan\src\widgets\dropdown.cpp">
+    <ClCompile Include="..\..\guisan-dev\src\widgets\dropdown.cpp">
       <Filter>Source files\widgets</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan\src\widgets\icon.cpp">
+    <ClCompile Include="..\..\guisan-dev\src\widgets\icon.cpp">
       <Filter>Source files\widgets</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan\src\widgets\imagebutton.cpp">
+    <ClCompile Include="..\..\guisan-dev\src\widgets\imagebutton.cpp">
       <Filter>Source files\widgets</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan\src\widgets\label.cpp">
+    <ClCompile Include="..\..\guisan-dev\src\widgets\label.cpp">
       <Filter>Source files\widgets</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan\src\widgets\listbox.cpp">
+    <ClCompile Include="..\..\guisan-dev\src\widgets\listbox.cpp">
       <Filter>Source files\widgets</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan\src\widgets\radiobutton.cpp">
+    <ClCompile Include="..\..\guisan-dev\src\widgets\radiobutton.cpp">
       <Filter>Source files\widgets</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan\src\widgets\scrollarea.cpp">
+    <ClCompile Include="..\..\guisan-dev\src\widgets\scrollarea.cpp">
       <Filter>Source files\widgets</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan\src\widgets\slider.cpp">
+    <ClCompile Include="..\..\guisan-dev\src\widgets\slider.cpp">
       <Filter>Source files\widgets</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan\src\widgets\tab.cpp">
+    <ClCompile Include="..\..\guisan-dev\src\widgets\tab.cpp">
       <Filter>Source files\widgets</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan\src\widgets\tabbedarea.cpp">
+    <ClCompile Include="..\..\guisan-dev\src\widgets\tabbedarea.cpp">
       <Filter>Source files\widgets</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan\src\widgets\textbox.cpp">
+    <ClCompile Include="..\..\guisan-dev\src\widgets\textbox.cpp">
       <Filter>Source files\widgets</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan\src\widgets\textfield.cpp">
+    <ClCompile Include="..\..\guisan-dev\src\widgets\textfield.cpp">
       <Filter>Source files\widgets</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan\src\widgets\window.cpp">
+    <ClCompile Include="..\..\guisan-dev\src\widgets\window.cpp">
       <Filter>Source files\widgets</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\guisan\src\widgets\progressbar.cpp">
+    <ClCompile Include="..\..\guisan-dev\src\widgets\progressbar.cpp">
       <Filter>Source files\widgets</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\guisan\include\guisan.hpp">
+    <ClInclude Include="..\..\guisan-dev\include\guisan.hpp">
       <Filter>Header files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan\include\guisan\actionevent.hpp">
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\actionevent.hpp">
       <Filter>Header files\guisan</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan\include\guisan\actionlistener.hpp">
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\actionlistener.hpp">
       <Filter>Header files\guisan</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan\include\guisan\basiccontainer.hpp">
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\basiccontainer.hpp">
       <Filter>Header files\guisan</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan\include\guisan\cliprectangle.hpp">
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\cliprectangle.hpp">
       <Filter>Header files\guisan</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan\include\guisan\color.hpp">
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\color.hpp">
       <Filter>Header files\guisan</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan\include\guisan\deathlistener.hpp">
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\deathlistener.hpp">
       <Filter>Header files\guisan</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan\include\guisan\defaultfont.hpp">
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\defaultfont.hpp">
       <Filter>Header files\guisan</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan\include\guisan\event.hpp">
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\event.hpp">
       <Filter>Header files\guisan</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan\include\guisan\exception.hpp">
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\exception.hpp">
       <Filter>Header files\guisan</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan\include\guisan\focushandler.hpp">
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\focushandler.hpp">
       <Filter>Header files\guisan</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan\include\guisan\focuslistener.hpp">
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\focuslistener.hpp">
       <Filter>Header files\guisan</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan\include\guisan\font.hpp">
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\font.hpp">
       <Filter>Header files\guisan</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan\include\guisan\genericinput.hpp">
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\genericinput.hpp">
       <Filter>Header files\guisan</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan\include\guisan\glut.hpp">
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\glut.hpp">
       <Filter>Header files\guisan</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan\include\guisan\graphics.hpp">
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\graphics.hpp">
       <Filter>Header files\guisan</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan\include\guisan\gui.hpp">
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\gui.hpp">
       <Filter>Header files\guisan</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan\include\guisan\image.hpp">
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\image.hpp">
       <Filter>Header files\guisan</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan\include\guisan\imagefont.hpp">
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\imagefont.hpp">
       <Filter>Header files\guisan</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan\include\guisan\imageloader.hpp">
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\imageloader.hpp">
       <Filter>Header files\guisan</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan\include\guisan\input.hpp">
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\input.hpp">
       <Filter>Header files\guisan</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan\include\guisan\inputevent.hpp">
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\inputevent.hpp">
       <Filter>Header files\guisan</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan\include\guisan\key.hpp">
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\key.hpp">
       <Filter>Header files\guisan</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan\include\guisan\keyevent.hpp">
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\keyevent.hpp">
       <Filter>Header files\guisan</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan\include\guisan\keyinput.hpp">
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\keyinput.hpp">
       <Filter>Header files\guisan</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan\include\guisan\keylistener.hpp">
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\keylistener.hpp">
       <Filter>Header files\guisan</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan\include\guisan\listmodel.hpp">
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\listmodel.hpp">
       <Filter>Header files\guisan</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan\include\guisan\mouseevent.hpp">
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\mouseevent.hpp">
       <Filter>Header files\guisan</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan\include\guisan\mouseinput.hpp">
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\mouseinput.hpp">
       <Filter>Header files\guisan</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan\include\guisan\mouselistener.hpp">
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\mouselistener.hpp">
       <Filter>Header files\guisan</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan\include\guisan\opengl.hpp">
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\opengl.hpp">
       <Filter>Header files\guisan</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan\include\guisan\platform.hpp">
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\platform.hpp">
       <Filter>Header files\guisan</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan\include\guisan\rectangle.hpp">
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\rectangle.hpp">
       <Filter>Header files\guisan</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan\include\guisan\sdl.hpp">
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\sdl.hpp">
       <Filter>Header files\guisan</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan\include\guisan\selectionevent.hpp">
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\selectionevent.hpp">
       <Filter>Header files\guisan</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan\include\guisan\selectionlistener.hpp">
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\selectionlistener.hpp">
       <Filter>Header files\guisan</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan\include\guisan\widget.hpp">
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\widget.hpp">
       <Filter>Header files\guisan</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan\include\guisan\widgetlistener.hpp">
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\widgetlistener.hpp">
       <Filter>Header files\guisan</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan\include\guisan\x.hpp">
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\x.hpp">
       <Filter>Header files\guisan</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan\include\guisan\opengl\openglgraphics.hpp">
-      <Filter>Header files\guisan\opengl</Filter>
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\opengl\openglgraphics.hpp">
+      <Filter>Header files\guisan-dev\opengl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan\include\guisan\opengl\openglimage.hpp">
-      <Filter>Header files\guisan\opengl</Filter>
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\opengl\openglimage.hpp">
+      <Filter>Header files\guisan-dev\opengl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan\include\guisan\opengl\openglsdlimageloader.hpp">
-      <Filter>Header files\guisan\opengl</Filter>
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\opengl\openglsdlimageloader.hpp">
+      <Filter>Header files\guisan-dev\opengl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan\include\guisan\sdl\sdlgraphics.hpp">
-      <Filter>Header files\guisan\sdl</Filter>
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\sdl\sdlgraphics.hpp">
+      <Filter>Header files\guisan-dev\sdl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan\include\guisan\sdl\sdlimage.hpp">
-      <Filter>Header files\guisan\sdl</Filter>
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\sdl\sdlimage.hpp">
+      <Filter>Header files\guisan-dev\sdl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan\include\guisan\sdl\sdlimageloader.hpp">
-      <Filter>Header files\guisan\sdl</Filter>
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\sdl\sdlimageloader.hpp">
+      <Filter>Header files\guisan-dev\sdl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan\include\guisan\sdl\sdlinput.hpp">
-      <Filter>Header files\guisan\sdl</Filter>
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\sdl\sdlinput.hpp">
+      <Filter>Header files\guisan-dev\sdl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan\include\guisan\sdl\sdlpixel.hpp">
-      <Filter>Header files\guisan\sdl</Filter>
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\sdl\sdlpixel.hpp">
+      <Filter>Header files\guisan-dev\sdl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan\include\guisan\sdl\sdltruetypefont.hpp">
-      <Filter>Header files\guisan\sdl</Filter>
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\sdl\sdltruetypefont.hpp">
+      <Filter>Header files\guisan-dev\sdl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan\include\guisan\widgets\button.hpp">
-      <Filter>Header files\guisan\widgets</Filter>
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\widgets\button.hpp">
+      <Filter>Header files\guisan-dev\widgets</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan\include\guisan\widgets\checkbox.hpp">
-      <Filter>Header files\guisan\widgets</Filter>
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\widgets\checkbox.hpp">
+      <Filter>Header files\guisan-dev\widgets</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan\include\guisan\widgets\container.hpp">
-      <Filter>Header files\guisan\widgets</Filter>
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\widgets\container.hpp">
+      <Filter>Header files\guisan-dev\widgets</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan\include\guisan\widgets\dropdown.hpp">
-      <Filter>Header files\guisan\widgets</Filter>
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\widgets\dropdown.hpp">
+      <Filter>Header files\guisan-dev\widgets</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan\include\guisan\widgets\icon.hpp">
-      <Filter>Header files\guisan\widgets</Filter>
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\widgets\icon.hpp">
+      <Filter>Header files\guisan-dev\widgets</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan\include\guisan\widgets\imagebutton.hpp">
-      <Filter>Header files\guisan\widgets</Filter>
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\widgets\imagebutton.hpp">
+      <Filter>Header files\guisan-dev\widgets</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan\include\guisan\widgets\label.hpp">
-      <Filter>Header files\guisan\widgets</Filter>
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\widgets\label.hpp">
+      <Filter>Header files\guisan-dev\widgets</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan\include\guisan\widgets\listbox.hpp">
-      <Filter>Header files\guisan\widgets</Filter>
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\widgets\listbox.hpp">
+      <Filter>Header files\guisan-dev\widgets</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan\include\guisan\widgets\radiobutton.hpp">
-      <Filter>Header files\guisan\widgets</Filter>
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\widgets\radiobutton.hpp">
+      <Filter>Header files\guisan-dev\widgets</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan\include\guisan\widgets\scrollarea.hpp">
-      <Filter>Header files\guisan\widgets</Filter>
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\widgets\scrollarea.hpp">
+      <Filter>Header files\guisan-dev\widgets</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan\include\guisan\widgets\slider.hpp">
-      <Filter>Header files\guisan\widgets</Filter>
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\widgets\slider.hpp">
+      <Filter>Header files\guisan-dev\widgets</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan\include\guisan\widgets\tab.hpp">
-      <Filter>Header files\guisan\widgets</Filter>
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\widgets\tab.hpp">
+      <Filter>Header files\guisan-dev\widgets</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan\include\guisan\widgets\tabbedarea.hpp">
-      <Filter>Header files\guisan\widgets</Filter>
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\widgets\tabbedarea.hpp">
+      <Filter>Header files\guisan-dev\widgets</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan\include\guisan\widgets\textbox.hpp">
-      <Filter>Header files\guisan\widgets</Filter>
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\widgets\textbox.hpp">
+      <Filter>Header files\guisan-dev\widgets</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan\include\guisan\widgets\textfield.hpp">
-      <Filter>Header files\guisan\widgets</Filter>
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\widgets\textfield.hpp">
+      <Filter>Header files\guisan-dev\widgets</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan\include\guisan\widgets\window.hpp">
-      <Filter>Header files\guisan\widgets</Filter>
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\widgets\window.hpp">
+      <Filter>Header files\guisan-dev\widgets</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\guisan\include\guisan\widgets\progressbar.hpp">
-      <Filter>Header files\guisan\widgets</Filter>
+    <ClInclude Include="..\..\guisan-dev\include\guisan-dev\widgets\progressbar.hpp">
+      <Filter>Header files\guisan-dev\widgets</Filter>
     </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file