*update

2 files changed, 23 insertions, 24 deletions

diff --git a/build/vs2015/jin.vcxproj b/build/vs2015/jin.vcxproj
index ffe034e..1592cf6 100644
--- a/build/vs2015/jin.vcxproj
+++ b/build/vs2015/jin.vcxproj
@@ -149,8 +149,6 @@
     <ClCompile Include="..\..\src\libjin\Audio\SDL\SDLSource.cpp" />
     <ClCompile Include="..\..\src\libjin\Audio\Source.cpp" />
     <ClCompile Include="..\..\src\libjin\Core\Game.cpp" />
-    <ClCompile Include="..\..\src\libjin\Core\Thread.cpp" />
-    <ClCompile Include="..\..\src\libjin\Core\Timer.cpp" />
     <ClCompile Include="..\..\src\libjin\Filesystem\Filesystem.cpp" />
     <ClCompile Include="..\..\src\jinc.cpp" />
     <ClCompile Include="..\..\src\3rdparty\lua51\lapi.c" />
@@ -198,6 +196,7 @@
     <ClCompile Include="..\..\src\libjin\Math\Vector.cpp" />
     <ClCompile Include="..\..\src\libjin\Net\Net.cpp" />
     <ClCompile Include="..\..\src\libjin\Thread\Thread.cpp" />
+    <ClCompile Include="..\..\src\libjin\Time\Timer.cpp" />
     <ClCompile Include="..\..\src\libjin\Utils\Log.cpp" />
     <ClCompile Include="..\..\src\libjin\Utils\unittest.cpp" />
     <ClCompile Include="..\..\src\lua\audio\luaopen_audio.cpp" />
@@ -238,12 +237,10 @@
     <ClInclude Include="..\..\src\libjin\Audio\SDL\SDLSource.h" />
     <ClInclude Include="..\..\src\libjin\Audio\Source.h" />
     <ClInclude Include="..\..\src\libjin\Common\Data.h" />
-    <ClInclude Include="..\..\src\libjin\Common\Singleton.h" />
-    <ClInclude Include="..\..\src\libjin\Common\Subsystem.h" />
+    <ClInclude Include="..\..\src\libjin\Common\Singleton.hpp" />
+    <ClInclude Include="..\..\src\libjin\Common\Subsystem.hpp" />
     <ClInclude Include="..\..\src\libjin\Core\Core.h" />
     <ClInclude Include="..\..\src\libjin\Core\Game.h" />
-    <ClInclude Include="..\..\src\libjin\Core\Thread.h" />
-    <ClInclude Include="..\..\src\libjin\Core\Timer.h" />
     <ClInclude Include="..\..\src\libjin\Debug\Debug.h" />
     <ClInclude Include="..\..\src\libjin\Debug\Log.h" />
     <ClInclude Include="..\..\src\libjin\Filesystem\Buffer.h" />
@@ -299,6 +296,7 @@
     <ClInclude Include="..\..\src\libjin\Physics\Rigid.h" />
     <ClInclude Include="..\..\src\libjin\Thread\Thread.h" />
     <ClInclude Include="..\..\src\libjin\Tilemap\Tilemap.h" />
+    <ClInclude Include="..\..\src\libjin\Time\Timer.h" />
     <ClInclude Include="..\..\src\libjin\tools\EventMsgCenter\EventMsgCenter.h" />
     <ClInclude Include="..\..\src\libjin\UI\UI.h" />
     <ClInclude Include="..\..\src\libjin\Utils\endian.h" />
@@ -318,6 +316,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\3rdparty\lua51\Makefile" />
+    <None Include="..\..\src\libjin\README.md" />
     <None Include="..\..\src\lua\embed\debug.lua" />
     <None Include="..\..\src\lua\embed\graphics.lua" />
     <None Include="..\..\src\lua\embed\boot.lua" />
diff --git a/build/vs2015/jin.vcxproj.filters b/build/vs2015/jin.vcxproj.filters
index e8ba812..09078f3 100644
--- a/build/vs2015/jin.vcxproj.filters
+++ b/build/vs2015/jin.vcxproj.filters
@@ -136,6 +136,9 @@
     <Filter Include="src\libjin\Graphics">
       <UniqueIdentifier>{23033979-4942-4f08-8a1d-ecc0dec442b5}</UniqueIdentifier>
     </Filter>
+    <Filter Include="src\libjin\Time">
+      <UniqueIdentifier>{2ca0fd6f-0e11-4215-9ca6-c58179928bd5}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\src\main.cpp">
@@ -297,12 +300,6 @@
     <ClCompile Include="..\..\src\libjin\Core\Game.cpp">
       <Filter>src\libjin\Core</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\libjin\Core\Thread.cpp">
-      <Filter>src\libjin\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\libjin\Core\Timer.cpp">
-      <Filter>src\libjin\Core</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\libjin\Filesystem\Filesystem.cpp">
       <Filter>src\libjin\Filesystem</Filter>
     </ClCompile>
@@ -384,6 +381,9 @@
     <ClCompile Include="..\..\src\libjin\Graphics\Window.cpp">
       <Filter>src\libjin\Graphics</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\libjin\Time\Timer.cpp">
+      <Filter>src\libjin\Time</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\3rdparty\lua51\lapi.h">
@@ -515,24 +515,12 @@
     <ClInclude Include="..\..\src\libjin\Common\Data.h">
       <Filter>src\libjin\Common</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\libjin\Common\Singleton.h">
-      <Filter>src\libjin\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\libjin\Common\Subsystem.h">
-      <Filter>src\libjin\Common</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\libjin\Core\Game.h">
       <Filter>src\libjin\Core</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libjin\Core\Core.h">
       <Filter>src\libjin\Core</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\libjin\Core\Thread.h">
-      <Filter>src\libjin\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\libjin\Core\Timer.h">
-      <Filter>src\libjin\Core</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\libjin\Debug\Debug.h">
       <Filter>src\libjin\Debug</Filter>
     </ClInclude>
@@ -668,6 +656,15 @@
     <ClInclude Include="..\..\src\libjin\Graphics\Window.h">
       <Filter>src\libjin\Graphics</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\libjin\Time\Timer.h">
+      <Filter>src\libjin\Time</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libjin\Common\Singleton.hpp">
+      <Filter>src\libjin\Common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libjin\Common\Subsystem.hpp">
+      <Filter>src\libjin\Common</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\3rdparty\lua51\Makefile">
@@ -691,5 +688,8 @@
     <None Include="..\..\src\lua\embed\path.lua">
       <Filter>src\lua\embed\script</Filter>
     </None>
+    <None Include="..\..\src\libjin\README.md">
+      <Filter>src\libjin</Filter>
+    </None>
   </ItemGroup>
 </Project>
\ No newline at end of file