*update

2 files changed, 69 insertions, 84 deletions

diff --git a/build/vs2015/jin.vcxproj b/build/vs2015/jin.vcxproj
index 5c59d72..a446ab8 100644
--- a/build/vs2015/jin.vcxproj
+++ b/build/vs2015/jin.vcxproj
@@ -137,8 +137,11 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\src\3rdparty\cmixer\cmixer.c" />
-    <ClCompile Include="..\..\src\3rdparty\wav\wav.c" />
+    <ClCompile Include="..\..\src\libjin\3rdparty\GLee\GLee.c" />
+    <ClCompile Include="..\..\src\libjin\3rdparty\smount\smount.c" />
+    <ClCompile Include="..\..\src\libjin\3rdparty\stb\stb_vorbis.c" />
+    <ClCompile Include="..\..\src\libjin\3rdparty\tekcos\tekcos.c" />
+    <ClCompile Include="..\..\src\libjin\3rdparty\wav\wav.c" />
     <ClCompile Include="..\..\src\libjin\Audio\Audio.cpp" />
     <ClCompile Include="..\..\src\libjin\Audio\OpenAL\ALAudio.cpp" />
     <ClCompile Include="..\..\src\libjin\Audio\OpenAL\ALSource.cpp" />
@@ -150,7 +153,6 @@
     <ClCompile Include="..\..\src\libjin\Core\Timer.cpp" />
     <ClCompile Include="..\..\src\libjin\Filesystem\Filesystem.cpp" />
     <ClCompile Include="..\..\src\jinc.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" />
@@ -181,9 +183,6 @@
     <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\libjin\Input\Event.cpp" />
     <ClCompile Include="..\..\src\libjin\Input\Joypad.cpp" />
     <ClCompile Include="..\..\src\libjin\Input\Keyboard.cpp" />
@@ -222,11 +221,16 @@
     <ClCompile Include="..\..\src\main.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\src\3rdparty\cmixer\cmixer.h" />
-    <ClInclude Include="..\..\src\3rdparty\cmixer\cmixer_stb_vorbis.h" />
-    <ClInclude Include="..\..\src\3rdparty\wav\wav.h" />
     <ClInclude Include="..\..\src\data\font.ttf.h" />
     <ClInclude Include="..\..\src\data\icon.png.h" />
+    <ClInclude Include="..\..\src\libjin\3rdparty\GLee\GLee.h" />
+    <ClInclude Include="..\..\src\libjin\3rdparty\smount\dirent.h" />
+    <ClInclude Include="..\..\src\libjin\3rdparty\smount\smount.h" />
+    <ClInclude Include="..\..\src\libjin\3rdparty\stb\stb.h" />
+    <ClInclude Include="..\..\src\libjin\3rdparty\stb\stb_image.h" />
+    <ClInclude Include="..\..\src\libjin\3rdparty\stb\stb_truetype.h" />
+    <ClInclude Include="..\..\src\libjin\3rdparty\tekcos\tekcos.h" />
+    <ClInclude Include="..\..\src\libjin\3rdparty\wav\wav.h" />
     <ClInclude Include="..\..\src\libjin\Audio\Audio.h" />
     <ClInclude Include="..\..\src\libjin\Audio\OpenAL\ALAudio.h" />
     <ClInclude Include="..\..\src\libjin\Audio\OpenAL\ALSource.h" />
@@ -243,9 +247,7 @@
     <ClInclude Include="..\..\src\libjin\Debug\Debug.h" />
     <ClInclude Include="..\..\src\libjin\Debug\Log.h" />
     <ClInclude Include="..\..\src\libjin\Filesystem\Buffer.h" />
-    <ClInclude Include="..\..\src\libjin\Filesystem\dirent.h" />
     <ClInclude Include="..\..\src\libjin\Filesystem\Filesystem.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" />
@@ -271,11 +273,6 @@
     <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\libjin\Input\Event.h" />
     <ClInclude Include="..\..\src\libjin\Input\Input.h" />
     <ClInclude Include="..\..\src\libjin\Input\Joypad.h" />
diff --git a/build/vs2015/jin.vcxproj.filters b/build/vs2015/jin.vcxproj.filters
index 6607f0a..9a8cce5 100644
--- a/build/vs2015/jin.vcxproj.filters
+++ b/build/vs2015/jin.vcxproj.filters
@@ -10,12 +10,6 @@
     <Filter Include="src\3rdparty">
       <UniqueIdentifier>{269451af-b8e9-451f-940a-9b679e6116d3}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\3rdparty\GLee">
-      <UniqueIdentifier>{43dc399e-6dc9-4997-9a64-130e48c1c041}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\3rdparty\stb">
-      <UniqueIdentifier>{36e4150d-c477-47c1-a317-ea65f6f64b5c}</UniqueIdentifier>
-    </Filter>
     <Filter Include="src\3rdparty\lua51">
       <UniqueIdentifier>{5b7e6bcc-7957-4d7e-b660-d260726da1c9}</UniqueIdentifier>
     </Filter>
@@ -28,9 +22,6 @@
     <Filter Include="src\lua\embed">
       <UniqueIdentifier>{cb6d9d4e-046b-44c7-b00a-c316e87e035c}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\3rdparty\smount">
-      <UniqueIdentifier>{dd79db1e-9bec-4f8e-8d37-0d82c74a534b}</UniqueIdentifier>
-    </Filter>
     <Filter Include="src\lua\core">
       <UniqueIdentifier>{b13ee8dc-41fc-42b3-8b64-f9c261ebfc73}</UniqueIdentifier>
     </Filter>
@@ -61,9 +52,6 @@
     <Filter Include="src\lua\time">
       <UniqueIdentifier>{ee920041-8798-4827-be04-49f9342ba092}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\3rdparty\tekcos">
-      <UniqueIdentifier>{065bf16a-223d-4aae-ab0b-c7b5af5e3596}</UniqueIdentifier>
-    </Filter>
     <Filter Include="src\lua\thread">
       <UniqueIdentifier>{7957774a-4f34-4255-ab2e-8da9b6c71983}</UniqueIdentifier>
     </Filter>
@@ -76,12 +64,6 @@
     <Filter Include="src\lua\joypad">
       <UniqueIdentifier>{7fd81749-f776-4e5c-b6e2-33372a143560}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\3rdparty\wav">
-      <UniqueIdentifier>{6c9f6c64-12c5-4823-8662-daea544dba61}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\3rdparty\cmixer">
-      <UniqueIdentifier>{9bd498bc-1624-44f5-8cb6-e2f98f5c0aca}</UniqueIdentifier>
-    </Filter>
     <Filter Include="src\libjin\Audio">
       <UniqueIdentifier>{4e3c38b2-8076-4927-993d-e59607d4256a}</UniqueIdentifier>
     </Filter>
@@ -136,17 +118,29 @@
     <Filter Include="src\libjin\Audio\OpenAL">
       <UniqueIdentifier>{eb34937f-6278-4d8e-ad48-3c7a6dd6606c}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\3rdparty\newton">
-      <UniqueIdentifier>{0349246a-3dd5-4b76-a95f-39897aaf3746}</UniqueIdentifier>
+    <Filter Include="src\libjin\3rdparty">
+      <UniqueIdentifier>{82885ffb-90e6-46d6-b92d-5d96188809b2}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src\libjin\3rdparty\GLee">
+      <UniqueIdentifier>{8e02a165-9a07-40ed-a7cb-1992fe1b354d}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src\libjin\3rdparty\stb">
+      <UniqueIdentifier>{82ff6d68-7fc7-47fd-8817-81f2a01338fa}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src\libjin\3rdparty\wav">
+      <UniqueIdentifier>{f590a5f6-f8d5-4607-8280-9d436fc0988b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src\libjin\3rdparty\tekcos">
+      <UniqueIdentifier>{d1f6dace-eb73-49f8-8731-eeec095956eb}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src\libjin\3rdparty\smount">
+      <UniqueIdentifier>{2add7117-cbae-4454-a5f1-93eaed51b3e6}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\src\main.cpp">
       <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\3rdparty\GLEE\GLee.c">
-      <Filter>src\3rdparty\GLee</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\3rdparty\lua51\lapi.c">
       <Filter>src\3rdparty\lua51</Filter>
     </ClCompile>
@@ -237,18 +231,9 @@
     <ClCompile Include="..\..\src\3rdparty\lua51\print.c">
       <Filter>src\3rdparty\lua51</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\3rdparty\stb\stb_vorbis.c">
-      <Filter>src\3rdparty\stb</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\jinc.cpp">
       <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\3rdparty\smount\smount.c">
-      <Filter>src\3rdparty\smount</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\3rdparty\tekcos\tekcos.c">
-      <Filter>src\3rdparty\tekcos</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\lua\audio\luaopen_audio.cpp">
       <Filter>src\lua\audio</Filter>
     </ClCompile>
@@ -303,12 +288,6 @@
     <ClCompile Include="..\..\src\lua\audio\luaopen_Source.cpp">
       <Filter>src\lua\audio</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\3rdparty\wav\wav.c">
-      <Filter>src\3rdparty\wav</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\3rdparty\cmixer\cmixer.c">
-      <Filter>src\3rdparty\cmixer</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\libjin\Audio\Audio.cpp">
       <Filter>src\libjin\Audio</Filter>
     </ClCompile>
@@ -390,11 +369,23 @@
     <ClCompile Include="..\..\src\libjin\Audio\OpenAL\ALSource.cpp">
       <Filter>src\libjin\Audio\OpenAL</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\libjin\3rdparty\GLee\GLee.c">
+      <Filter>src\libjin\3rdparty\GLee</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\libjin\3rdparty\stb\stb_vorbis.c">
+      <Filter>src\libjin\3rdparty\stb</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\libjin\3rdparty\wav\wav.c">
+      <Filter>src\libjin\3rdparty\wav</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\libjin\3rdparty\tekcos\tekcos.c">
+      <Filter>src\libjin\3rdparty\tekcos</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\libjin\3rdparty\smount\smount.c">
+      <Filter>src\libjin\3rdparty\smount</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\src\3rdparty\GLEE\GLee.h">
-      <Filter>src\3rdparty\GLee</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\3rdparty\lua51\lapi.h">
       <Filter>src\3rdparty\lua51</Filter>
     </ClInclude>
@@ -464,12 +455,6 @@
     <ClInclude Include="..\..\src\3rdparty\lua51\lzio.h">
       <Filter>src\3rdparty\lua51</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\3rdparty\stb\stb_image.h">
-      <Filter>src\3rdparty\stb</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\3rdparty\stb\stb_truetype.h">
-      <Filter>src\3rdparty\stb</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\3rdparty\lua51\luax.h">
       <Filter>src\3rdparty\lua51</Filter>
     </ClInclude>
@@ -497,15 +482,6 @@
     <ClInclude Include="..\..\src\lua\embed\path.lua.h">
       <Filter>src\lua\embed</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\3rdparty\smount\smount.h">
-      <Filter>src\3rdparty\smount</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\3rdparty\smount\dirent.h">
-      <Filter>src\3rdparty\smount</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\3rdparty\tekcos\tekcos.h">
-      <Filter>src\3rdparty\tekcos</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\lua\luaopen_jin.h">
       <Filter>src\lua</Filter>
     </ClInclude>
@@ -524,15 +500,6 @@
     <ClInclude Include="..\..\src\lua\luax.h">
       <Filter>src\lua</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\3rdparty\wav\wav.h">
-      <Filter>src\3rdparty\wav</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\3rdparty\cmixer\cmixer.h">
-      <Filter>src\3rdparty\cmixer</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\3rdparty\cmixer\cmixer_stb_vorbis.h">
-      <Filter>src\3rdparty\cmixer</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\libjin\modules.h">
       <Filter>src\libjin</Filter>
     </ClInclude>
@@ -575,9 +542,6 @@
     <ClInclude Include="..\..\src\libjin\Filesystem\Buffer.h">
       <Filter>src\libjin\Filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\libjin\Filesystem\dirent.h">
-      <Filter>src\libjin\Filesystem</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\libjin\Filesystem\Filesystem.h">
       <Filter>src\libjin\Filesystem</Filter>
     </ClInclude>
@@ -680,6 +644,30 @@
     <ClInclude Include="..\..\src\libjin\Audio\OpenAL\ALSource.h">
       <Filter>src\libjin\Audio\OpenAL</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\libjin\3rdparty\GLee\GLee.h">
+      <Filter>src\libjin\3rdparty\GLee</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libjin\3rdparty\stb\stb.h">
+      <Filter>src\libjin\3rdparty\stb</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libjin\3rdparty\stb\stb_image.h">
+      <Filter>src\libjin\3rdparty\stb</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libjin\3rdparty\stb\stb_truetype.h">
+      <Filter>src\libjin\3rdparty\stb</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libjin\3rdparty\wav\wav.h">
+      <Filter>src\libjin\3rdparty\wav</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libjin\3rdparty\tekcos\tekcos.h">
+      <Filter>src\libjin\3rdparty\tekcos</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libjin\3rdparty\smount\dirent.h">
+      <Filter>src\libjin\3rdparty\smount</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libjin\3rdparty\smount\smount.h">
+      <Filter>src\libjin\3rdparty\smount</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\3rdparty\lua51\Makefile">