diff options
| -rw-r--r-- | bin/jin.exe | bin | 741888 -> 1506816 bytes | |||
| -rw-r--r-- | build/vs2015/jin.vcxproj | 148 | ||||
| -rw-r--r-- | build/vs2015/jin.vcxproj.filters | 482 | ||||
| -rw-r--r-- | src/libjin/Filesystem/Buffer.h (renamed from src/libjin/fs/buffer.h) | 0 | ||||
| -rw-r--r-- | src/libjin/Filesystem/Filesystem.cpp (renamed from src/libjin/fs/filesystem.cpp) | 0 | ||||
| -rw-r--r-- | src/libjin/Filesystem/Filesystem.h (renamed from src/libjin/fs/filesystem.h) | 0 | ||||
| -rw-r--r-- | src/libjin/Filesystem/dirent.h (renamed from src/libjin/fs/dirent.h) | 0 | ||||
| -rw-r--r-- | src/libjin/fs/fs.h | 7 | ||||
| -rw-r--r-- | src/libjin/jin.h | 2 | ||||
| -rw-r--r-- | src/libjin/modules.h | 2 |
10 files changed, 317 insertions, 324 deletions
diff --git a/bin/jin.exe b/bin/jin.exe Binary files differindex 3b384b8..87d676e 100644 --- a/bin/jin.exe +++ b/bin/jin.exe diff --git a/build/vs2015/jin.vcxproj b/build/vs2015/jin.vcxproj index c67d6c5..affcc29 100644 --- a/build/vs2015/jin.vcxproj +++ b/build/vs2015/jin.vcxproj @@ -139,20 +139,16 @@ <ItemGroup> <ClCompile Include="..\..\src\3rdparty\cmixer\cmixer.c" /> <ClCompile Include="..\..\src\3rdparty\wav\wav.c" /> - <ClCompile Include="..\..\src\libjin\audio\audio.cpp" /> - <ClCompile Include="..\..\src\libjin\audio\openal\audio.cpp" /> - <ClCompile Include="..\..\src\libjin\audio\openal\source.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" /> - <ClCompile Include="..\..\src\libjin\input\keyboard.cpp" /> - <ClCompile Include="..\..\src\libjin\input\mouse.cpp" /> + <ClCompile Include="..\..\src\libjin\Audio\Audio.cpp" /> + <ClCompile Include="..\..\src\libjin\Audio\OpenAL\Audio.cpp" /> + <ClCompile Include="..\..\src\libjin\Audio\OpenAL\Source.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\Filesystem\Filesystem.cpp" /> <ClCompile Include="..\..\src\jinc.cpp" /> <ClCompile Include="..\..\src\3rdparty\GLEE\GLee.c" /> <ClCompile Include="..\..\src\3rdparty\lua51\lapi.c" /> @@ -188,12 +184,23 @@ <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\math\matrix.cpp" /> - <ClCompile Include="..\..\src\libjin\math\vector.cpp" /> - <ClCompile Include="..\..\src\libjin\net\net.cpp" /> - <ClCompile Include="..\..\src\libjin\thread\thread.cpp" /> - <ClCompile Include="..\..\src\libjin\utils\log.cpp" /> - <ClCompile Include="..\..\src\libjin\utils\unittest.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\libjin\Math\Matrix.cpp" /> + <ClCompile Include="..\..\src\libjin\Math\Vector.cpp" /> + <ClCompile Include="..\..\src\libjin\Net\Net.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\JSL.cpp" /> + <ClCompile Include="..\..\src\libjin\Render\Texture.cpp" /> + <ClCompile Include="..\..\src\libjin\Render\Window.cpp" /> + <ClCompile Include="..\..\src\libjin\Thread\Thread.cpp" /> + <ClCompile Include="..\..\src\libjin\Utils\Log.cpp" /> + <ClCompile Include="..\..\src\libjin\Utils\unittest.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" /> @@ -213,13 +220,6 @@ <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" /> - <ClCompile Include="..\..\src\libjin\render\font.cpp" /> - <ClCompile Include="..\..\src\libjin\render\graphics.cpp" /> - <ClCompile Include="..\..\src\libjin\render\texture.cpp" /> - <ClCompile Include="..\..\src\libjin\render\jsl.cpp" /> - <ClCompile Include="..\..\src\libjin\render\window.cpp" /> </ItemGroup> <ItemGroup> <ClInclude Include="..\..\src\3rdparty\cmixer\cmixer.h" /> @@ -227,29 +227,24 @@ <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\audio\audio.h" /> - <ClInclude Include="..\..\src\libjin\audio\openal\audio.h" /> - <ClInclude Include="..\..\src\libjin\audio\openal\source.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\data.h" /> - <ClInclude Include="..\..\src\libjin\common\singleton.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" /> - <ClInclude Include="..\..\src\libjin\fs\filesystem.h" /> - <ClInclude Include="..\..\src\libjin\fs\fs.h" /> - <ClInclude Include="..\..\src\libjin\input\event.h" /> - <ClInclude Include="..\..\src\libjin\input\input.h" /> - <ClInclude Include="..\..\src\libjin\input\joypad.h" /> - <ClInclude Include="..\..\src\libjin\input\keyboard.h" /> - <ClInclude Include="..\..\src\libjin\input\mouse.h" /> + <ClInclude Include="..\..\src\libjin\Audio\Audio.h" /> + <ClInclude Include="..\..\src\libjin\Audio\OpenAL\Audio.h" /> + <ClInclude Include="..\..\src\libjin\Audio\OpenAL\Source.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\Data.h" /> + <ClInclude Include="..\..\src\libjin\Common\Singleton.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\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" /> @@ -281,21 +276,38 @@ <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" /> + <ClInclude Include="..\..\src\libjin\Input\Keyboard.h" /> + <ClInclude Include="..\..\src\libjin\Input\Mouse.h" /> <ClInclude Include="..\..\src\libjin\jin.h" /> - <ClInclude Include="..\..\src\libjin\math\constant.h" /> - <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\vector.h" /> + <ClInclude Include="..\..\src\libjin\Math\constant.h" /> + <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\Vector.h" /> <ClInclude Include="..\..\src\libjin\modules.h" /> - <ClInclude Include="..\..\src\libjin\physics\physics.h" /> - <ClInclude Include="..\..\src\libjin\physics\rigid.h" /> - <ClInclude Include="..\..\src\libjin\render\render.h" /> - <ClInclude Include="..\..\src\libjin\thread\thread.h" /> - <ClInclude Include="..\..\src\libjin\tilemap\tilemap.h" /> + <ClInclude Include="..\..\src\libjin\Net\Net.h" /> + <ClInclude Include="..\..\src\libjin\Physics\Physics.h" /> + <ClInclude Include="..\..\src\libjin\Physics\Rigid.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\JSL.h" /> + <ClInclude Include="..\..\src\libjin\Render\Render.h" /> + <ClInclude Include="..\..\src\libjin\Render\Texture.h" /> + <ClInclude Include="..\..\src\libjin\Render\Window.h" /> + <ClInclude Include="..\..\src\libjin\Thread\Thread.h" /> + <ClInclude Include="..\..\src\libjin\Tilemap\Tilemap.h" /> <ClInclude Include="..\..\src\libjin\tools\EventMsgCenter\EventMsgCenter.h" /> - <ClInclude Include="..\..\src\libjin\ui\ui.h" /> - <ClInclude Include="..\..\src\libjin\utils\log.h" /> + <ClInclude Include="..\..\src\libjin\UI\UI.h" /> + <ClInclude Include="..\..\src\libjin\Utils\endian.h" /> + <ClInclude Include="..\..\src\libjin\Utils\Log.h" /> + <ClInclude Include="..\..\src\libjin\Utils\macros.h" /> + <ClInclude Include="..\..\src\libjin\Utils\utils.h" /> <ClInclude Include="..\..\src\lua\embed\debug.lua.h" /> <ClInclude Include="..\..\src\lua\embed\embed.h" /> <ClInclude Include="..\..\src\lua\embed\graphics.lua.h" /> @@ -305,18 +317,6 @@ <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\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\texture.h" /> - <ClInclude Include="..\..\src\libjin\render\jsl.h" /> - <ClInclude Include="..\..\src\libjin\render\window.h" /> - <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> diff --git a/build/vs2015/jin.vcxproj.filters b/build/vs2015/jin.vcxproj.filters index 95fd77e..aeef1a1 100644 --- a/build/vs2015/jin.vcxproj.filters +++ b/build/vs2015/jin.vcxproj.filters @@ -7,27 +7,9 @@ <Filter Include="src\libjin"> <UniqueIdentifier>{f3e85b81-1688-49e4-b85c-65d99ddafad0}</UniqueIdentifier> </Filter> - <Filter Include="src\libjin\audio"> - <UniqueIdentifier>{4e3c38b2-8076-4927-993d-e59607d4256a}</UniqueIdentifier> - </Filter> - <Filter Include="src\libjin\core"> - <UniqueIdentifier>{7467bc99-3a63-4b92-b3ab-b5a3d86ead1b}</UniqueIdentifier> - </Filter> - <Filter Include="src\libjin\input"> - <UniqueIdentifier>{14253521-dbe9-4289-b100-47b4deb41331}</UniqueIdentifier> - </Filter> <Filter Include="src\3rdparty"> <UniqueIdentifier>{269451af-b8e9-451f-940a-9b679e6116d3}</UniqueIdentifier> </Filter> - <Filter Include="src\libjin\net"> - <UniqueIdentifier>{fe12237c-986f-42f3-86d9-1fe848e1e058}</UniqueIdentifier> - </Filter> - <Filter Include="src\libjin\render"> - <UniqueIdentifier>{23033979-4942-4f08-8a1d-ecc0dec442b5}</UniqueIdentifier> - </Filter> - <Filter Include="src\libjin\utils"> - <UniqueIdentifier>{e9abe7cb-bbbf-4315-a9ab-285b52efa3b7}</UniqueIdentifier> - </Filter> <Filter Include="src\3rdparty\GLee"> <UniqueIdentifier>{43dc399e-6dc9-4997-9a64-130e48c1c041}</UniqueIdentifier> </Filter> @@ -37,9 +19,6 @@ <Filter Include="src\3rdparty\lua51"> <UniqueIdentifier>{5b7e6bcc-7957-4d7e-b660-d260726da1c9}</UniqueIdentifier> </Filter> - <Filter Include="src\libjin\fs"> - <UniqueIdentifier>{bb4a9832-a45a-445d-8199-80d3e97f9415}</UniqueIdentifier> - </Filter> <Filter Include="src\3rdparty\luax"> <UniqueIdentifier>{93b29ece-8318-4b20-a65d-2e79c1a2f816}</UniqueIdentifier> </Filter> @@ -94,48 +73,69 @@ <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\lua\joypad"> <UniqueIdentifier>{7fd81749-f776-4e5c-b6e2-33372a143560}</UniqueIdentifier> </Filter> - <Filter Include="src\libjin\common"> + <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> + <Filter Include="src\libjin\Common"> <UniqueIdentifier>{8222e176-beec-43ee-8604-3e6491dc45bb}</UniqueIdentifier> </Filter> - <Filter Include="src\libjin\debug"> + <Filter Include="src\libjin\Core"> + <UniqueIdentifier>{7467bc99-3a63-4b92-b3ab-b5a3d86ead1b}</UniqueIdentifier> + </Filter> + <Filter Include="src\libjin\Debug"> <UniqueIdentifier>{5087c206-df20-4380-b929-eb5b466d42b3}</UniqueIdentifier> </Filter> - <Filter Include="src\libjin\math"> - <UniqueIdentifier>{3c5d715c-d885-4af9-95db-3b1ca43cae58}</UniqueIdentifier> + <Filter Include="src\libjin\Filesystem"> + <UniqueIdentifier>{bb4a9832-a45a-445d-8199-80d3e97f9415}</UniqueIdentifier> </Filter> - <Filter Include="src\libjin\audio\sdl"> - <UniqueIdentifier>{14019a9d-eeaf-42be-b0ec-833217f3c131}</UniqueIdentifier> + <Filter Include="src\libjin\Input"> + <UniqueIdentifier>{14253521-dbe9-4289-b100-47b4deb41331}</UniqueIdentifier> </Filter> - <Filter Include="src\libjin\audio\openal"> - <UniqueIdentifier>{eb34937f-6278-4d8e-ad48-3c7a6dd6606c}</UniqueIdentifier> + <Filter Include="src\libjin\Math"> + <UniqueIdentifier>{3c5d715c-d885-4af9-95db-3b1ca43cae58}</UniqueIdentifier> </Filter> - <Filter Include="src\libjin\physics"> - <UniqueIdentifier>{3eded42e-5a27-433d-9b0a-c25190008be7}</UniqueIdentifier> + <Filter Include="src\libjin\Net"> + <UniqueIdentifier>{fe12237c-986f-42f3-86d9-1fe848e1e058}</UniqueIdentifier> </Filter> - <Filter Include="src\3rdparty\wav"> - <UniqueIdentifier>{6c9f6c64-12c5-4823-8662-daea544dba61}</UniqueIdentifier> + <Filter Include="src\libjin\Physics"> + <UniqueIdentifier>{3eded42e-5a27-433d-9b0a-c25190008be7}</UniqueIdentifier> </Filter> - <Filter Include="src\3rdparty\cmixer"> - <UniqueIdentifier>{9bd498bc-1624-44f5-8cb6-e2f98f5c0aca}</UniqueIdentifier> + <Filter Include="src\libjin\Render"> + <UniqueIdentifier>{23033979-4942-4f08-8a1d-ecc0dec442b5}</UniqueIdentifier> </Filter> - <Filter Include="src\libjin\thread"> + <Filter Include="src\libjin\Thread"> <UniqueIdentifier>{31ad905a-11d7-4a67-ab7a-66caa3ae54fc}</UniqueIdentifier> </Filter> - <Filter Include="src\libjin\ui"> - <UniqueIdentifier>{bdf3096e-923f-4c91-bafe-03cf47f25ff2}</UniqueIdentifier> + <Filter Include="src\libjin\Tilemap"> + <UniqueIdentifier>{be27da6f-98b1-4e99-ac75-c3116f1618de}</UniqueIdentifier> </Filter> - <Filter Include="src\libjin\tools"> + <Filter Include="src\libjin\Tools"> <UniqueIdentifier>{8fb29df7-e8de-4bce-944b-b8822e21f4c5}</UniqueIdentifier> </Filter> - <Filter Include="src\libjin\tools\EventMsgCenter"> + <Filter Include="src\libjin\Tools\EventMsgCenter"> <UniqueIdentifier>{f7c7c527-a154-4bfe-a3a9-d34a3828da58}</UniqueIdentifier> </Filter> + <Filter Include="src\libjin\UI"> + <UniqueIdentifier>{bdf3096e-923f-4c91-bafe-03cf47f25ff2}</UniqueIdentifier> + </Filter> + <Filter Include="src\libjin\Utils"> + <UniqueIdentifier>{e9abe7cb-bbbf-4315-a9ab-285b52efa3b7}</UniqueIdentifier> + </Filter> + <Filter Include="src\libjin\Audio\SDL"> + <UniqueIdentifier>{14019a9d-eeaf-42be-b0ec-833217f3c131}</UniqueIdentifier> + </Filter> + <Filter Include="src\libjin\Audio\OpenAL"> + <UniqueIdentifier>{eb34937f-6278-4d8e-ad48-3c7a6dd6606c}</UniqueIdentifier> + </Filter> </ItemGroup> <ItemGroup> <ClCompile Include="..\..\src\main.cpp"> @@ -240,39 +240,6 @@ <ClCompile Include="..\..\src\jinc.cpp"> <Filter>src</Filter> </ClCompile> - <ClCompile Include="..\..\src\libjin\render\canvas.cpp"> - <Filter>src\libjin\render</Filter> - </ClCompile> - <ClCompile Include="..\..\src\libjin\render\font.cpp"> - <Filter>src\libjin\render</Filter> - </ClCompile> - <ClCompile Include="..\..\src\libjin\render\graphics.cpp"> - <Filter>src\libjin\render</Filter> - </ClCompile> - <ClCompile Include="..\..\src\libjin\input\event.cpp"> - <Filter>src\libjin\input</Filter> - </ClCompile> - <ClCompile Include="..\..\src\libjin\input\mouse.cpp"> - <Filter>src\libjin\input</Filter> - </ClCompile> - <ClCompile Include="..\..\src\libjin\input\keyboard.cpp"> - <Filter>src\libjin\input</Filter> - </ClCompile> - <ClCompile Include="..\..\src\libjin\render\jsl.cpp"> - <Filter>src\libjin\render</Filter> - </ClCompile> - <ClCompile Include="..\..\src\libjin\render\window.cpp"> - <Filter>src\libjin\render</Filter> - </ClCompile> - <ClCompile Include="..\..\src\libjin\core\game.cpp"> - <Filter>src\libjin\core</Filter> - </ClCompile> - <ClCompile Include="..\..\src\libjin\render\drawable.cpp"> - <Filter>src\libjin\render</Filter> - </ClCompile> - <ClCompile Include="..\..\src\libjin\fs\filesystem.cpp"> - <Filter>src\libjin\fs</Filter> - </ClCompile> <ClCompile Include="..\..\src\3rdparty\smount\smount.c"> <Filter>src\3rdparty\smount</Filter> </ClCompile> @@ -327,65 +294,98 @@ <ClCompile Include="..\..\src\lua\thread\luaopen_Thread.cpp"> <Filter>src\lua\thread</Filter> </ClCompile> - <ClCompile Include="..\..\src\libjin\audio\source.cpp"> - <Filter>src\libjin\audio</Filter> - </ClCompile> <ClCompile Include="..\..\src\lua\joypad\luaopen_joypad.cpp"> <Filter>src\lua\joypad</Filter> </ClCompile> <ClCompile Include="..\..\src\lua\audio\luaopen_Source.cpp"> <Filter>src\lua\audio</Filter> </ClCompile> - <ClCompile Include="..\..\src\libjin\input\joypad.cpp"> - <Filter>src\libjin\input</Filter> + <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\utils\unittest.cpp"> - <Filter>src\libjin\utils</Filter> + <ClCompile Include="..\..\src\libjin\Audio\OpenAL\Audio.cpp"> + <Filter>src\libjin\Audio\OpenAL</Filter> </ClCompile> - <ClCompile Include="..\..\src\libjin\math\matrix.cpp"> - <Filter>src\libjin\math</Filter> + <ClCompile Include="..\..\src\libjin\Audio\OpenAL\Source.cpp"> + <Filter>src\libjin\Audio\OpenAL</Filter> </ClCompile> - <ClCompile Include="..\..\src\libjin\math\vector.cpp"> - <Filter>src\libjin\math</Filter> + <ClCompile Include="..\..\src\libjin\Audio\SDL\Audio.cpp"> + <Filter>src\libjin\Audio\SDL</Filter> </ClCompile> - <ClCompile Include="..\..\src\libjin\audio\sdl\audio.cpp"> - <Filter>src\libjin\audio\sdl</Filter> + <ClCompile Include="..\..\src\libjin\Audio\SDL\Source.cpp"> + <Filter>src\libjin\Audio\SDL</Filter> </ClCompile> - <ClCompile Include="..\..\src\libjin\audio\sdl\source.cpp"> - <Filter>src\libjin\audio\sdl</Filter> + <ClCompile Include="..\..\src\libjin\Audio\Audio.cpp"> + <Filter>src\libjin\Audio</Filter> </ClCompile> - <ClCompile Include="..\..\src\libjin\audio\audio.cpp"> - <Filter>src\libjin\audio</Filter> + <ClCompile Include="..\..\src\libjin\Audio\Source.cpp"> + <Filter>src\libjin\Audio</Filter> </ClCompile> - <ClCompile Include="..\..\src\libjin\core\timer.cpp"> - <Filter>src\libjin\core</Filter> + <ClCompile Include="..\..\src\libjin\Core\Game.cpp"> + <Filter>src\libjin\Core</Filter> </ClCompile> - <ClCompile Include="..\..\src\libjin\core\thread.cpp"> - <Filter>src\libjin\core</Filter> + <ClCompile Include="..\..\src\libjin\Core\Thread.cpp"> + <Filter>src\libjin\Core</Filter> </ClCompile> - <ClCompile Include="..\..\src\libjin\audio\openal\audio.cpp"> - <Filter>src\libjin\audio\openal</Filter> + <ClCompile Include="..\..\src\libjin\Core\Timer.cpp"> + <Filter>src\libjin\Core</Filter> </ClCompile> - <ClCompile Include="..\..\src\libjin\audio\openal\source.cpp"> - <Filter>src\libjin\audio\openal</Filter> + <ClCompile Include="..\..\src\libjin\Filesystem\Filesystem.cpp"> + <Filter>src\libjin\Filesystem</Filter> </ClCompile> - <ClCompile Include="..\..\src\3rdparty\wav\wav.c"> - <Filter>src\3rdparty\wav</Filter> + <ClCompile Include="..\..\src\libjin\Input\Event.cpp"> + <Filter>src\libjin\Input</Filter> </ClCompile> - <ClCompile Include="..\..\src\3rdparty\cmixer\cmixer.c"> - <Filter>src\3rdparty\cmixer</Filter> + <ClCompile Include="..\..\src\libjin\Input\Joypad.cpp"> + <Filter>src\libjin\Input</Filter> + </ClCompile> + <ClCompile Include="..\..\src\libjin\Input\Keyboard.cpp"> + <Filter>src\libjin\Input</Filter> + </ClCompile> + <ClCompile Include="..\..\src\libjin\Input\Mouse.cpp"> + <Filter>src\libjin\Input</Filter> + </ClCompile> + <ClCompile Include="..\..\src\libjin\Math\Matrix.cpp"> + <Filter>src\libjin\Math</Filter> </ClCompile> - <ClCompile Include="..\..\src\libjin\utils\log.cpp"> - <Filter>src\libjin\utils</Filter> + <ClCompile Include="..\..\src\libjin\Math\Vector.cpp"> + <Filter>src\libjin\Math</Filter> </ClCompile> - <ClCompile Include="..\..\src\libjin\render\texture.cpp"> - <Filter>src\libjin\render</Filter> + <ClCompile Include="..\..\src\libjin\Net\Net.cpp"> + <Filter>src\libjin\Net</Filter> </ClCompile> - <ClCompile Include="..\..\src\libjin\thread\thread.cpp"> - <Filter>src\libjin\thread</Filter> + <ClCompile Include="..\..\src\libjin\Render\Canvas.cpp"> + <Filter>src\libjin\Render</Filter> </ClCompile> - <ClCompile Include="..\..\src\libjin\net\net.cpp"> - <Filter>src\libjin\net</Filter> + <ClCompile Include="..\..\src\libjin\Render\Drawable.cpp"> + <Filter>src\libjin\Render</Filter> + </ClCompile> + <ClCompile Include="..\..\src\libjin\Render\Font.cpp"> + <Filter>src\libjin\Render</Filter> + </ClCompile> + <ClCompile Include="..\..\src\libjin\Render\Graphics.cpp"> + <Filter>src\libjin\Render</Filter> + </ClCompile> + <ClCompile Include="..\..\src\libjin\Render\JSL.cpp"> + <Filter>src\libjin\Render</Filter> + </ClCompile> + <ClCompile Include="..\..\src\libjin\Render\Texture.cpp"> + <Filter>src\libjin\Render</Filter> + </ClCompile> + <ClCompile Include="..\..\src\libjin\Render\Window.cpp"> + <Filter>src\libjin\Render</Filter> + </ClCompile> + <ClCompile Include="..\..\src\libjin\Thread\Thread.cpp"> + <Filter>src\libjin\Thread</Filter> + </ClCompile> + <ClCompile Include="..\..\src\libjin\Utils\Log.cpp"> + <Filter>src\libjin\Utils</Filter> + </ClCompile> + <ClCompile Include="..\..\src\libjin\Utils\unittest.cpp"> + <Filter>src\libjin\Utils</Filter> </ClCompile> </ItemGroup> <ItemGroup> @@ -464,54 +464,15 @@ <ClInclude Include="..\..\src\3rdparty\stb\stb_image.h"> <Filter>src\3rdparty\stb</Filter> </ClInclude> - <ClInclude Include="..\..\src\libjin\render\canvas.h"> - <Filter>src\libjin\render</Filter> - </ClInclude> - <ClInclude Include="..\..\src\libjin\render\color.h"> - <Filter>src\libjin\render</Filter> - </ClInclude> - <ClInclude Include="..\..\src\libjin\render\drawable.h"> - <Filter>src\libjin\render</Filter> - </ClInclude> - <ClInclude Include="..\..\src\libjin\render\graphics.h"> - <Filter>src\libjin\render</Filter> - </ClInclude> - <ClInclude Include="..\..\src\libjin\input\event.h"> - <Filter>src\libjin\input</Filter> - </ClInclude> - <ClInclude Include="..\..\src\libjin\input\mouse.h"> - <Filter>src\libjin\input</Filter> - </ClInclude> - <ClInclude Include="..\..\src\libjin\input\keyboard.h"> - <Filter>src\libjin\input</Filter> - </ClInclude> - <ClInclude Include="..\..\src\libjin\render\jsl.h"> - <Filter>src\libjin\render</Filter> - </ClInclude> - <ClInclude Include="..\..\src\libjin\render\font.h"> - <Filter>src\libjin\render</Filter> - </ClInclude> <ClInclude Include="..\..\src\3rdparty\stb\stb_truetype.h"> <Filter>src\3rdparty\stb</Filter> </ClInclude> - <ClInclude Include="..\..\src\libjin\utils\utils.h"> - <Filter>src\libjin\utils</Filter> - </ClInclude> <ClInclude Include="..\..\src\3rdparty\lua51\luax.h"> <Filter>src\3rdparty\lua51</Filter> </ClInclude> <ClInclude Include="..\..\src\3rdparty\luax\luax.h"> <Filter>src\3rdparty\luax</Filter> </ClInclude> - <ClInclude Include="..\..\src\libjin\render\window.h"> - <Filter>src\libjin\render</Filter> - </ClInclude> - <ClInclude Include="..\..\src\libjin\core\game.h"> - <Filter>src\libjin\core</Filter> - </ClInclude> - <ClInclude Include="..\..\src\libjin\utils\endian.h"> - <Filter>src\libjin\utils</Filter> - </ClInclude> <ClInclude Include="..\..\src\lua\embed\debug.lua.h"> <Filter>src\lua\embed</Filter> </ClInclude> @@ -533,24 +494,12 @@ <ClInclude Include="..\..\src\lua\embed\path.lua.h"> <Filter>src\lua\embed</Filter> </ClInclude> - <ClInclude Include="..\..\src\libjin\fs\buffer.h"> - <Filter>src\libjin\fs</Filter> - </ClInclude> - <ClInclude Include="..\..\src\libjin\fs\filesystem.h"> - <Filter>src\libjin\fs</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\libjin\audio\audio.h"> - <Filter>src\libjin\audio</Filter> - </ClInclude> - <ClInclude Include="..\..\src\libjin\net\net.h"> - <Filter>src\libjin\net</Filter> - </ClInclude> <ClInclude Include="..\..\src\3rdparty\tekcos\tekcos.h"> <Filter>src\3rdparty\tekcos</Filter> </ClInclude> @@ -560,122 +509,173 @@ <ClInclude Include="..\..\src\lua\luaopen_types.h"> <Filter>src\lua</Filter> </ClInclude> - <ClInclude Include="..\..\src\libjin\utils\macros.h"> - <Filter>src\libjin\utils</Filter> - </ClInclude> <ClInclude Include="..\..\src\libjin\jin.h"> <Filter>src\libjin</Filter> </ClInclude> - <ClInclude Include="..\..\src\libjin\render\render.h"> - <Filter>src\libjin\render</Filter> - </ClInclude> - <ClInclude Include="..\..\src\libjin\input\input.h"> - <Filter>src\libjin\input</Filter> - </ClInclude> - <ClInclude Include="..\..\src\libjin\fs\fs.h"> - <Filter>src\libjin\fs</Filter> - </ClInclude> - <ClInclude Include="..\..\src\libjin\core\core.h"> - <Filter>src\libjin\core</Filter> - </ClInclude> <ClInclude Include="..\..\src\data\font.ttf.h"> <Filter>src\data</Filter> </ClInclude> <ClInclude Include="..\..\src\data\icon.png.h"> <Filter>src\data</Filter> </ClInclude> - <ClInclude Include="..\..\src\libjin\audio\source.h"> - <Filter>src\libjin\audio</Filter> + <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\tilemap\tilemap.h"> - <Filter>src\libjin\tilemap</Filter> + <ClInclude Include="..\..\src\libjin\modules.h"> + <Filter>src\libjin</Filter> </ClInclude> - <ClInclude Include="..\..\src\libjin\common\subsystem.h"> - <Filter>src\libjin\common</Filter> + <ClInclude Include="..\..\src\libjin\tools\EventMsgCenter\EventMsgCenter.h"> + <Filter>src\libjin\Tools\EventMsgCenter</Filter> </ClInclude> - <ClInclude Include="..\..\src\libjin\math\math.h"> - <Filter>src\libjin\math</Filter> + <ClInclude Include="..\..\src\libjin\Audio\OpenAL\Audio.h"> + <Filter>src\libjin\Audio\OpenAL</Filter> </ClInclude> - <ClInclude Include="..\..\src\libjin\math\matrix.h"> - <Filter>src\libjin\math</Filter> + <ClInclude Include="..\..\src\libjin\Audio\OpenAL\Source.h"> + <Filter>src\libjin\Audio\OpenAL</Filter> </ClInclude> - <ClInclude Include="..\..\src\libjin\debug\debug.h"> - <Filter>src\libjin\debug</Filter> + <ClInclude Include="..\..\src\libjin\Audio\SDL\Audio.h"> + <Filter>src\libjin\Audio\SDL</Filter> </ClInclude> - <ClInclude Include="..\..\src\libjin\debug\log.h"> - <Filter>src\libjin\debug</Filter> + <ClInclude Include="..\..\src\libjin\Audio\SDL\Source.h"> + <Filter>src\libjin\Audio\SDL</Filter> </ClInclude> - <ClInclude Include="..\..\src\libjin\math\quad.h"> - <Filter>src\libjin\math</Filter> + <ClInclude Include="..\..\src\libjin\Audio\Audio.h"> + <Filter>src\libjin\Audio</Filter> </ClInclude> - <ClInclude Include="..\..\src\libjin\math\constant.h"> - <Filter>src\libjin\math</Filter> + <ClInclude Include="..\..\src\libjin\Audio\Source.h"> + <Filter>src\libjin\Audio</Filter> </ClInclude> - <ClInclude Include="..\..\src\libjin\math\vector.h"> - <Filter>src\libjin\math</Filter> + <ClInclude Include="..\..\src\libjin\Common\Data.h"> + <Filter>src\libjin\Common</Filter> </ClInclude> - <ClInclude Include="..\..\src\libjin\audio\sdl\audio.h"> - <Filter>src\libjin\audio\sdl</Filter> + <ClInclude Include="..\..\src\libjin\Common\Singleton.h"> + <Filter>src\libjin\Common</Filter> </ClInclude> - <ClInclude Include="..\..\src\libjin\audio\sdl\source.h"> - <Filter>src\libjin\audio\sdl</Filter> + <ClInclude Include="..\..\src\libjin\Common\Subsystem.h"> + <Filter>src\libjin\Common</Filter> </ClInclude> - <ClInclude Include="..\..\src\libjin\physics\physics.h"> - <Filter>src\libjin\physics</Filter> + <ClInclude Include="..\..\src\libjin\Core\Game.h"> + <Filter>src\libjin\Core</Filter> </ClInclude> - <ClInclude Include="..\..\src\libjin\core\timer.h"> - <Filter>src\libjin\core</Filter> + <ClInclude Include="..\..\src\libjin\Core\Core.h"> + <Filter>src\libjin\Core</Filter> </ClInclude> - <ClInclude Include="..\..\src\libjin\core\thread.h"> - <Filter>src\libjin\core</Filter> + <ClInclude Include="..\..\src\libjin\Core\Thread.h"> + <Filter>src\libjin\Core</Filter> </ClInclude> - <ClInclude Include="..\..\src\lua\luax.h"> - <Filter>src\lua</Filter> + <ClInclude Include="..\..\src\libjin\Core\Timer.h"> + <Filter>src\libjin\Core</Filter> </ClInclude> - <ClInclude Include="..\..\src\libjin\input\joypad.h"> - <Filter>src\libjin\input</Filter> + <ClInclude Include="..\..\src\libjin\Debug\Debug.h"> + <Filter>src\libjin\Debug</Filter> </ClInclude> - <ClInclude Include="..\..\src\libjin\audio\openal\audio.h"> - <Filter>src\libjin\audio\openal</Filter> + <ClInclude Include="..\..\src\libjin\Debug\Log.h"> + <Filter>src\libjin\Debug</Filter> </ClInclude> - <ClInclude Include="..\..\src\libjin\audio\openal\source.h"> - <Filter>src\libjin\audio\openal</Filter> + <ClInclude Include="..\..\src\libjin\Filesystem\Buffer.h"> + <Filter>src\libjin\Filesystem</Filter> </ClInclude> - <ClInclude Include="..\..\src\3rdparty\wav\wav.h"> - <Filter>src\3rdparty\wav</Filter> + <ClInclude Include="..\..\src\libjin\Filesystem\dirent.h"> + <Filter>src\libjin\Filesystem</Filter> </ClInclude> - <ClInclude Include="..\..\src\libjin\common\data.h"> - <Filter>src\libjin\common</Filter> + <ClInclude Include="..\..\src\libjin\Filesystem\Filesystem.h"> + <Filter>src\libjin\Filesystem</Filter> </ClInclude> - <ClInclude Include="..\..\src\libjin\physics\rigid.h"> - <Filter>src\libjin\physics</Filter> + <ClInclude Include="..\..\src\libjin\Input\Event.h"> + <Filter>src\libjin\Input</Filter> </ClInclude> - <ClInclude Include="..\..\src\3rdparty\cmixer\cmixer.h"> - <Filter>src\3rdparty\cmixer</Filter> + <ClInclude Include="..\..\src\libjin\Input\Input.h"> + <Filter>src\libjin\Input</Filter> </ClInclude> - <ClInclude Include="..\..\src\3rdparty\cmixer\cmixer_stb_vorbis.h"> - <Filter>src\3rdparty\cmixer</Filter> + <ClInclude Include="..\..\src\libjin\Input\Joypad.h"> + <Filter>src\libjin\Input</Filter> </ClInclude> - <ClInclude Include="..\..\src\libjin\common\singleton.h"> - <Filter>src\libjin\common</Filter> + <ClInclude Include="..\..\src\libjin\Input\Keyboard.h"> + <Filter>src\libjin\Input</Filter> </ClInclude> - <ClInclude Include="..\..\src\libjin\utils\log.h"> - <Filter>src\libjin\utils</Filter> + <ClInclude Include="..\..\src\libjin\Input\Mouse.h"> + <Filter>src\libjin\Input</Filter> </ClInclude> - <ClInclude Include="..\..\src\libjin\render\texture.h"> - <Filter>src\libjin\render</Filter> + <ClInclude Include="..\..\src\libjin\Math\constant.h"> + <Filter>src\libjin\Math</Filter> </ClInclude> - <ClInclude Include="..\..\src\libjin\thread\thread.h"> - <Filter>src\libjin\thread</Filter> + <ClInclude Include="..\..\src\libjin\Math\Math.h"> + <Filter>src\libjin\Math</Filter> </ClInclude> - <ClInclude Include="..\..\src\libjin\ui\ui.h"> - <Filter>src\libjin\ui</Filter> + <ClInclude Include="..\..\src\libjin\Math\Matrix.h"> + <Filter>src\libjin\Math</Filter> </ClInclude> - <ClInclude Include="..\..\src\libjin\modules.h"> - <Filter>src\libjin</Filter> + <ClInclude Include="..\..\src\libjin\Math\Quad.h"> + <Filter>src\libjin\Math</Filter> </ClInclude> - <ClInclude Include="..\..\src\libjin\tools\EventMsgCenter\EventMsgCenter.h"> - <Filter>src\libjin\tools\EventMsgCenter</Filter> + <ClInclude Include="..\..\src\libjin\Math\Vector.h"> + <Filter>src\libjin\Math</Filter> + </ClInclude> + <ClInclude Include="..\..\src\libjin\Net\Net.h"> + <Filter>src\libjin\Net</Filter> + </ClInclude> + <ClInclude Include="..\..\src\libjin\Physics\Physics.h"> + <Filter>src\libjin\Physics</Filter> + </ClInclude> + <ClInclude Include="..\..\src\libjin\Physics\Rigid.h"> + <Filter>src\libjin\Physics</Filter> + </ClInclude> + <ClInclude Include="..\..\src\libjin\Render\Canvas.h"> + <Filter>src\libjin\Render</Filter> + </ClInclude> + <ClInclude Include="..\..\src\libjin\Render\Color.h"> + <Filter>src\libjin\Render</Filter> + </ClInclude> + <ClInclude Include="..\..\src\libjin\Render\Drawable.h"> + <Filter>src\libjin\Render</Filter> + </ClInclude> + <ClInclude Include="..\..\src\libjin\Render\Font.h"> + <Filter>src\libjin\Render</Filter> + </ClInclude> + <ClInclude Include="..\..\src\libjin\Render\Graphics.h"> + <Filter>src\libjin\Render</Filter> + </ClInclude> + <ClInclude Include="..\..\src\libjin\Render\JSL.h"> + <Filter>src\libjin\Render</Filter> + </ClInclude> + <ClInclude Include="..\..\src\libjin\Render\Render.h"> + <Filter>src\libjin\Render</Filter> + </ClInclude> + <ClInclude Include="..\..\src\libjin\Render\Texture.h"> + <Filter>src\libjin\Render</Filter> + </ClInclude> + <ClInclude Include="..\..\src\libjin\Render\Window.h"> + <Filter>src\libjin\Render</Filter> + </ClInclude> + <ClInclude Include="..\..\src\libjin\Thread\Thread.h"> + <Filter>src\libjin\Thread</Filter> + </ClInclude> + <ClInclude Include="..\..\src\libjin\Tilemap\Tilemap.h"> + <Filter>src\libjin\Tilemap</Filter> + </ClInclude> + <ClInclude Include="..\..\src\libjin\UI\UI.h"> + <Filter>src\libjin\UI</Filter> + </ClInclude> + <ClInclude Include="..\..\src\libjin\Utils\endian.h"> + <Filter>src\libjin\Utils</Filter> + </ClInclude> + <ClInclude Include="..\..\src\libjin\Utils\Log.h"> + <Filter>src\libjin\Utils</Filter> + </ClInclude> + <ClInclude Include="..\..\src\libjin\Utils\macros.h"> + <Filter>src\libjin\Utils</Filter> + </ClInclude> + <ClInclude Include="..\..\src\libjin\Utils\utils.h"> + <Filter>src\libjin\Utils</Filter> </ClInclude> </ItemGroup> <ItemGroup> diff --git a/src/libjin/fs/buffer.h b/src/libjin/Filesystem/Buffer.h index 7571c2d..7571c2d 100644 --- a/src/libjin/fs/buffer.h +++ b/src/libjin/Filesystem/Buffer.h diff --git a/src/libjin/fs/filesystem.cpp b/src/libjin/Filesystem/Filesystem.cpp index af94034..af94034 100644 --- a/src/libjin/fs/filesystem.cpp +++ b/src/libjin/Filesystem/Filesystem.cpp diff --git a/src/libjin/fs/filesystem.h b/src/libjin/Filesystem/Filesystem.h index 15f0b9f..15f0b9f 100644 --- a/src/libjin/fs/filesystem.h +++ b/src/libjin/Filesystem/Filesystem.h diff --git a/src/libjin/fs/dirent.h b/src/libjin/Filesystem/dirent.h index 832b164..832b164 100644 --- a/src/libjin/fs/dirent.h +++ b/src/libjin/Filesystem/dirent.h diff --git a/src/libjin/fs/fs.h b/src/libjin/fs/fs.h deleted file mode 100644 index 6fbf33f..0000000 --- a/src/libjin/fs/fs.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef __JIN_FS_H -#define __JIN_FS_H - -#include "buffer.h" -#include "filesystem.h" - -#endif
\ No newline at end of file diff --git a/src/libjin/jin.h b/src/libjin/jin.h index 32c04c7..b1a1725 100644 --- a/src/libjin/jin.h +++ b/src/libjin/jin.h @@ -4,7 +4,7 @@ #include "utils/utils.h" #include "audio/audio.h" #include "core/core.h" -#include "fs/fs.h" +#include "Filesystem/Filesystem.h" #include "input/input.h" #include "net/net.h" #include "render/render.h" diff --git a/src/libjin/modules.h b/src/libjin/modules.h index 84db013..b26c50d 100644 --- a/src/libjin/modules.h +++ b/src/libjin/modules.h @@ -4,7 +4,7 @@ * ģģı룬Ҫģ鲻 */ -#define JIN_MODULES_AUDIO 1 +#define JIN_MODULES_AUDIO 0 #define JIN_AUDIO_SDLAUDIO 1 #define JIN_AUDIO_OPENAL 1 |