2 files changed, 11 insertions, 4 deletions
diff --git a/build/vs2015/jin.vcxproj b/build/vs2015/jin.vcxproj
index dcd9f1a..d597418 100644
--- a/build/vs2015/jin.vcxproj
+++ b/build/vs2015/jin.vcxproj
@@ -140,6 +140,7 @@
     <ClCompile Include="..\..\src\libjin\core\game.cpp" />
     <ClCompile Include="..\..\src\libjin\fs\filesystem.cpp" />
     <ClCompile Include="..\..\src\libjin\input\event.cpp" />
+    <ClCompile Include="..\..\src\libjin\input\joypad.cpp" />
     <ClCompile Include="..\..\src\libjin\input\keyboard.cpp" />
     <ClCompile Include="..\..\src\libjin\input\mouse.cpp" />
     <ClCompile Include="..\..\src\jinc.cpp" />
@@ -188,7 +189,6 @@
     <ClCompile Include="..\..\src\script\graphics\luaopen_graphics.cpp" />
     <ClCompile Include="..\..\src\script\graphics\luaopen_Image.cpp" />
     <ClCompile Include="..\..\src\script\graphics\luaopen_JSL.cpp" />
-    <ClCompile Include="..\..\src\script\graphics\luaopen_Tilemap.cpp" />
     <ClCompile Include="..\..\src\script\joypad\luaopen_joypad.cpp" />
     <ClCompile Include="..\..\src\script\keyboard\luaopen_keyboard.cpp" />
     <ClCompile Include="..\..\src\script\mouse\luaopen_mouse.cpp" />
@@ -211,6 +211,7 @@
     <ClInclude Include="..\..\src\data\icon.png.h" />
     <ClInclude Include="..\..\src\libjin\audio\audio.h" />
     <ClInclude Include="..\..\src\libjin\audio\source.h" />
+    <ClInclude Include="..\..\src\libjin\common\subsystem.h" />
     <ClInclude Include="..\..\src\libjin\core\core.h" />
     <ClInclude Include="..\..\src\libjin\core\game.h" />
     <ClInclude Include="..\..\src\libjin\fs\buffer.h" />
diff --git a/build/vs2015/jin.vcxproj.filters b/build/vs2015/jin.vcxproj.filters
index f65792d..9f6fc08 100644
--- a/build/vs2015/jin.vcxproj.filters
+++ b/build/vs2015/jin.vcxproj.filters
@@ -100,6 +100,9 @@
     <Filter Include="src\script\joypad">
       <UniqueIdentifier>{7fd81749-f776-4e5c-b6e2-33372a143560}</UniqueIdentifier>
     </Filter>
+    <Filter Include="src\libjin\common">
+      <UniqueIdentifier>{8222e176-beec-43ee-8604-3e6491dc45bb}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\src\main.cpp">
@@ -300,9 +303,6 @@
     <ClCompile Include="..\..\src\script\thread\luaopen_Thread.cpp">
       <Filter>src\script\thread</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\script\graphics\luaopen_Tilemap.cpp">
-      <Filter>src\script\graphics</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\libjin\audio\source.cpp">
       <Filter>src\libjin\audio</Filter>
     </ClCompile>
@@ -312,6 +312,9 @@
     <ClCompile Include="..\..\src\script\audio\luaopen_Source.cpp">
       <Filter>src\script\audio</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\libjin\input\joypad.cpp">
+      <Filter>src\libjin\input</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\3rdparty\GLEE\GLee.h">
@@ -530,6 +533,9 @@
     <ClInclude Include="..\..\src\script\joypad\joypad.h">
       <Filter>src\libjin\input</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\libjin\common\subsystem.h">
+      <Filter>src\libjin\common</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\3rdparty\lua51\Makefile">