2 files changed, 20 insertions, 2 deletions
diff --git a/build/vs2015/jin.vcxproj b/build/vs2015/jin.vcxproj
index f9a184d..2e1809d 100644
--- a/build/vs2015/jin.vcxproj
+++ b/build/vs2015/jin.vcxproj
@@ -108,14 +108,14 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\src\;$(SolutionDir)3rdparty\SDL2-2.0.5\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\src\;$(SolutionDir)libs\SDL2-2.0.5\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <CompileAs>CompileAsCpp</CompileAs>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalDependencies>opengl32.lib;glu32.lib;SDL2main.lib;SDL2.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)3rdparty\SDL2-2.0.5\lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(SolutionDir)libs\SDL2-2.0.5\lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Windows</SubSystem>
       <EntryPointSymbol>
       </EntryPointSymbol>
@@ -189,6 +189,7 @@
     <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" />
     <ClCompile Include="..\..\src\script\luaopen_jin.cpp" />
@@ -252,6 +253,7 @@
     <ClInclude Include="..\..\src\3rdparty\tekcos\tekcos.h" />
     <ClInclude Include="..\..\src\libjin\jin.h" />
     <ClInclude Include="..\..\src\libjin\render\render.h" />
+    <ClInclude Include="..\..\src\libjin\tilemap\tilemap.h" />
     <ClInclude Include="..\..\src\script\embed\debug.lua.h" />
     <ClInclude Include="..\..\src\script\embed\embed.h" />
     <ClInclude Include="..\..\src\script\embed\graphics.lua.h" />
@@ -259,6 +261,7 @@
     <ClInclude Include="..\..\src\script\embed\keyboard.lua.h" />
     <ClInclude Include="..\..\src\script\embed\mouse.lua.h" />
     <ClInclude Include="..\..\src\script\embed\path.lua.h" />
+    <ClInclude Include="..\..\src\script\joypad\joypad.h" />
     <ClInclude Include="..\..\src\script\luaopen_jin.h" />
     <ClInclude Include="..\..\src\script\luaopen_types.h" />
     <ClInclude Include="..\..\src\libjin\net\net.h" />
diff --git a/build/vs2015/jin.vcxproj.filters b/build/vs2015/jin.vcxproj.filters
index d9c8cc4..2e42fcf 100644
--- a/build/vs2015/jin.vcxproj.filters
+++ b/build/vs2015/jin.vcxproj.filters
@@ -94,6 +94,12 @@
     <Filter Include="src\data">
       <UniqueIdentifier>{0340fbad-0c07-4923-afd2-183424c70967}</UniqueIdentifier>
     </Filter>
+    <Filter Include="src\libjin\tilemap">
+      <UniqueIdentifier>{be27da6f-98b1-4e99-ac75-c3116f1618de}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src\script\joypad">
+      <UniqueIdentifier>{7fd81749-f776-4e5c-b6e2-33372a143560}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\src\main.cpp">
@@ -303,6 +309,9 @@
     <ClCompile Include="..\..\src\libjin\audio\source.cpp">
       <Filter>src\libjin\audio</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\script\joypad\luaopen_joypad.cpp">
+      <Filter>src\script\joypad</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\3rdparty\GLEE\GLee.h">
@@ -515,6 +524,12 @@
     <ClInclude Include="..\..\src\libjin\audio\source.h">
       <Filter>src\libjin\audio</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\libjin\tilemap\tilemap.h">
+      <Filter>src\libjin\tilemap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\script\joypad\joypad.h">
+      <Filter>src\libjin\input</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\3rdparty\lua51\Makefile">