diff --git a/.gitignore b/.gitignore
index e6aa1c9d..34a8ec69 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,4 +30,5 @@ VisualGDB/VisualGDB/Release/Amiberry
 VisualGDB/VisualGDB/Release/Amiberry-sdl2
 *.npa00-cfdc2249
 *.a
-*.npa00-f5145647
\ No newline at end of file
+*.npa00-f5145647
+VisualGDB/VisualGDB/Debug/Amiberry-sdl2
\ No newline at end of file
diff --git a/VisualGDB/Amiberry/Amiberry.vcxproj b/VisualGDB/Amiberry/Amiberry.vcxproj
index 09abd5da..55574f5f 100644
--- a/VisualGDB/Amiberry/Amiberry.vcxproj
+++ b/VisualGDB/Amiberry/Amiberry.vcxproj
@@ -31,6 +31,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|VisualGDB'">
     <GNUConfigurationType>Debug</GNUConfigurationType>
     <Toolchain>C:\SysGCC\raspberry</Toolchain>
+    <TargetName>$(ProjectName)-sdl2</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|VisualGDB'">
     <Toolchain>C:\SysGCC\raspberry</Toolchain>
@@ -38,10 +39,11 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-rpi2|VisualGDB'">
     <Toolchain>C:\SysGCC\raspberry</Toolchain>
-    <TargetName>$(ProjectName)-sdl2</TargetName>
+    <TargetName>$(ProjectName)-sdl2-rpi2</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-rpi1|VisualGDB'">
     <Toolchain>C:\SysGCC\raspberry</Toolchain>
+    <TargetName>$(ProjectName)-sdl2-rpi1</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|VisualGDB'">
     <ClCompile>
diff --git a/VisualGDB/guisan/guisan-Debug.vgdbsettings b/VisualGDB/guisan/guisan-Debug.vgdbsettings
index e19a7dfb..ecad5292 100644
--- a/VisualGDB/guisan/guisan-Debug.vgdbsettings
+++ b/VisualGDB/guisan/guisan-Debug.vgdbsettings
@@ -6,11 +6,31 @@
       <Directories />
       <PathStyle>MinGWUnixSlash</PathStyle>
     </CustomSourceDirectories>
-    <DeploymentHost>
-      <HostName>192.168.1.152</HostName>
-      <Transport>SSH</Transport>
-      <UserName>pi</UserName>
-    </DeploymentHost>
+    <BuildHost>
+      <Transport>None</Transport>
+    </BuildHost>
+    <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>*.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>
+      <DeleteDisappearedFiles>false</DeleteDisappearedFiles>
+    </MainSourceTransferCommand>
     <AllowChangingHostForMainCommands>false</AllowChangingHostForMainCommands>
     <SkipBuildIfNoSourceFilesChanged>false</SkipBuildIfNoSourceFilesChanged>
     <IgnoreFileTransferErrors>false</IgnoreFileTransferErrors>
diff --git a/VisualGDB/guisan/guisan.vcxproj b/VisualGDB/guisan/guisan.vcxproj
index 4fb5dde8..3ee9f511 100644
--- a/VisualGDB/guisan/guisan.vcxproj
+++ b/VisualGDB/guisan/guisan.vcxproj
@@ -25,11 +25,13 @@
     <Toolchain>C:\SysGCC\raspberry</Toolchain>
     <GNUTargetType>StaticLibrary</GNUTargetType>
     <OutDir>..\..\src\guisan\lib</OutDir>
+    <TargetName>libguisan</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|VisualGDB'">
     <Toolchain>C:\SysGCC\raspberry</Toolchain>
     <GNUTargetType>StaticLibrary</GNUTargetType>
     <OutDir>..\..\src\guisan\lib</OutDir>
+    <TargetName>libguisan</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|VisualGDB'">
     <ClCompile>