1 files changed, 46 insertions, 35 deletions
diff --git a/build/vs2015/jin.vcxproj b/build/vs2015/jin.vcxproj
index 8f64c09..1b1f649 100644
--- a/build/vs2015/jin.vcxproj
+++ b/build/vs2015/jin.vcxproj
@@ -84,6 +84,7 @@
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(SolutionDir)..\..\src\;$(SolutionDir)libs\SDL2-2.0.5\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <CompileAs>CompileAsCpp</CompileAs>
+      <ObjectFileName>$(IntDir)/%(RelativeDir)/</ObjectFileName>
     </ClCompile>
     <Link>
       <AdditionalDependencies>opengl32.lib;glu32.lib;SDL2main.lib;SDL2.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -110,6 +111,7 @@
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(SolutionDir)..\..\src\;$(SolutionDir)libs\SDL2-2.0.5\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <CompileAs>CompileAsCpp</CompileAs>
+      <ObjectFileName>$(IntDir)/%(RelativeDir)/</ObjectFileName>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -136,8 +138,12 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\src\libjin\audio\audio.cpp" />
+    <ClCompile Include="..\..\src\libjin\audio\sdl\audio.cpp" />
+    <ClCompile Include="..\..\src\libjin\audio\sdl\source.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\fs\filesystem.cpp" />
     <ClCompile Include="..\..\src\libjin\input\event.cpp" />
     <ClCompile Include="..\..\src\libjin\input\joypad.cpp" />
@@ -181,24 +187,24 @@
     <ClCompile Include="..\..\src\libjin\math\matrix.cpp" />
     <ClCompile Include="..\..\src\libjin\math\vector.cpp" />
     <ClCompile Include="..\..\src\libjin\utils\unittest.cpp" />
-    <ClCompile Include="..\..\src\script\audio\luaopen_audio.cpp" />
-    <ClCompile Include="..\..\src\script\audio\luaopen_Source.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\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" />
-    <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\lua\audio\luaopen_audio.cpp" />
+    <ClCompile Include="..\..\src\lua\audio\luaopen_Source.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\joypad\luaopen_joypad.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\main.cpp" />
     <ClCompile Include="..\..\src\libjin\render\canvas.cpp" />
     <ClCompile Include="..\..\src\libjin\render\drawable.cpp" />
@@ -212,10 +218,14 @@
     <ClInclude Include="..\..\src\data\font.ttf.h" />
     <ClInclude Include="..\..\src\data\icon.png.h" />
     <ClInclude Include="..\..\src\libjin\audio\audio.h" />
+    <ClInclude Include="..\..\src\libjin\audio\sdl\audio.h" />
+    <ClInclude Include="..\..\src\libjin\audio\sdl\source.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\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\fs\buffer.h" />
@@ -261,20 +271,20 @@
     <ClInclude Include="..\..\src\libjin\math\math.h" />
     <ClInclude Include="..\..\src\libjin\math\matrix.h" />
     <ClInclude Include="..\..\src\libjin\math\quad.h" />
-    <ClInclude Include="..\..\src\libjin\math\rect.h" />
     <ClInclude Include="..\..\src\libjin\math\vector.h" />
+    <ClInclude Include="..\..\src\libjin\physics\physics.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" />
-    <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\joypad\joypad.h" />
-    <ClInclude Include="..\..\src\script\luaopen_jin.h" />
-    <ClInclude Include="..\..\src\script\luaopen_types.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\joypad\joypad.h" />
+    <ClInclude Include="..\..\src\lua\luaopen_jin.h" />
+    <ClInclude Include="..\..\src\lua\luaopen_types.h" />
     <ClInclude Include="..\..\src\libjin\net\net.h" />
     <ClInclude Include="..\..\src\libjin\render\canvas.h" />
     <ClInclude Include="..\..\src\libjin\render\color.h" />
@@ -287,15 +297,16 @@
     <ClInclude Include="..\..\src\libjin\utils\endian.h" />
     <ClInclude Include="..\..\src\libjin\utils\macros.h" />
     <ClInclude Include="..\..\src\libjin\utils\utils.h" />
+    <ClInclude Include="..\..\src\lua\luax.h" />
   </ItemGroup>
   <ItemGroup>
     <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" />
+    <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" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">