Make the filters file match the targets files

* Create one filters file for each targets file
* Import each filters file into the project-level filters file
* Add folders for Common, Win32, and Posix targets files

diff --git a/msvc/eglib-common.targets.filters b/msvc/eglib-common.targets.filters
new file mode 100644 (file)
index 0000000..92996f7
--- /dev/null
+++ b/msvc/eglib-common.targets.filters
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\garray.c">
+      <Filter>Source Files\Common</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gbytearray.c">
+      <Filter>Source Files\Common</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gfile.c">
+      <Filter>Source Files\Common</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gerror.c">
+      <Filter>Source Files\Common</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\ghashtable.c">
+      <Filter>Source Files\Common</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\giconv.c">
+      <Filter>Source Files\Common</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\glist.c">
+      <Filter>Source Files\Common</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gmarkup.c">
+      <Filter>Source Files\Common</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gmem.c">
+      <Filter>Source Files\Common</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\goutput.c">
+      <Filter>Source Files\Common</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gpattern.c">
+      <Filter>Source Files\Common</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gptrarray.c">
+      <Filter>Source Files\Common</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gqsort.c">
+      <Filter>Source Files\Common</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gqueue.c">
+      <Filter>Source Files\Common</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gshell.c">
+      <Filter>Source Files\Common</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gslist.c">
+      <Filter>Source Files\Common</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gspawn.c">
+      <Filter>Source Files\Common</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gstr.c">
+      <Filter>Source Files\Common</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gstring.c">
+      <Filter>Source Files\Common</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gunicode.c">
+      <Filter>Source Files\Common</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gutf8.c">
+      <Filter>Source Files\Common</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="$(MonoSourceLocation)\eglib\src\glib.h">
+      <Filter>Header Files\Common</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\eglib\src\gmodule.h">
+      <Filter>Header Files\Common</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\eglib\src\sort.frag.h">
+      <Filter>Header Files\Common</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>

diff --git a/msvc/eglib-posix.targets.filters b/msvc/eglib-posix.targets.filters
new file mode 100644 (file)
index 0000000..a714ed8
--- /dev/null
+++ b/msvc/eglib-posix.targets.filters
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gfile-posix.c">
+      <Filter>Source Files\Posix</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>

diff --git a/msvc/eglib-win32.targets.filters b/msvc/eglib-win32.targets.filters
new file mode 100644 (file)
index 0000000..6993979
--- /dev/null
+++ b/msvc/eglib-win32.targets.filters
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gdate-win32.c">
+      <Filter>Source Files\Win32</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gdir-win32.c">
+      <Filter>Source Files\Win32</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gfile-win32.c">
+      <Filter>Source Files\Win32</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gmisc-win32.c">
+      <Filter>Source Files\Win32</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gmodule-win32.c">
+      <Filter>Source Files\Win32</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gpath.c">
+      <Filter>Source Files\Win32</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gtimer-win32.c">
+      <Filter>Source Files\Win32</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gunicode-win32.c">
+      <Filter>Source Files\Win32</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="$(MonoSourceLocation)\eglib\src\gmodule-win32-internals.h">
+      <Filter>Header Files\Win32</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>

diff --git a/msvc/eglib.vcxproj.filters b/msvc/eglib.vcxproj.filters
index e2ed0ac9a4081e72a815144e42bedb445e21a9d2..3805150c83aa69aa8905f6b7ed230f483bffce8b 100644 (file)
--- a/msvc/eglib.vcxproj.filters
+++ b/msvc/eglib.vcxproj.filters
@@ -1,111 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <ItemGroup>\r
-    <ClCompile Include="$(MonoSourceLocation)\eglib\src\garray.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gbytearray.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gdate-win32.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gdir-win32.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gerror.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gfile.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gfile-posix.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gfile-win32.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="$(MonoSourceLocation)\eglib\src\ghashtable.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="$(MonoSourceLocation)\eglib\src\giconv.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="$(MonoSourceLocation)\eglib\src\glist.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gmarkup.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gmem.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gmisc-win32.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gmodule-win32.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="$(MonoSourceLocation)\eglib\src\goutput.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gpath.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gpattern.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gptrarray.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gqsort.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gqueue.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gshell.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gslist.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gspawn.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gstr.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gstring.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gtimer-win32.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gunicode.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gunicode-win32.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="$(MonoSourceLocation)\eglib\src\gutf8.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <ClInclude Include="$(MonoSourceLocation)\eglib\src\glib.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="$(MonoSourceLocation)\eglib\src\gmodule.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="$(MonoSourceLocation)\eglib\src\gmodule-win32-internals.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="$(MonoSourceLocation)\eglib\src\sort.frag.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-  </ItemGroup>\r
+  <Import Project="eglib-common.targets.filters" />\r
+  <Import Project="eglib-win32.targets.filters" />\r
+  <Import Project="eglib-posix.targets.filters" />\r
   <ItemGroup>\r
     <Filter Include="Source Files">\r
       <UniqueIdentifier>{d16b81e3-5093-424e-a5d4-e7dd8da49dce}</UniqueIdentifier>\r
@@ -116,6 +13,21 @@
     <Filter Include="Resource Files">\r
       <UniqueIdentifier>{38a39ff1-842b-431b-b54b-24094e8283eb}</UniqueIdentifier>\r
     </Filter>\r
+    <Filter Include="Header Files\Common">\r
+      <UniqueIdentifier>{04853f35-873a-4b07-990a-61dc8ebd5105}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="Header Files\Win32">\r
+      <UniqueIdentifier>{80953075-5d05-41b9-be90-82497081b11c}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="Source Files\Common">\r
+      <UniqueIdentifier>{7a01f670-6a6a-4837-b3ac-cd6c08075b4e}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="Source Files\Win32">\r
+      <UniqueIdentifier>{c6e3ed6c-6b52-4823-bc4f-2dc9f84e3f5d}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="Source Files\Posix">\r
+      <UniqueIdentifier>{3c958a68-b6a1-40d3-834c-b50be09cb819}</UniqueIdentifier>\r
+    </Filter>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <None Include="..\eglib\src\Makefile.am">\r