From e867de371ed9d38a3e4f51927c8a25a5e8261020 Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Wed, 1 Aug 2018 20:26:38 +0800
Subject: *update

---
 build/.vs/libjin/v14/.suo           | Bin 227328 -> 116224 bytes
 build/libjin/libjin.vcxproj         |  25 ++++++-----
 build/libjin/libjin.vcxproj.filters |  82 +++++++++++++++++++++---------------
 3 files changed, 62 insertions(+), 45 deletions(-)

(limited to 'build')

diff --git a/build/.vs/libjin/v14/.suo b/build/.vs/libjin/v14/.suo
index 90cd23a..50ddad7 100644
Binary files a/build/.vs/libjin/v14/.suo and b/build/.vs/libjin/v14/.suo differ
diff --git a/build/libjin/libjin.vcxproj b/build/libjin/libjin.vcxproj
index 32422b3..4f90bf7 100644
--- a/build/libjin/libjin.vcxproj
+++ b/build/libjin/libjin.vcxproj
@@ -30,6 +30,8 @@
     <ClCompile Include="..\..\libjin\Audio\SDL\SDLAudio.cpp" />
     <ClCompile Include="..\..\libjin\Audio\SDL\SDLSource.cpp" />
     <ClCompile Include="..\..\libjin\Audio\Source.cpp" />
+    <ClCompile Include="..\..\libjin\Common\Object.cpp" />
+    <ClCompile Include="..\..\libjin\Common\utf8.cpp" />
     <ClCompile Include="..\..\libjin\Core\Game.cpp" />
     <ClCompile Include="..\..\libjin\Filesystem\Filesystem.cpp" />
     <ClCompile Include="..\..\libjin\Graphics\Canvas.cpp" />
@@ -49,11 +51,11 @@
     <ClCompile Include="..\..\libjin\Thread\Thread.cpp" />
     <ClCompile Include="..\..\libjin\Tilemap\Tilemap.cpp" />
     <ClCompile Include="..\..\libjin\Time\Timer.cpp" />
-    <ClCompile Include="..\..\libjin\Tools\CSV\CSV.cpp" />
-    <ClCompile Include="..\..\libjin\Tools\Json\Json.cpp" />
-    <ClCompile Include="..\..\libjin\Tools\XML\XML.cpp" />
+    <ClCompile Include="..\..\libjin\Utils\CSV\CSV.cpp" />
+    <ClCompile Include="..\..\libjin\Utils\Json\Json.cpp" />
     <ClCompile Include="..\..\libjin\Utils\Log.cpp" />
     <ClCompile Include="..\..\libjin\Utils\unittest.cpp" />
+    <ClCompile Include="..\..\libjin\Utils\XML\XML.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\libjin\3rdparty\GLee\GLee.h" />
@@ -71,8 +73,11 @@
     <ClInclude Include="..\..\libjin\Audio\SDL\SDLSource.h" />
     <ClInclude Include="..\..\libjin\Audio\Source.h" />
     <ClInclude Include="..\..\libjin\Common\Data.h" />
+    <ClInclude Include="..\..\libjin\Common\Object.h" />
     <ClInclude Include="..\..\libjin\Common\Singleton.hpp" />
+    <ClInclude Include="..\..\libjin\Common\StringMap.hpp" />
     <ClInclude Include="..\..\libjin\Common\Subsystem.hpp" />
+    <ClInclude Include="..\..\libjin\Common\utf8.h" />
     <ClInclude Include="..\..\libjin\Core\Core.h" />
     <ClInclude Include="..\..\libjin\Core\Game.h" />
     <ClInclude Include="..\..\libjin\Debug\Debug.h" />
@@ -106,18 +111,18 @@
     <ClInclude Include="..\..\libjin\Thread\Thread.h" />
     <ClInclude Include="..\..\libjin\Tilemap\Tilemap.h" />
     <ClInclude Include="..\..\libjin\Time\Timer.h" />
-    <ClInclude Include="..\..\libjin\Tools\Component\Component.h" />
-    <ClInclude Include="..\..\libjin\Tools\Component\GameObject.h" />
-    <ClInclude Include="..\..\libjin\Tools\CSV\CSV.h" />
-    <ClInclude Include="..\..\libjin\Tools\EventMsgCenter\EventMsgCenter.h" />
-    <ClInclude Include="..\..\libjin\Tools\EventMsgCenter\Events.h" />
-    <ClInclude Include="..\..\libjin\Tools\Json\Json.h" />
-    <ClInclude Include="..\..\libjin\Tools\XML\XML.h" />
     <ClInclude Include="..\..\libjin\UI\UI.h" />
+    <ClInclude Include="..\..\libjin\Utils\Component\Component.h" />
+    <ClInclude Include="..\..\libjin\Utils\Component\GameObject.h" />
+    <ClInclude Include="..\..\libjin\Utils\CSV\CSV.h" />
     <ClInclude Include="..\..\libjin\Utils\endian.h" />
+    <ClInclude Include="..\..\libjin\Utils\EventMsgCenter\EventMsgCenter.h" />
+    <ClInclude Include="..\..\libjin\Utils\EventMsgCenter\Events.h" />
+    <ClInclude Include="..\..\libjin\Utils\Json\Json.h" />
     <ClInclude Include="..\..\libjin\Utils\Log.h" />
     <ClInclude Include="..\..\libjin\Utils\macros.h" />
     <ClInclude Include="..\..\libjin\Utils\utils.h" />
+    <ClInclude Include="..\..\libjin\Utils\XML\XML.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\libjin\README.md" />
diff --git a/build/libjin/libjin.vcxproj.filters b/build/libjin/libjin.vcxproj.filters
index c302314..da3ea05 100644
--- a/build/libjin/libjin.vcxproj.filters
+++ b/build/libjin/libjin.vcxproj.filters
@@ -55,9 +55,6 @@
     <Filter Include="Tilemap">
       <UniqueIdentifier>{ea9c11c8-1d83-441b-a1aa-e7fb85abd615}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Tools">
-      <UniqueIdentifier>{1819939a-8bb4-4635-938d-4b054de6da5e}</UniqueIdentifier>
-    </Filter>
     <Filter Include="UI">
       <UniqueIdentifier>{32b0ca98-fc83-411a-8668-e65fb2ac3381}</UniqueIdentifier>
     </Filter>
@@ -70,23 +67,23 @@
     <Filter Include="Audio\OpenAL">
       <UniqueIdentifier>{c2b1ec18-2952-4461-92d3-79226870e1a2}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Tools\EventMsgCenter">
-      <UniqueIdentifier>{024367d0-1607-463c-b094-41f2c0fd1e99}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Time">
       <UniqueIdentifier>{53e06a65-a5ba-41d8-a1f6-6fb5680207ba}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Tools\Component">
-      <UniqueIdentifier>{5685d2ab-4373-4b9c-9cd1-634b1916b09c}</UniqueIdentifier>
+    <Filter Include="Utils\Component">
+      <UniqueIdentifier>{4d34f3cf-9165-41c5-9070-10442e9fed73}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Tools\XML">
-      <UniqueIdentifier>{712750f2-e78b-46a4-b837-55fd4486b3bd}</UniqueIdentifier>
+    <Filter Include="Utils\CSV">
+      <UniqueIdentifier>{fc249b2b-dbab-41f0-b507-331ce4db0899}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Tools\Json">
-      <UniqueIdentifier>{0fb5fedc-24df-47f0-a90f-a20e21baa90c}</UniqueIdentifier>
+    <Filter Include="Utils\EventMsgCenter">
+      <UniqueIdentifier>{bd893cbe-82a4-4c49-a398-a126a312d4fb}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Tools\CSV">
-      <UniqueIdentifier>{52a242f9-da0d-4c1d-a6ea-5ad17557feae}</UniqueIdentifier>
+    <Filter Include="Utils\Json">
+      <UniqueIdentifier>{5b6076d6-40ea-4ca3-a427-77def412d945}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Utils\XML">
+      <UniqueIdentifier>{5b1e81c7-866a-414e-a976-48aebfd57225}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -186,14 +183,20 @@
     <ClCompile Include="..\..\libjin\Tilemap\Tilemap.cpp">
       <Filter>Tilemap</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\libjin\Tools\XML\XML.cpp">
-      <Filter>Tools\XML</Filter>
+    <ClCompile Include="..\..\libjin\Common\Object.cpp">
+      <Filter>Common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libjin\Common\utf8.cpp">
+      <Filter>Common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libjin\Utils\CSV\CSV.cpp">
+      <Filter>Utils\CSV</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\libjin\Tools\Json\Json.cpp">
-      <Filter>Tools\Json</Filter>
+    <ClCompile Include="..\..\libjin\Utils\Json\Json.cpp">
+      <Filter>Utils\Json</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\libjin\Tools\CSV\CSV.cpp">
-      <Filter>Tools\CSV</Filter>
+    <ClCompile Include="..\..\libjin\Utils\XML\XML.cpp">
+      <Filter>Utils\XML</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
@@ -335,9 +338,6 @@
     <ClInclude Include="..\..\libjin\UI\UI.h">
       <Filter>UI</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\libjin\Tools\EventMsgCenter\EventMsgCenter.h">
-      <Filter>Tools\EventMsgCenter</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\libjin\Tilemap\Tilemap.h">
       <Filter>Tilemap</Filter>
     </ClInclude>
@@ -361,23 +361,35 @@
     <ClInclude Include="..\..\libjin\Common\Singleton.hpp">
       <Filter>Common</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\libjin\Tools\Component\GameObject.h">
-      <Filter>Tools\Component</Filter>
+    <ClInclude Include="..\..\libjin\Common\Object.h">
+      <Filter>Common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\libjin\Common\utf8.h">
+      <Filter>Common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\libjin\Common\StringMap.hpp">
+      <Filter>Common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\libjin\Utils\Component\Component.h">
+      <Filter>Utils\Component</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\libjin\Utils\Component\GameObject.h">
+      <Filter>Utils\Component</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\libjin\Tools\Component\Component.h">
-      <Filter>Tools\Component</Filter>
+    <ClInclude Include="..\..\libjin\Utils\CSV\CSV.h">
+      <Filter>Utils\CSV</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\libjin\Tools\EventMsgCenter\Events.h">
-      <Filter>Tools\EventMsgCenter</Filter>
+    <ClInclude Include="..\..\libjin\Utils\EventMsgCenter\EventMsgCenter.h">
+      <Filter>Utils\EventMsgCenter</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\libjin\Tools\XML\XML.h">
-      <Filter>Tools\XML</Filter>
+    <ClInclude Include="..\..\libjin\Utils\EventMsgCenter\Events.h">
+      <Filter>Utils\EventMsgCenter</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\libjin\Tools\Json\Json.h">
-      <Filter>Tools\Json</Filter>
+    <ClInclude Include="..\..\libjin\Utils\Json\Json.h">
+      <Filter>Utils\Json</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\libjin\Tools\CSV\CSV.h">
-      <Filter>Tools\CSV</Filter>
+    <ClInclude Include="..\..\libjin\Utils\XML\XML.h">
+      <Filter>Utils\XML</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-- 
cgit v1.1-26-g67d0