change file tree

2 files changed, 40 insertions, 20 deletions

diff --git a/build/vs2015/jin.vcxproj b/build/vs2015/jin.vcxproj
index eedeae5..3f1ec4a 100644
--- a/build/vs2015/jin.vcxproj
+++ b/build/vs2015/jin.vcxproj
@@ -202,14 +202,17 @@
     <ClCompile Include="..\..\src\libjin\render\image.cpp" />
     <ClCompile Include="..\..\src\libjin\render\jsl.cpp" />
     <ClCompile Include="..\..\src\libjin\render\window.cpp" />
-    <ClCompile Include="..\..\src\utils\matrix.cpp" />
+    <ClCompile Include="..\..\src\libjin\utils\matrix.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\libjin\audio\audio.h" />
+    <ClInclude Include="..\..\src\libjin\core\core.h" />
     <ClInclude Include="..\..\src\libjin\core\game.h" />
     <ClInclude Include="..\..\src\libjin\fs\buffer.h" />
     <ClInclude Include="..\..\src\libjin\fs\filesystem.h" />
+    <ClInclude Include="..\..\src\libjin\fs\fs.h" />
     <ClInclude Include="..\..\src\libjin\input\event.h" />
+    <ClInclude Include="..\..\src\libjin\input\input.h" />
     <ClInclude Include="..\..\src\libjin\input\keyboard.h" />
     <ClInclude Include="..\..\src\libjin\input\mouse.h" />
     <ClInclude Include="..\..\src\3rdparty\GLEE\GLee.h" />
@@ -243,6 +246,8 @@
     <ClInclude Include="..\..\src\3rdparty\stb\stb_image.h" />
     <ClInclude Include="..\..\src\3rdparty\stb\stb_truetype.h" />
     <ClInclude Include="..\..\src\3rdparty\tekcos\tekcos.h" />
+    <ClInclude Include="..\..\src\libjin\jin.h" />
+    <ClInclude Include="..\..\src\libjin\render\render.h" />
     <ClInclude Include="..\..\src\script\embed\debug.lua.h" />
     <ClInclude Include="..\..\src\script\embed\embed.h" />
     <ClInclude Include="..\..\src\script\embed\graphics.lua.h" />
@@ -264,11 +269,11 @@
     <ClInclude Include="..\..\src\libjin\render\window.h" />
     <ClInclude Include="..\..\src\res\font.ttf.h" />
     <ClInclude Include="..\..\src\res\icon.png.h" />
-    <ClInclude Include="..\..\src\utils\endian.h" />
-    <ClInclude Include="..\..\src\utils\macros.h" />
-    <ClInclude Include="..\..\src\utils\math.h" />
-    <ClInclude Include="..\..\src\utils\matrix.h" />
-    <ClInclude Include="..\..\src\utils\utils.h" />
+    <ClInclude Include="..\..\src\libjin\utils\endian.h" />
+    <ClInclude Include="..\..\src\libjin\utils\macros.h" />
+    <ClInclude Include="..\..\src\libjin\utils\math.h" />
+    <ClInclude Include="..\..\src\libjin\utils\matrix.h" />
+    <ClInclude Include="..\..\src\libjin\utils\utils.h" />
   </ItemGroup>
   <ItemGroup>
     <Font Include="..\..\src\res\font.ttf" />
diff --git a/build/vs2015/jin.vcxproj.filters b/build/vs2015/jin.vcxproj.filters
index 6f376a0..d02d6ab 100644
--- a/build/vs2015/jin.vcxproj.filters
+++ b/build/vs2015/jin.vcxproj.filters
@@ -4,7 +4,7 @@
     <Filter Include="src">
       <UniqueIdentifier>{f3e85b81-1688-49e4-b85c-65d99ddafad9}</UniqueIdentifier>
     </Filter>
-	<Filter Include="src\libjin">
+    <Filter Include="src\libjin">
       <UniqueIdentifier>{f3e85b81-1688-49e4-b85c-65d99ddafad0}</UniqueIdentifier>
     </Filter>
     <Filter Include="src\libjin\audio">
@@ -28,7 +28,7 @@
     <Filter Include="src\res">
       <UniqueIdentifier>{0340fbad-0c07-4923-afd2-183424c70967}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\utils">
+    <Filter Include="src\libjin\utils">
       <UniqueIdentifier>{e9abe7cb-bbbf-4315-a9ab-285b52efa3b7}</UniqueIdentifier>
     </Filter>
     <Filter Include="src\3rdparty\GLee">
@@ -231,8 +231,8 @@
     <ClCompile Include="..\..\src\libjin\render\drawable.cpp">
       <Filter>src\libjin\render</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\utils\matrix.cpp">
-      <Filter>src\utils</Filter>
+    <ClCompile Include="..\..\src\libjin\utils\matrix.cpp">
+      <Filter>src\libjin\utils</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\libjin\fs\filesystem.cpp">
       <Filter>src\libjin\fs</Filter>
@@ -410,8 +410,8 @@
     <ClInclude Include="..\..\src\3rdparty\stb\stb_truetype.h">
       <Filter>src\3rdparty\stb</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\utils\utils.h">
-      <Filter>src\utils</Filter>
+    <ClInclude Include="..\..\src\libjin\utils\utils.h">
+      <Filter>src\libjin\utils</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\3rdparty\lua51\luax.h">
       <Filter>src\3rdparty\lua51</Filter>
@@ -425,14 +425,14 @@
     <ClInclude Include="..\..\src\libjin\core\game.h">
       <Filter>src\libjin\core</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\utils\matrix.h">
-      <Filter>src\utils</Filter>
+    <ClInclude Include="..\..\src\libjin\utils\matrix.h">
+      <Filter>src\libjin\utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\utils\endian.h">
-      <Filter>src\utils</Filter>
+    <ClInclude Include="..\..\src\libjin\utils\endian.h">
+      <Filter>src\libjin\utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\utils\math.h">
-      <Filter>src\utils</Filter>
+    <ClInclude Include="..\..\src\libjin\utils\math.h">
+      <Filter>src\libjin\utils</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\script\embed\debug.lua.h">
       <Filter>src\script\embed</Filter>
@@ -491,8 +491,23 @@
     <ClInclude Include="..\..\src\script\luaopen_types.h">
       <Filter>src\script</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\utils\macros.h">
-      <Filter>src\utils</Filter>
+    <ClInclude Include="..\..\src\libjin\utils\macros.h">
+      <Filter>src\libjin\utils</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libjin\jin.h">
+      <Filter>src\libjin</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libjin\render\render.h">
+      <Filter>src\libjin\render</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libjin\input\input.h">
+      <Filter>src\libjin\input</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libjin\fs\fs.h">
+      <Filter>src\libjin\fs</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libjin\core\core.h">
+      <Filter>src\libjin\core</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>