From 5bd91c5ee660fd31fe35f65c030660e9e9274c5b Mon Sep 17 00:00:00 2001
From: Dimitris Panokostas <midwan@gmail.com>
Date: Fri, 11 Oct 2019 23:16:19 +0200
Subject: [PATCH] VisualGDB solution and settings cleanup

---
 .../Amiberry/Amiberry-Debug.vgdbsettings      |  3 ++-
 .../Amiberry/Amiberry-Release.vgdbsettings    |  2 +-
 VisualGDB/Amiberry/Amiberry.sln               | 21 -------------------
 3 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/VisualGDB/Amiberry/Amiberry-Debug.vgdbsettings b/VisualGDB/Amiberry/Amiberry-Debug.vgdbsettings
index aff9e3ff..5a9521ad 100644
--- a/VisualGDB/Amiberry/Amiberry-Debug.vgdbsettings
+++ b/VisualGDB/Amiberry/Amiberry-Debug.vgdbsettings
@@ -55,6 +55,7 @@
     <ProjectFile>Amiberry.vcxproj</ProjectFile>
     <RemoteBuildEnvironment>
       <Records />
+      <EnvironmentSetupFiles />
     </RemoteBuildEnvironment>
     <ParallelJobCount>1</ParallelJobCount>
     <SuppressDirectoryChangeMessages>true</SuppressDirectoryChangeMessages>
@@ -183,7 +184,7 @@
     </LaunchGDBSettings>
     <GenerateCtrlBreakInsteadOfCtrlC>false</GenerateCtrlBreakInsteadOfCtrlC>
     <DeploymentTargetPath>/home/pi/projects/amiberry/$(TargetFileName)</DeploymentTargetPath>
-    <X11WindowMode>Local</X11WindowMode>
+    <X11WindowMode>Remote</X11WindowMode>
     <KeepConsoleAfterExit>false</KeepConsoleAfterExit>
     <RunGDBUnderSudo>false</RunGDBUnderSudo>
     <DeploymentMode>Auto</DeploymentMode>
diff --git a/VisualGDB/Amiberry/Amiberry-Release.vgdbsettings b/VisualGDB/Amiberry/Amiberry-Release.vgdbsettings
index 0f012b79..c26cbdb9 100644
--- a/VisualGDB/Amiberry/Amiberry-Release.vgdbsettings
+++ b/VisualGDB/Amiberry/Amiberry-Release.vgdbsettings
@@ -148,7 +148,7 @@
     <KeepConsoleAfterExit>false</KeepConsoleAfterExit>
     <RunGDBUnderSudo>false</RunGDBUnderSudo>
     <DeploymentMode>Auto</DeploymentMode>
-    <LdLibraryPath />
+    <LdLibraryPath>/usr/local/lib</LdLibraryPath>
     <DeployWhenLaunchedWithoutDebugging>true</DeployWhenLaunchedWithoutDebugging>
     <SuppressTTYCreation>false</SuppressTTYCreation>
   </Debug>
diff --git a/VisualGDB/Amiberry/Amiberry.sln b/VisualGDB/Amiberry/Amiberry.sln
index 1c679efb..b6b04af7 100644
--- a/VisualGDB/Amiberry/Amiberry.sln
+++ b/VisualGDB/Amiberry/Amiberry.sln
@@ -10,8 +10,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Amiberry", "Amiberry.vcxpro
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "guisan", "..\guisan\guisan.vcxproj", "{E613050D-EE8C-4ED1-936D-EB9E0E155EA6}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Amiberry-RPI1", "..\Amiberry-RPI1\Amiberry-RPI1.vcxproj", "{740C6C27-4C85-4927-A508-49116A0D36F9}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|VisualGDB = Debug|VisualGDB
@@ -64,25 +62,6 @@ Global
 		{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
-		{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|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