From 43e9ddc1fcddb632fc1e661495e468a2ebdf6fec Mon Sep 17 00:00:00 2001
From: lateralusX <lateralusx.github@gmail.com>
Date: Wed, 27 Sep 2017 14:10:29 +0200
Subject: [PATCH] Fix eglib targets and filters.

---
 msvc/eglib-common.targets.filters | 61 ++++++++++++++++++-------------
 msvc/eglib-posix.targets.filters  |  7 +++-
 msvc/eglib-win32.targets.filters  | 26 ++++++++-----
 msvc/eglib.targets.filters        | 17 ---------
 4 files changed, 59 insertions(+), 52 deletions(-)

diff --git a/msvc/eglib-common.targets.filters b/msvc/eglib-common.targets.filters
index e719977b2cf..a36846dc576 100644
--- a/msvc/eglib-common.targets.filters
+++ b/msvc/eglib-common.targets.filters
@@ -2,83 +2,94 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <ClCompile Include="$(MonoSourceLocation)\mono\eglib\garray.c">
-      <Filter>Source Files$(EGLibFilterSubFolder)\Common</Filter>
+      <Filter>Source Files$(EGLibFilterSubFolder)\common</Filter>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gbytearray.c">
-      <Filter>Source Files$(EGLibFilterSubFolder)\Common</Filter>
+      <Filter>Source Files$(EGLibFilterSubFolder)\common</Filter>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gfile.c">
-      <Filter>Source Files$(EGLibFilterSubFolder)\Common</Filter>
+      <Filter>Source Files$(EGLibFilterSubFolder)\common</Filter>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gerror.c">
-      <Filter>Source Files$(EGLibFilterSubFolder)\Common</Filter>
+      <Filter>Source Files$(EGLibFilterSubFolder)\common</Filter>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\eglib\ghashtable.c">
-      <Filter>Source Files$(EGLibFilterSubFolder)\Common</Filter>
+      <Filter>Source Files$(EGLibFilterSubFolder)\common</Filter>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\eglib\giconv.c">
-      <Filter>Source Files$(EGLibFilterSubFolder)\Common</Filter>
+      <Filter>Source Files$(EGLibFilterSubFolder)\common</Filter>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\eglib\glist.c">
-      <Filter>Source Files$(EGLibFilterSubFolder)\Common</Filter>
+      <Filter>Source Files$(EGLibFilterSubFolder)\common</Filter>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gmarkup.c">
-      <Filter>Source Files$(EGLibFilterSubFolder)\Common</Filter>
+      <Filter>Source Files$(EGLibFilterSubFolder)\common</Filter>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gmem.c">
-      <Filter>Source Files$(EGLibFilterSubFolder)\Common</Filter>
+      <Filter>Source Files$(EGLibFilterSubFolder)\common</Filter>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\eglib\goutput.c">
-      <Filter>Source Files$(EGLibFilterSubFolder)\Common</Filter>
+      <Filter>Source Files$(EGLibFilterSubFolder)\common</Filter>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gpattern.c">
-      <Filter>Source Files$(EGLibFilterSubFolder)\Common</Filter>
+      <Filter>Source Files$(EGLibFilterSubFolder)\common</Filter>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gptrarray.c">
-      <Filter>Source Files$(EGLibFilterSubFolder)\Common</Filter>
+      <Filter>Source Files$(EGLibFilterSubFolder)\common</Filter>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gqsort.c">
-      <Filter>Source Files$(EGLibFilterSubFolder)\Common</Filter>
+      <Filter>Source Files$(EGLibFilterSubFolder)\common</Filter>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gqueue.c">
-      <Filter>Source Files$(EGLibFilterSubFolder)\Common</Filter>
+      <Filter>Source Files$(EGLibFilterSubFolder)\common</Filter>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gshell.c">
-      <Filter>Source Files$(EGLibFilterSubFolder)\Common</Filter>
+      <Filter>Source Files$(EGLibFilterSubFolder)\common</Filter>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gslist.c">
-      <Filter>Source Files$(EGLibFilterSubFolder)\Common</Filter>
+      <Filter>Source Files$(EGLibFilterSubFolder)\common</Filter>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gspawn.c">
-      <Filter>Source Files$(EGLibFilterSubFolder)\Common</Filter>
+      <Filter>Source Files$(EGLibFilterSubFolder)\common</Filter>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gstr.c">
-      <Filter>Source Files$(EGLibFilterSubFolder)\Common</Filter>
+      <Filter>Source Files$(EGLibFilterSubFolder)\common</Filter>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gstring.c">
-      <Filter>Source Files$(EGLibFilterSubFolder)\Common</Filter>
+      <Filter>Source Files$(EGLibFilterSubFolder)\common</Filter>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gunicode.c">
-      <Filter>Source Files$(EGLibFilterSubFolder)\Common</Filter>
+      <Filter>Source Files$(EGLibFilterSubFolder)\common</Filter>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gutf8.c">
-      <Filter>Source Files$(EGLibFilterSubFolder)\Common</Filter>
+      <Filter>Source Files$(EGLibFilterSubFolder)\common</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="$(MonoSourceLocation)\mono\eglib\glib.h">
-      <Filter>Header Files$(EGLibFilterSubFolder)\Common</Filter>
+      <Filter>Header Files$(EGLibFilterSubFolder)\common</Filter>
     </ClInclude>
     <ClInclude Include="$(MonoSourceLocation)\mono\eglib\gmodule.h">
-      <Filter>Header Files$(EGLibFilterSubFolder)\Common</Filter>
+      <Filter>Header Files$(EGLibFilterSubFolder)\common</Filter>
     </ClInclude>
     <ClInclude Include="$(MonoSourceLocation)\mono\eglib\sort.frag.h">
-      <Filter>Header Files$(EGLibFilterSubFolder)\Common</Filter>
+      <Filter>Header Files$(EGLibFilterSubFolder)\common</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="$(MonoSourceLocation)\eglib\src\Makefile.am">
-      <Filter>Resource Files$(EGLibFilterSubFolder)</Filter>
+      <Filter>Resource Files$(EGLibFilterSubFolder)\common</Filter>
     </None>
   </ItemGroup>
+  <ItemGroup>
+    <Filter Include="Header Files$(EGLibFilterSubFolder)\common">
+      <UniqueIdentifier>{04853f35-873a-4b07-990a-61dc8ebd5105}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Resource Files$(EGLibFilterSubFolder)\common">
+      <UniqueIdentifier>{453FE226-0B9E-4A07-B2F8-BB2955098E9E}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files$(EGLibFilterSubFolder)\common">
+      <UniqueIdentifier>{7a01f670-6a6a-4837-b3ac-cd6c08075b4e}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
 </Project>
diff --git a/msvc/eglib-posix.targets.filters b/msvc/eglib-posix.targets.filters
index 3a39ceec9a1..562b10e65d6 100644
--- a/msvc/eglib-posix.targets.filters
+++ b/msvc/eglib-posix.targets.filters
@@ -2,7 +2,12 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gfile-posix.c">
-      <Filter>Source Files$(EGLibFilterSubFolder)\Posix</Filter>
+      <Filter>Source Files$(EGLibFilterSubFolder)\posix</Filter>
     </ClCompile>
   </ItemGroup>
+  <ItemGroup>
+    <Filter Include="Source Files$(EGLibFilterSubFolder)\posix">
+      <UniqueIdentifier>{3c958a68-b6a1-40d3-834c-b50be09cb819}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
 </Project>
diff --git a/msvc/eglib-win32.targets.filters b/msvc/eglib-win32.targets.filters
index 3ed610b8530..ea1f78cfe7b 100644
--- a/msvc/eglib-win32.targets.filters
+++ b/msvc/eglib-win32.targets.filters
@@ -2,33 +2,41 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gdate-win32.c">
-      <Filter>Source Files$(EGLibFilterSubFolder)\Win32</Filter>
+      <Filter>Source Files$(EGLibFilterSubFolder)\win32</Filter>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gdir-win32.c">
-      <Filter>Source Files$(EGLibFilterSubFolder)\Win32</Filter>
+      <Filter>Source Files$(EGLibFilterSubFolder)\win32</Filter>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gfile-win32.c">
-      <Filter>Source Files$(EGLibFilterSubFolder)\Win32</Filter>
+      <Filter>Source Files$(EGLibFilterSubFolder)\win32</Filter>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gmisc-win32.c">
-      <Filter>Source Files$(EGLibFilterSubFolder)\Win32</Filter>
+      <Filter>Source Files$(EGLibFilterSubFolder)\win32</Filter>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gmodule-win32.c">
-      <Filter>Source Files$(EGLibFilterSubFolder)\Win32</Filter>
+      <Filter>Source Files$(EGLibFilterSubFolder)\win32</Filter>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gpath.c">
-      <Filter>Source Files$(EGLibFilterSubFolder)\Win32</Filter>
+      <Filter>Source Files$(EGLibFilterSubFolder)\win32</Filter>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gtimer-win32.c">
-      <Filter>Source Files$(EGLibFilterSubFolder)\Win32</Filter>
+      <Filter>Source Files$(EGLibFilterSubFolder)\win32</Filter>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gunicode-win32.c">
-      <Filter>Source Files$(EGLibFilterSubFolder)\Win32</Filter>
+      <Filter>Source Files$(EGLibFilterSubFolder)\win32</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="$(MonoSourceLocation)\mono\eglib\gmodule-win32-internals.h">
-      <Filter>Header Files$(EGLibFilterSubFolder)\Win32</Filter>
+      <Filter>Header Files$(EGLibFilterSubFolder)\win32</Filter>
     </ClInclude>
   </ItemGroup>
+  <ItemGroup>
+    <Filter Include="Header Files$(EGLibFilterSubFolder)\win32">
+      <UniqueIdentifier>{80953075-5d05-41b9-be90-82497081b11c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files$(EGLibFilterSubFolder)\win32">
+      <UniqueIdentifier>{c6e3ed6c-6b52-4823-bc4f-2dc9f84e3f5d}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
 </Project>
diff --git a/msvc/eglib.targets.filters b/msvc/eglib.targets.filters
index bc155a60439..5727d3c669f 100644
--- a/msvc/eglib.targets.filters
+++ b/msvc/eglib.targets.filters
@@ -14,21 +14,4 @@
       <UniqueIdentifier>{9B2D78CC-201F-48DF-8710-839BCDB0AEE9}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
-  <ItemGroup>
-    <Filter Include="Header Files$(EGLibFilterSubFolder)\Common">
-      <UniqueIdentifier>{04853f35-873a-4b07-990a-61dc8ebd5105}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files$(EGLibFilterSubFolder)\Win32">
-      <UniqueIdentifier>{80953075-5d05-41b9-be90-82497081b11c}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files$(EGLibFilterSubFolder)\Common">
-      <UniqueIdentifier>{7a01f670-6a6a-4837-b3ac-cd6c08075b4e}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files$(EGLibFilterSubFolder)\Win32">
-      <UniqueIdentifier>{c6e3ed6c-6b52-4823-bc4f-2dc9f84e3f5d}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files$(EGLibFilterSubFolder)\Posix">
-      <UniqueIdentifier>{3c958a68-b6a1-40d3-834c-b50be09cb819}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
 </Project>
-- 
2.25.1