From 8d22c47199c6a4f7007f65e6c170993969565d1c Mon Sep 17 00:00:00 2001
From: lateralusX <lateralusx.github@gmail.com>
Date: Thu, 28 Sep 2017 13:59:30 +0200
Subject: [PATCH] Align eglib vcxproj with makefile.

---
 msvc/eglib-common.targets         | 30 +++++++++--------
 msvc/eglib-common.targets.filters | 56 ++++++++++++++++++-------------
 msvc/eglib-posix.targets          | 37 +++++++++++++++++++-
 msvc/eglib-posix.targets.filters  | 17 +++++++++-
 msvc/eglib-win32.targets          |  5 +--
 msvc/eglib-win32.targets.filters  | 11 ++----
 6 files changed, 105 insertions(+), 51 deletions(-)

diff --git a/msvc/eglib-common.targets b/msvc/eglib-common.targets
index 15a923b5620..c847597bde1 100644
--- a/msvc/eglib-common.targets
+++ b/msvc/eglib-common.targets
@@ -1,32 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="common_sources">
+    <ClInclude Include="$(MonoSourceLocation)\mono\eglib\eglib-remap.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\eglib\sort.frag.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\eglib\glib.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\eglib\garray.c" />
     <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gbytearray.c" />
     <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gerror.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gfile.c" />
     <ClCompile Include="$(MonoSourceLocation)\mono\eglib\ghashtable.c" />
     <ClCompile Include="$(MonoSourceLocation)\mono\eglib\giconv.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\eglib\glist.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gmarkup.c" />
     <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gmem.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\eglib\gmodule.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\eglib\goutput.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gpattern.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gptrarray.c" />
     <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gqsort.c" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gstr.c" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gslist.c" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gstring.c" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gptrarray.c" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\eglib\glist.c" />
     <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gqueue.c" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gpath.c" />
     <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gshell.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gslist.c" />
     <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gspawn.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gstr.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gstring.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gunicode.c" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gfile.c" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gfile-posix.c" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gpattern.c" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gmarkup.c" />
     <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gutf8.c" />
-  </ItemGroup>
-  <ItemGroup Label="common_headers">
-    <ClInclude Include="$(MonoSourceLocation)\mono\eglib\glib.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\eglib\gmodule.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\eglib\sort.frag.h" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gunicode.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\eglib\unicode-data.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="$(MonoSourceLocation)\mono\eglib\Makefile.am" />
diff --git a/msvc/eglib-common.targets.filters b/msvc/eglib-common.targets.filters
index 8939be6be3c..636adbe3e1f 100644
--- a/msvc/eglib-common.targets.filters
+++ b/msvc/eglib-common.targets.filters
@@ -1,15 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="common_sources">
+    <ClInclude Include="$(MonoSourceLocation)\mono\eglib\eglib-remap.h">
+      <Filter>Header Files$(EGLibFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\mono\eglib\sort.frag.h">
+      <Filter>Header Files$(EGLibFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\mono\eglib\glib.h">
+      <Filter>Header Files$(EGLibFilterSubFolder)\common</Filter>
+    </ClInclude>
     <ClCompile Include="$(MonoSourceLocation)\mono\eglib\garray.c">
       <Filter>Source Files$(EGLibFilterSubFolder)\common</Filter>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gbytearray.c">
       <Filter>Source Files$(EGLibFilterSubFolder)\common</Filter>
     </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gfile.c">
-      <Filter>Source Files$(EGLibFilterSubFolder)\common</Filter>
-    </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gerror.c">
       <Filter>Source Files$(EGLibFilterSubFolder)\common</Filter>
     </ClCompile>
@@ -19,60 +25,64 @@
     <ClCompile Include="$(MonoSourceLocation)\mono\eglib\giconv.c">
       <Filter>Source Files$(EGLibFilterSubFolder)\common</Filter>
     </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\eglib\glist.c">
+    <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gmem.c">
       <Filter>Source Files$(EGLibFilterSubFolder)\common</Filter>
     </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gmarkup.c">
+    <ClInclude Include="$(MonoSourceLocation)\mono\eglib\gmodule.h">
+      <Filter>Header Files$(EGLibFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <ClCompile Include="$(MonoSourceLocation)\mono\eglib\goutput.c">
       <Filter>Source Files$(EGLibFilterSubFolder)\common</Filter>
     </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gmem.c">
+    <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gqsort.c">
       <Filter>Source Files$(EGLibFilterSubFolder)\common</Filter>
     </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\eglib\goutput.c">
+    <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gstr.c">
       <Filter>Source Files$(EGLibFilterSubFolder)\common</Filter>
     </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gpattern.c">
+    <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gslist.c">
+      <Filter>Source Files$(EGLibFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gstring.c">
       <Filter>Source Files$(EGLibFilterSubFolder)\common</Filter>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gptrarray.c">
       <Filter>Source Files$(EGLibFilterSubFolder)\common</Filter>
     </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gqsort.c">
+    <ClCompile Include="$(MonoSourceLocation)\mono\eglib\glist.c">
       <Filter>Source Files$(EGLibFilterSubFolder)\common</Filter>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gqueue.c">
       <Filter>Source Files$(EGLibFilterSubFolder)\common</Filter>
     </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gshell.c">
+    <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gpath.c">
       <Filter>Source Files$(EGLibFilterSubFolder)\common</Filter>
     </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gslist.c">
+    <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gshell.c">
       <Filter>Source Files$(EGLibFilterSubFolder)\common</Filter>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gspawn.c">
       <Filter>Source Files$(EGLibFilterSubFolder)\common</Filter>
     </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gstr.c">
+    <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gfile.c">
       <Filter>Source Files$(EGLibFilterSubFolder)\common</Filter>
     </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gstring.c">
+    <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gfile-posix.c">
       <Filter>Source Files$(EGLibFilterSubFolder)\common</Filter>
     </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gunicode.c">
+    <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gpattern.c">
+      <Filter>Source Files$(EGLibFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gmarkup.c">
       <Filter>Source Files$(EGLibFilterSubFolder)\common</Filter>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gutf8.c">
       <Filter>Source Files$(EGLibFilterSubFolder)\common</Filter>
     </ClCompile>
-  </ItemGroup>
-  <ItemGroup Label="common_headers">
-    <ClInclude Include="$(MonoSourceLocation)\mono\eglib\glib.h">
-      <Filter>Header Files$(EGLibFilterSubFolder)\common</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\eglib\gmodule.h">
-      <Filter>Header Files$(EGLibFilterSubFolder)\common</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\eglib\sort.frag.h">
+    <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gunicode.c">
+      <Filter>Source Files$(EGLibFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClInclude Include="$(MonoSourceLocation)\mono\eglib\unicode-data.h">
       <Filter>Header Files$(EGLibFilterSubFolder)\common</Filter>
     </ClInclude>
   </ItemGroup>
diff --git a/msvc/eglib-posix.targets b/msvc/eglib-posix.targets
index 84b7bad8870..3b758dd151e 100644
--- a/msvc/eglib-posix.targets
+++ b/msvc/eglib-posix.targets
@@ -1,6 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="posix_sources">
-    <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gfile-posix.c" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gdate-unix.c">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gdir-unix.c">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gfile-unix.c">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gmisc-unix.c">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gmodule-unix.c">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gtimer-unix.c">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
   </ItemGroup>
 </Project>
diff --git a/msvc/eglib-posix.targets.filters b/msvc/eglib-posix.targets.filters
index 864f9f382d6..49224ee4eef 100644
--- a/msvc/eglib-posix.targets.filters
+++ b/msvc/eglib-posix.targets.filters
@@ -1,7 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="posix_sources">
-    <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gfile-posix.c">
+    <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gdate-unix.c">
+      <Filter>Source Files$(EGLibFilterSubFolder)\posix</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gdir-unix.c">
+      <Filter>Source Files$(EGLibFilterSubFolder)\posix</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gfile-unix.c">
+      <Filter>Source Files$(EGLibFilterSubFolder)\posix</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gmisc-unix.c">
+      <Filter>Source Files$(EGLibFilterSubFolder)\posix</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gmodule-unix.c">
+      <Filter>Source Files$(EGLibFilterSubFolder)\posix</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gtimer-unix.c">
       <Filter>Source Files$(EGLibFilterSubFolder)\posix</Filter>
     </ClCompile>
   </ItemGroup>
diff --git a/msvc/eglib-win32.targets b/msvc/eglib-win32.targets
index 4e6b1c0b680..2e741df7913 100644
--- a/msvc/eglib-win32.targets
+++ b/msvc/eglib-win32.targets
@@ -6,11 +6,8 @@
     <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gfile-win32.c" />
     <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gmisc-win32.c" />
     <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gmodule-win32.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gpath.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\eglib\gmodule-win32-internals.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gtimer-win32.c" />
     <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gunicode-win32.c" />
    </ItemGroup>
-  <ItemGroup Label="win32_headers">
-    <ClInclude Include="$(MonoSourceLocation)\mono\eglib\gmodule-win32-internals.h" />
-  </ItemGroup>
 </Project>
diff --git a/msvc/eglib-win32.targets.filters b/msvc/eglib-win32.targets.filters
index 80ac682dba0..c8483310937 100644
--- a/msvc/eglib-win32.targets.filters
+++ b/msvc/eglib-win32.targets.filters
@@ -16,9 +16,9 @@
     <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gmodule-win32.c">
       <Filter>Source Files$(EGLibFilterSubFolder)\win32</Filter>
     </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gpath.c">
-      <Filter>Source Files$(EGLibFilterSubFolder)\win32</Filter>
-    </ClCompile>
+    <ClInclude Include="$(MonoSourceLocation)\mono\eglib\gmodule-win32-internals.h">
+      <Filter>Header Files$(EGLibFilterSubFolder)\win32</Filter>
+    </ClInclude>
     <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gtimer-win32.c">
       <Filter>Source Files$(EGLibFilterSubFolder)\win32</Filter>
     </ClCompile>
@@ -26,11 +26,6 @@
       <Filter>Source Files$(EGLibFilterSubFolder)\win32</Filter>
     </ClCompile>
   </ItemGroup>
-  <ItemGroup Label="win32_headers">
-    <ClInclude Include="$(MonoSourceLocation)\mono\eglib\gmodule-win32-internals.h">
-      <Filter>Header Files$(EGLibFilterSubFolder)\win32</Filter>
-    </ClInclude>
-  </ItemGroup>
   <ItemGroup>
     <Filter Include="Header Files$(EGLibFilterSubFolder)\win32">
       <UniqueIdentifier>{80953075-5d05-41b9-be90-82497081b11c}</UniqueIdentifier>
-- 
2.25.1