1 files changed, 131 insertions, 131 deletions
diff --git a/build/vs2015/jin.vcxproj b/build/vs2015/jin.vcxproj
index f50eb32..eedeae5 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)libs\SDL2-2.0.5\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\src\;$(SolutionDir)3rdparty\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)libs\SDL2-2.0.5\lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(SolutionDir)3rdparty\SDL2-2.0.5\lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Windows</SubSystem>
       <EntryPointSymbol>
       </EntryPointSymbol>
@@ -135,133 +135,133 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\src\audio\audio.cpp" />
-    <ClCompile Include="..\..\src\core\game.cpp" />
-    <ClCompile Include="..\..\src\fs\filesystem.cpp" />
-    <ClCompile Include="..\..\src\input\event.cpp" />
-    <ClCompile Include="..\..\src\input\keyboard.cpp" />
-    <ClCompile Include="..\..\src\input\mouse.cpp" />
+    <ClCompile Include="..\..\src\libjin\audio\audio.cpp" />
+    <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\keyboard.cpp" />
+    <ClCompile Include="..\..\src\libjin\input\mouse.cpp" />
     <ClCompile Include="..\..\src\jinc.cpp" />
-    <ClCompile Include="..\..\src\libs\GLEE\GLee.c" />
-    <ClCompile Include="..\..\src\libs\lua51\lapi.c" />
-    <ClCompile Include="..\..\src\libs\lua51\lauxlib.c" />
-    <ClCompile Include="..\..\src\libs\lua51\lbaselib.c" />
-    <ClCompile Include="..\..\src\libs\lua51\lcode.c" />
-    <ClCompile Include="..\..\src\libs\lua51\ldblib.c" />
-    <ClCompile Include="..\..\src\libs\lua51\ldebug.c" />
-    <ClCompile Include="..\..\src\libs\lua51\ldo.c" />
-    <ClCompile Include="..\..\src\libs\lua51\ldump.c" />
-    <ClCompile Include="..\..\src\libs\lua51\lfunc.c" />
-    <ClCompile Include="..\..\src\libs\lua51\lgc.c" />
-    <ClCompile Include="..\..\src\libs\lua51\linit.c" />
-    <ClCompile Include="..\..\src\libs\lua51\liolib.c" />
-    <ClCompile Include="..\..\src\libs\lua51\llex.c" />
-    <ClCompile Include="..\..\src\libs\lua51\lmathlib.c" />
-    <ClCompile Include="..\..\src\libs\lua51\lmem.c" />
-    <ClCompile Include="..\..\src\libs\lua51\loadlib.c" />
-    <ClCompile Include="..\..\src\libs\lua51\lobject.c" />
-    <ClCompile Include="..\..\src\libs\lua51\lopcodes.c" />
-    <ClCompile Include="..\..\src\libs\lua51\loslib.c" />
-    <ClCompile Include="..\..\src\libs\lua51\lparser.c" />
-    <ClCompile Include="..\..\src\libs\lua51\lstate.c" />
-    <ClCompile Include="..\..\src\libs\lua51\lstring.c" />
-    <ClCompile Include="..\..\src\libs\lua51\lstrlib.c" />
-    <ClCompile Include="..\..\src\libs\lua51\ltable.c" />
-    <ClCompile Include="..\..\src\libs\lua51\ltablib.c" />
-    <ClCompile Include="..\..\src\libs\lua51\ltm.c" />
-    <ClCompile Include="..\..\src\libs\lua51\lundump.c" />
-    <ClCompile Include="..\..\src\libs\lua51\lvm.c" />
-    <ClCompile Include="..\..\src\libs\lua51\lzio.c" />
-    <ClCompile Include="..\..\src\libs\lua51\print.c" />
-    <ClCompile Include="..\..\src\libs\smount\smount.c" />
-    <ClCompile Include="..\..\src\libs\stb\stb_vorbis.c" />
-    <ClCompile Include="..\..\src\libs\tekcos\tekcos.c" />
-    <ClCompile Include="..\..\src\lua\audio\luaopen_audio.cpp" />
-    <ClCompile Include="..\..\src\lua\audio\luaopen_Sound.cpp" />
-    <ClCompile Include="..\..\src\lua\core\luaopen_core.cpp" />
-    <ClCompile Include="..\..\src\lua\debug\luaopen_debug.cpp" />
-    <ClCompile Include="..\..\src\lua\event\luaopen_event.cpp" />
-    <ClCompile Include="..\..\src\lua\filesystem\luaopen_filesystem.cpp" />
-    <ClCompile Include="..\..\src\lua\graphics\luaopen_Canvas.cpp" />
-    <ClCompile Include="..\..\src\lua\graphics\luaopen_Font.cpp" />
-    <ClCompile Include="..\..\src\lua\graphics\luaopen_graphics.cpp" />
-    <ClCompile Include="..\..\src\lua\graphics\luaopen_Image.cpp" />
-    <ClCompile Include="..\..\src\lua\graphics\luaopen_JSL.cpp" />
-    <ClCompile Include="..\..\src\lua\graphics\luaopen_Tilemap.cpp" />
-    <ClCompile Include="..\..\src\lua\keyboard\luaopen_keyboard.cpp" />
-    <ClCompile Include="..\..\src\lua\mouse\luaopen_mouse.cpp" />
-    <ClCompile Include="..\..\src\lua\luaopen_jin.cpp" />
-    <ClCompile Include="..\..\src\lua\net\luaopen_net.cpp" />
-    <ClCompile Include="..\..\src\lua\thread\luaopen_Thread.cpp" />
-    <ClCompile Include="..\..\src\lua\time\luaopen_time.cpp" />
+    <ClCompile Include="..\..\src\3rdparty\GLEE\GLee.c" />
+    <ClCompile Include="..\..\src\3rdparty\lua51\lapi.c" />
+    <ClCompile Include="..\..\src\3rdparty\lua51\lauxlib.c" />
+    <ClCompile Include="..\..\src\3rdparty\lua51\lbaselib.c" />
+    <ClCompile Include="..\..\src\3rdparty\lua51\lcode.c" />
+    <ClCompile Include="..\..\src\3rdparty\lua51\ldblib.c" />
+    <ClCompile Include="..\..\src\3rdparty\lua51\ldebug.c" />
+    <ClCompile Include="..\..\src\3rdparty\lua51\ldo.c" />
+    <ClCompile Include="..\..\src\3rdparty\lua51\ldump.c" />
+    <ClCompile Include="..\..\src\3rdparty\lua51\lfunc.c" />
+    <ClCompile Include="..\..\src\3rdparty\lua51\lgc.c" />
+    <ClCompile Include="..\..\src\3rdparty\lua51\linit.c" />
+    <ClCompile Include="..\..\src\3rdparty\lua51\liolib.c" />
+    <ClCompile Include="..\..\src\3rdparty\lua51\llex.c" />
+    <ClCompile Include="..\..\src\3rdparty\lua51\lmathlib.c" />
+    <ClCompile Include="..\..\src\3rdparty\lua51\lmem.c" />
+    <ClCompile Include="..\..\src\3rdparty\lua51\loadlib.c" />
+    <ClCompile Include="..\..\src\3rdparty\lua51\lobject.c" />
+    <ClCompile Include="..\..\src\3rdparty\lua51\lopcodes.c" />
+    <ClCompile Include="..\..\src\3rdparty\lua51\loslib.c" />
+    <ClCompile Include="..\..\src\3rdparty\lua51\lparser.c" />
+    <ClCompile Include="..\..\src\3rdparty\lua51\lstate.c" />
+    <ClCompile Include="..\..\src\3rdparty\lua51\lstring.c" />
+    <ClCompile Include="..\..\src\3rdparty\lua51\lstrlib.c" />
+    <ClCompile Include="..\..\src\3rdparty\lua51\ltable.c" />
+    <ClCompile Include="..\..\src\3rdparty\lua51\ltablib.c" />
+    <ClCompile Include="..\..\src\3rdparty\lua51\ltm.c" />
+    <ClCompile Include="..\..\src\3rdparty\lua51\lundump.c" />
+    <ClCompile Include="..\..\src\3rdparty\lua51\lvm.c" />
+    <ClCompile Include="..\..\src\3rdparty\lua51\lzio.c" />
+    <ClCompile Include="..\..\src\3rdparty\lua51\print.c" />
+    <ClCompile Include="..\..\src\3rdparty\smount\smount.c" />
+    <ClCompile Include="..\..\src\3rdparty\stb\stb_vorbis.c" />
+    <ClCompile Include="..\..\src\3rdparty\tekcos\tekcos.c" />
+    <ClCompile Include="..\..\src\script\audio\luaopen_audio.cpp" />
+    <ClCompile Include="..\..\src\script\audio\luaopen_Sound.cpp" />
+    <ClCompile Include="..\..\src\script\core\luaopen_core.cpp" />
+    <ClCompile Include="..\..\src\script\debug\luaopen_debug.cpp" />
+    <ClCompile Include="..\..\src\script\event\luaopen_event.cpp" />
+    <ClCompile Include="..\..\src\script\filesystem\luaopen_filesystem.cpp" />
+    <ClCompile Include="..\..\src\script\graphics\luaopen_Canvas.cpp" />
+    <ClCompile Include="..\..\src\script\graphics\luaopen_Font.cpp" />
+    <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\keyboard\luaopen_keyboard.cpp" />
+    <ClCompile Include="..\..\src\script\mouse\luaopen_mouse.cpp" />
+    <ClCompile Include="..\..\src\script\luaopen_jin.cpp" />
+    <ClCompile Include="..\..\src\script\net\luaopen_net.cpp" />
+    <ClCompile Include="..\..\src\script\thread\luaopen_Thread.cpp" />
+    <ClCompile Include="..\..\src\script\time\luaopen_time.cpp" />
     <ClCompile Include="..\..\src\main.cpp" />
-    <ClCompile Include="..\..\src\render\canvas.cpp" />
-    <ClCompile Include="..\..\src\render\drawable.cpp" />
-    <ClCompile Include="..\..\src\render\font.cpp" />
-    <ClCompile Include="..\..\src\render\graphics.cpp" />
-    <ClCompile Include="..\..\src\render\image.cpp" />
-    <ClCompile Include="..\..\src\render\jsl.cpp" />
-    <ClCompile Include="..\..\src\render\window.cpp" />
+    <ClCompile Include="..\..\src\libjin\render\canvas.cpp" />
+    <ClCompile Include="..\..\src\libjin\render\drawable.cpp" />
+    <ClCompile Include="..\..\src\libjin\render\font.cpp" />
+    <ClCompile Include="..\..\src\libjin\render\graphics.cpp" />
+    <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" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\src\audio\audio.h" />
-    <ClInclude Include="..\..\src\core\game.h" />
-    <ClInclude Include="..\..\src\fs\buffer.h" />
-    <ClInclude Include="..\..\src\fs\filesystem.h" />
-    <ClInclude Include="..\..\src\input\event.h" />
-    <ClInclude Include="..\..\src\input\keyboard.h" />
-    <ClInclude Include="..\..\src\input\mouse.h" />
-    <ClInclude Include="..\..\src\libs\GLEE\GLee.h" />
-    <ClInclude Include="..\..\src\libs\lua51\lapi.h" />
-    <ClInclude Include="..\..\src\libs\lua51\lauxlib.h" />
-    <ClInclude Include="..\..\src\libs\lua51\lcode.h" />
-    <ClInclude Include="..\..\src\libs\lua51\ldebug.h" />
-    <ClInclude Include="..\..\src\libs\lua51\ldo.h" />
-    <ClInclude Include="..\..\src\libs\lua51\lfunc.h" />
-    <ClInclude Include="..\..\src\libs\lua51\lgc.h" />
-    <ClInclude Include="..\..\src\libs\lua51\llex.h" />
-    <ClInclude Include="..\..\src\libs\lua51\llimits.h" />
-    <ClInclude Include="..\..\src\libs\lua51\lmem.h" />
-    <ClInclude Include="..\..\src\libs\lua51\lobject.h" />
-    <ClInclude Include="..\..\src\libs\lua51\lopcodes.h" />
-    <ClInclude Include="..\..\src\libs\lua51\lparser.h" />
-    <ClInclude Include="..\..\src\libs\lua51\lstate.h" />
-    <ClInclude Include="..\..\src\libs\lua51\lstring.h" />
-    <ClInclude Include="..\..\src\libs\lua51\ltable.h" />
-    <ClInclude Include="..\..\src\libs\lua51\ltm.h" />
-    <ClInclude Include="..\..\src\libs\lua51\lua.h" />
-    <ClInclude Include="..\..\src\libs\lua51\luaconf.h" />
-    <ClInclude Include="..\..\src\libs\lua51\lualib.h" />
-    <ClInclude Include="..\..\src\libs\lua51\luax.h" />
-    <ClInclude Include="..\..\src\libs\lua51\lundump.h" />
-    <ClInclude Include="..\..\src\libs\lua51\lvm.h" />
-    <ClInclude Include="..\..\src\libs\lua51\lzio.h" />
-    <ClInclude Include="..\..\src\libs\luax\luax.h" />
-    <ClInclude Include="..\..\src\libs\smount\dirent.h" />
-    <ClInclude Include="..\..\src\libs\smount\smount.h" />
-    <ClInclude Include="..\..\src\libs\stb\stb_image.h" />
-    <ClInclude Include="..\..\src\libs\stb\stb_truetype.h" />
-    <ClInclude Include="..\..\src\libs\tekcos\tekcos.h" />
-    <ClInclude Include="..\..\src\lua\embed\debug.lua.h" />
-    <ClInclude Include="..\..\src\lua\embed\embed.h" />
-    <ClInclude Include="..\..\src\lua\embed\graphics.lua.h" />
-    <ClInclude Include="..\..\src\lua\embed\boot.lua.h" />
-    <ClInclude Include="..\..\src\lua\embed\keyboard.lua.h" />
-    <ClInclude Include="..\..\src\lua\embed\mouse.lua.h" />
-    <ClInclude Include="..\..\src\lua\embed\path.lua.h" />
-    <ClInclude Include="..\..\src\lua\luaopen_jin.h" />
-    <ClInclude Include="..\..\src\lua\luaopen_types.h" />
-    <ClInclude Include="..\..\src\net\net.h" />
-    <ClInclude Include="..\..\src\render\canvas.h" />
-    <ClInclude Include="..\..\src\render\color.h" />
-    <ClInclude Include="..\..\src\render\drawable.h" />
-    <ClInclude Include="..\..\src\render\font.h" />
-    <ClInclude Include="..\..\src\render\graphics.h" />
-    <ClInclude Include="..\..\src\render\image.h" />
-    <ClInclude Include="..\..\src\render\jsl.h" />
-    <ClInclude Include="..\..\src\render\quad.h" />
-    <ClInclude Include="..\..\src\render\window.h" />
+    <ClInclude Include="..\..\src\libjin\audio\audio.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\input\event.h" />
+    <ClInclude Include="..\..\src\libjin\input\keyboard.h" />
+    <ClInclude Include="..\..\src\libjin\input\mouse.h" />
+    <ClInclude Include="..\..\src\3rdparty\GLEE\GLee.h" />
+    <ClInclude Include="..\..\src\3rdparty\lua51\lapi.h" />
+    <ClInclude Include="..\..\src\3rdparty\lua51\lauxlib.h" />
+    <ClInclude Include="..\..\src\3rdparty\lua51\lcode.h" />
+    <ClInclude Include="..\..\src\3rdparty\lua51\ldebug.h" />
+    <ClInclude Include="..\..\src\3rdparty\lua51\ldo.h" />
+    <ClInclude Include="..\..\src\3rdparty\lua51\lfunc.h" />
+    <ClInclude Include="..\..\src\3rdparty\lua51\lgc.h" />
+    <ClInclude Include="..\..\src\3rdparty\lua51\llex.h" />
+    <ClInclude Include="..\..\src\3rdparty\lua51\llimits.h" />
+    <ClInclude Include="..\..\src\3rdparty\lua51\lmem.h" />
+    <ClInclude Include="..\..\src\3rdparty\lua51\lobject.h" />
+    <ClInclude Include="..\..\src\3rdparty\lua51\lopcodes.h" />
+    <ClInclude Include="..\..\src\3rdparty\lua51\lparser.h" />
+    <ClInclude Include="..\..\src\3rdparty\lua51\lstate.h" />
+    <ClInclude Include="..\..\src\3rdparty\lua51\lstring.h" />
+    <ClInclude Include="..\..\src\3rdparty\lua51\ltable.h" />
+    <ClInclude Include="..\..\src\3rdparty\lua51\ltm.h" />
+    <ClInclude Include="..\..\src\3rdparty\lua51\lua.h" />
+    <ClInclude Include="..\..\src\3rdparty\lua51\luaconf.h" />
+    <ClInclude Include="..\..\src\3rdparty\lua51\lualib.h" />
+    <ClInclude Include="..\..\src\3rdparty\lua51\luax.h" />
+    <ClInclude Include="..\..\src\3rdparty\lua51\lundump.h" />
+    <ClInclude Include="..\..\src\3rdparty\lua51\lvm.h" />
+    <ClInclude Include="..\..\src\3rdparty\lua51\lzio.h" />
+    <ClInclude Include="..\..\src\3rdparty\luax\luax.h" />
+    <ClInclude Include="..\..\src\3rdparty\smount\dirent.h" />
+    <ClInclude Include="..\..\src\3rdparty\smount\smount.h" />
+    <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\script\embed\debug.lua.h" />
+    <ClInclude Include="..\..\src\script\embed\embed.h" />
+    <ClInclude Include="..\..\src\script\embed\graphics.lua.h" />
+    <ClInclude Include="..\..\src\script\embed\boot.lua.h" />
+    <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\luaopen_jin.h" />
+    <ClInclude Include="..\..\src\script\luaopen_types.h" />
+    <ClInclude Include="..\..\src\libjin\net\net.h" />
+    <ClInclude Include="..\..\src\libjin\render\canvas.h" />
+    <ClInclude Include="..\..\src\libjin\render\color.h" />
+    <ClInclude Include="..\..\src\libjin\render\drawable.h" />
+    <ClInclude Include="..\..\src\libjin\render\font.h" />
+    <ClInclude Include="..\..\src\libjin\render\graphics.h" />
+    <ClInclude Include="..\..\src\libjin\render\image.h" />
+    <ClInclude Include="..\..\src\libjin\render\jsl.h" />
+    <ClInclude Include="..\..\src\libjin\render\quad.h" />
+    <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" />
@@ -277,13 +277,13 @@
     <Image Include="..\..\src\res\icon.png" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\src\libs\lua51\Makefile" />
-    <None Include="..\..\src\lua\embed\debug.lua" />
-    <None Include="..\..\src\lua\embed\graphics.lua" />
-    <None Include="..\..\src\lua\embed\boot.lua" />
-    <None Include="..\..\src\lua\embed\keyboard.lua" />
-    <None Include="..\..\src\lua\embed\mouse.lua" />
-    <None Include="..\..\src\lua\embed\path.lua" />
+    <None Include="..\..\src\3rdparty\lua51\Makefile" />
+    <None Include="..\..\src\script\embed\debug.lua" />
+    <None Include="..\..\src\script\embed\graphics.lua" />
+    <None Include="..\..\src\script\embed\boot.lua" />
+    <None Include="..\..\src\script\embed\keyboard.lua" />
+    <None Include="..\..\src\script\embed\mouse.lua" />
+    <None Include="..\..\src\script\embed\path.lua" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">