From 42d5ba62f9a1b206d4aa1717878314b8bb871b07 Mon Sep 17 00:00:00 2001
From: Dimitris Panokostas <midwan@gmail.com>
Date: Fri, 17 Mar 2017 23:05:02 +0100
Subject: [PATCH] Fixed references to moved files

---
 VisualGDB/Amiberry.sln                        | 30 +------
 .../Amiberry/Amiberry-Debug.vgdbsettings      | 17 +++-
 VisualGDB/Amiberry/Amiberry.vcxproj           | 24 +++---
 VisualGDB/Amiberry/Amiberry.vcxproj.filters   | 84 ++++++++-----------
 4 files changed, 64 insertions(+), 91 deletions(-)

diff --git a/VisualGDB/Amiberry.sln b/VisualGDB/Amiberry.sln
index 2d8e4f51..1249cc66 100644
--- a/VisualGDB/Amiberry.sln
+++ b/VisualGDB/Amiberry.sln
@@ -1,11 +1,9 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.25920.0
+VisualStudioVersion = 15.0.26228.9
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Amiberry", "Amiberry\Amiberry.vcxproj", "{D76BB09D-FF2A-4028-A065-421C430CD238}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Amiberry-gles", "Amiberry-gles\Amiberry-gles.vcxproj", "{AB3DAC01-999D-43CD-A9CD-4B2A16B6063E}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|VisualGDB = Debug|VisualGDB
@@ -38,32 +36,6 @@ Global
 		{D76BB09D-FF2A-4028-A065-421C430CD238}.Release-rpi2|VisualGDB.Build.0 = Release-rpi2|VisualGDB
 		{D76BB09D-FF2A-4028-A065-421C430CD238}.Release-rpi2|x64.ActiveCfg = Release-rpi2|VisualGDB
 		{D76BB09D-FF2A-4028-A065-421C430CD238}.Release-rpi2|x86.ActiveCfg = Release-rpi2|VisualGDB
-		{AB3DAC01-999D-43CD-A9CD-4B2A16B6063E}.Debug|VisualGDB.ActiveCfg = Debug|VisualGDB
-		{AB3DAC01-999D-43CD-A9CD-4B2A16B6063E}.Debug|VisualGDB.Build.0 = Debug|VisualGDB
-		{AB3DAC01-999D-43CD-A9CD-4B2A16B6063E}.Debug|x64.ActiveCfg = Debug|VisualGDB
-		{AB3DAC01-999D-43CD-A9CD-4B2A16B6063E}.Debug|x86.ActiveCfg = Debug|VisualGDB
-		{AB3DAC01-999D-43CD-A9CD-4B2A16B6063E}.Release|VisualGDB.ActiveCfg = Release|VisualGDB
-		{AB3DAC01-999D-43CD-A9CD-4B2A16B6063E}.Release|VisualGDB.Build.0 = Release|VisualGDB
-		{AB3DAC01-999D-43CD-A9CD-4B2A16B6063E}.Release|x64.ActiveCfg = Release|VisualGDB
-		{AB3DAC01-999D-43CD-A9CD-4B2A16B6063E}.Release|x86.ActiveCfg = Release|VisualGDB
-		{AB3DAC01-999D-43CD-A9CD-4B2A16B6063E}.Release-rpi1|VisualGDB.ActiveCfg = Release|VisualGDB
-		{AB3DAC01-999D-43CD-A9CD-4B2A16B6063E}.Release-rpi1|VisualGDB.Build.0 = Release|VisualGDB
-		{AB3DAC01-999D-43CD-A9CD-4B2A16B6063E}.Release-rpi1|VisualGDB.Deploy.0 = Release|VisualGDB
-		{AB3DAC01-999D-43CD-A9CD-4B2A16B6063E}.Release-rpi1|x64.ActiveCfg = Release|VisualGDB
-		{AB3DAC01-999D-43CD-A9CD-4B2A16B6063E}.Release-rpi1|x64.Build.0 = Release|VisualGDB
-		{AB3DAC01-999D-43CD-A9CD-4B2A16B6063E}.Release-rpi1|x64.Deploy.0 = Release|VisualGDB
-		{AB3DAC01-999D-43CD-A9CD-4B2A16B6063E}.Release-rpi1|x86.ActiveCfg = Release|VisualGDB
-		{AB3DAC01-999D-43CD-A9CD-4B2A16B6063E}.Release-rpi1|x86.Build.0 = Release|VisualGDB
-		{AB3DAC01-999D-43CD-A9CD-4B2A16B6063E}.Release-rpi1|x86.Deploy.0 = Release|VisualGDB
-		{AB3DAC01-999D-43CD-A9CD-4B2A16B6063E}.Release-rpi2|VisualGDB.ActiveCfg = Release|VisualGDB
-		{AB3DAC01-999D-43CD-A9CD-4B2A16B6063E}.Release-rpi2|VisualGDB.Build.0 = Release|VisualGDB
-		{AB3DAC01-999D-43CD-A9CD-4B2A16B6063E}.Release-rpi2|VisualGDB.Deploy.0 = Release|VisualGDB
-		{AB3DAC01-999D-43CD-A9CD-4B2A16B6063E}.Release-rpi2|x64.ActiveCfg = Release|VisualGDB
-		{AB3DAC01-999D-43CD-A9CD-4B2A16B6063E}.Release-rpi2|x64.Build.0 = Release|VisualGDB
-		{AB3DAC01-999D-43CD-A9CD-4B2A16B6063E}.Release-rpi2|x64.Deploy.0 = Release|VisualGDB
-		{AB3DAC01-999D-43CD-A9CD-4B2A16B6063E}.Release-rpi2|x86.ActiveCfg = Release|VisualGDB
-		{AB3DAC01-999D-43CD-A9CD-4B2A16B6063E}.Release-rpi2|x86.Build.0 = Release|VisualGDB
-		{AB3DAC01-999D-43CD-A9CD-4B2A16B6063E}.Release-rpi2|x86.Deploy.0 = Release|VisualGDB
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/VisualGDB/Amiberry/Amiberry-Debug.vgdbsettings b/VisualGDB/Amiberry/Amiberry-Debug.vgdbsettings
index c137fa0e..820485ad 100644
--- a/VisualGDB/Amiberry/Amiberry-Debug.vgdbsettings
+++ b/VisualGDB/Amiberry/Amiberry-Debug.vgdbsettings
@@ -70,6 +70,7 @@
     <ProjectFile>Amiberry.vcxproj</ProjectFile>
     <RemoteBuildEnvironment>
       <Records />
+      <EnvironmentSetupFiles />
     </RemoteBuildEnvironment>
     <ParallelJobCount>1</ParallelJobCount>
   </Build>
@@ -111,12 +112,13 @@
     </LaunchGDBSettings>
     <GenerateCtrlBreakInsteadOfCtrlC>false</GenerateCtrlBreakInsteadOfCtrlC>
     <DeploymentTargetPath>/home/pi/projects/amiberry/$(TargetFileName)</DeploymentTargetPath>
-    <X11WindowMode>Local</X11WindowMode>
+    <X11WindowMode>Remote</X11WindowMode>
     <KeepConsoleAfterExit>false</KeepConsoleAfterExit>
     <RunGDBUnderSudo>true</RunGDBUnderSudo>
     <DeploymentMode>Auto</DeploymentMode>
     <LdLibraryPath />
     <DeployWhenLaunchedWithoutDebugging>true</DeployWhenLaunchedWithoutDebugging>
+    <SuppressTTYCreation>false</SuppressTTYCreation>
   </Debug>
   <CustomBuild>
     <PreSyncActions />
@@ -138,9 +140,20 @@
   <UserDefinedVariables />
   <ImportedPropertySheets />
   <CodeSense>
-    <Enabled>Unknown</Enabled>
+    <Enabled>False</Enabled>
+    <CFLAGS />
+    <CXXFLAGS />
+    <ExternalSourceFileList />
     <ExtraSettings>
       <HideErrorsInSystemHeaders>true</HideErrorsInSystemHeaders>
+      <DiscoverySettings>
+        <Mode>Enabled</Mode>
+        <SearchInProjectDir>true</SearchInProjectDir>
+        <SearchInSourceDirs>true</SearchInSourceDirs>
+        <SearchInIncludeSubdirs>true</SearchInIncludeSubdirs>
+        <IgnoredDirs />
+        <IgnoredHeaders />
+      </DiscoverySettings>
     </ExtraSettings>
   </CodeSense>
   <BuildContextDirectory>VisualGDB\VisualGDBCache</BuildContextDirectory>
diff --git a/VisualGDB/Amiberry/Amiberry.vcxproj b/VisualGDB/Amiberry/Amiberry.vcxproj
index d88fd9a1..bce23cbf 100644
--- a/VisualGDB/Amiberry/Amiberry.vcxproj
+++ b/VisualGDB/Amiberry/Amiberry.vcxproj
@@ -114,15 +114,15 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\src\akiko.cpp" />
+    <ClCompile Include="..\..\src\archivers\7z\7zAlloc.cpp" />
     <ClCompile Include="..\..\src\archivers\7z\7zBuf.cpp" />
     <ClCompile Include="..\..\src\archivers\7z\7zCrc.cpp" />
+    <ClCompile Include="..\..\src\archivers\7z\7zDecode.cpp" />
+    <ClCompile Include="..\..\src\archivers\7z\7zExtract.cpp" />
+    <ClCompile Include="..\..\src\archivers\7z\7zHeader.cpp" />
+    <ClCompile Include="..\..\src\archivers\7z\7zIn.cpp" />
+    <ClCompile Include="..\..\src\archivers\7z\7zItem.cpp" />
     <ClCompile Include="..\..\src\archivers\7z\7zStream.cpp" />
-    <ClCompile Include="..\..\src\archivers\7z\Archive\7z\7zAlloc.cpp" />
-    <ClCompile Include="..\..\src\archivers\7z\Archive\7z\7zDecode.cpp" />
-    <ClCompile Include="..\..\src\archivers\7z\Archive\7z\7zExtract.cpp" />
-    <ClCompile Include="..\..\src\archivers\7z\Archive\7z\7zHeader.cpp" />
-    <ClCompile Include="..\..\src\archivers\7z\Archive\7z\7zIn.cpp" />
-    <ClCompile Include="..\..\src\archivers\7z\Archive\7z\7zItem.cpp" />
     <ClCompile Include="..\..\src\archivers\7z\Bcj2.cpp" />
     <ClCompile Include="..\..\src\archivers\7z\Bra.cpp" />
     <ClCompile Include="..\..\src\archivers\7z\Bra86.cpp" />
@@ -312,15 +312,15 @@
     </Font>
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\..\src\archivers\7z\7zAlloc.h" />
     <ClInclude Include="..\..\src\archivers\7z\7zBuf.h" />
     <ClInclude Include="..\..\src\archivers\7z\7zCrc.h" />
+    <ClInclude Include="..\..\src\archivers\7z\7zDecode.h" />
+    <ClInclude Include="..\..\src\archivers\7z\7zExtract.h" />
+    <ClInclude Include="..\..\src\archivers\7z\7zHeader.h" />
+    <ClInclude Include="..\..\src\archivers\7z\7zIn.h" />
+    <ClInclude Include="..\..\src\archivers\7z\7zItem.h" />
     <ClInclude Include="..\..\src\archivers\7z\7zVersion.h" />
-    <ClInclude Include="..\..\src\archivers\7z\Archive\7z\7zAlloc.h" />
-    <ClInclude Include="..\..\src\archivers\7z\Archive\7z\7zDecode.h" />
-    <ClInclude Include="..\..\src\archivers\7z\Archive\7z\7zExtract.h" />
-    <ClInclude Include="..\..\src\archivers\7z\Archive\7z\7zHeader.h" />
-    <ClInclude Include="..\..\src\archivers\7z\Archive\7z\7zIn.h" />
-    <ClInclude Include="..\..\src\archivers\7z\Archive\7z\7zItem.h" />
     <ClInclude Include="..\..\src\archivers\7z\Bcj2.h" />
     <ClInclude Include="..\..\src\archivers\7z\Bra.h" />
     <ClInclude Include="..\..\src\archivers\7z\CpuArch.h" />
diff --git a/VisualGDB/Amiberry/Amiberry.vcxproj.filters b/VisualGDB/Amiberry/Amiberry.vcxproj.filters
index eebbc39f..bfecd802 100644
--- a/VisualGDB/Amiberry/Amiberry.vcxproj.filters
+++ b/VisualGDB/Amiberry/Amiberry.vcxproj.filters
@@ -41,18 +41,6 @@
     <Filter Include="Source files\archivers\7z">
       <UniqueIdentifier>{4e7f85db-d3e3-4b65-b969-a7b829bc3281}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Header files\archivers\7z\Archive">
-      <UniqueIdentifier>{b1a09498-1e4a-40d4-a986-9e09ad865690}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header files\archivers\7z\Archive\7z">
-      <UniqueIdentifier>{dcfa291d-f91e-4f23-a259-791df4811cc0}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source files\archivers\7z\Archive">
-      <UniqueIdentifier>{7944e92f-3c23-4f86-842a-aa199a00dd35}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source files\archivers\7z\Archive\7z">
-      <UniqueIdentifier>{ad85bf25-c171-40d2-ae9d-997bd5237bab}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Header files\archivers\dms">
       <UniqueIdentifier>{a44fad77-d044-486d-8a84-3f2f17c6bb49}</UniqueIdentifier>
     </Filter>
@@ -459,24 +447,6 @@
     <ClCompile Include="..\..\src\archivers\7z\LzmaDec.cpp">
       <Filter>Source files\archivers\7z</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\archivers\7z\Archive\7z\7zAlloc.cpp">
-      <Filter>Source files\archivers\7z\Archive\7z</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\archivers\7z\Archive\7z\7zDecode.cpp">
-      <Filter>Source files\archivers\7z\Archive\7z</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\archivers\7z\Archive\7z\7zExtract.cpp">
-      <Filter>Source files\archivers\7z\Archive\7z</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\archivers\7z\Archive\7z\7zHeader.cpp">
-      <Filter>Source files\archivers\7z\Archive\7z</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\archivers\7z\Archive\7z\7zIn.cpp">
-      <Filter>Source files\archivers\7z\Archive\7z</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\archivers\7z\Archive\7z\7zItem.cpp">
-      <Filter>Source files\archivers\7z\Archive\7z</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\archivers\dms\crc_csum.cpp">
       <Filter>Source files\archivers\dms</Filter>
     </ClCompile>
@@ -558,6 +528,24 @@
     <ClCompile Include="..\..\src\osdep\rasp_gfx.cpp">
       <Filter>Source files\osdep</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\archivers\7z\7zAlloc.cpp">
+      <Filter>Source files\archivers\7z</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\archivers\7z\7zDecode.cpp">
+      <Filter>Source files\archivers\7z</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\archivers\7z\7zExtract.cpp">
+      <Filter>Source files\archivers\7z</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\archivers\7z\7zHeader.cpp">
+      <Filter>Source files\archivers\7z</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\archivers\7z\7zIn.cpp">
+      <Filter>Source files\archivers\7z</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\archivers\7z\7zItem.cpp">
+      <Filter>Source files\archivers\7z</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Image Include="..\..\data\35floppy.ico">
@@ -888,24 +876,6 @@
     <ClInclude Include="..\..\src\archivers\7z\Types.h">
       <Filter>Header files\archivers\7z</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\archivers\7z\Archive\7z\7zAlloc.h">
-      <Filter>Header files\archivers\7z\Archive\7z</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\archivers\7z\Archive\7z\7zDecode.h">
-      <Filter>Header files\archivers\7z\Archive\7z</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\archivers\7z\Archive\7z\7zExtract.h">
-      <Filter>Header files\archivers\7z\Archive\7z</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\archivers\7z\Archive\7z\7zHeader.h">
-      <Filter>Header files\archivers\7z\Archive\7z</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\archivers\7z\Archive\7z\7zIn.h">
-      <Filter>Header files\archivers\7z\Archive\7z</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\archivers\7z\Archive\7z\7zItem.h">
-      <Filter>Header files\archivers\7z\Archive\7z</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\archivers\dms\cdata.h">
       <Filter>Header files\archivers\dms</Filter>
     </ClInclude>
@@ -954,5 +924,23 @@
     <ClInclude Include="..\..\src\archivers\zip\unzip.h">
       <Filter>Header files\archivers\zip</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\archivers\7z\7zAlloc.h">
+      <Filter>Header files\archivers\7z</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\archivers\7z\7zDecode.h">
+      <Filter>Header files\archivers\7z</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\archivers\7z\7zExtract.h">
+      <Filter>Header files\archivers\7z</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\archivers\7z\7zHeader.h">
+      <Filter>Header files\archivers\7z</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\archivers\7z\7zIn.h">
+      <Filter>Header files\archivers\7z</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\archivers\7z\7zItem.h">
+      <Filter>Header files\archivers\7z</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file