diff options
Diffstat (limited to 'build')
-rw-r--r-- | build/vc++/jin.vcxproj | 11 | ||||
-rw-r--r-- | build/vc++/jin.vcxproj.filters | 167 | ||||
-rw-r--r-- | build/vc++/libjin/libjin.vcxproj | 4 | ||||
-rw-r--r-- | build/vc++/libjin/libjin.vcxproj.filters | 12 |
4 files changed, 99 insertions, 95 deletions
diff --git a/build/vc++/jin.vcxproj b/build/vc++/jin.vcxproj index e830a09..6e5bfc7 100644 --- a/build/vc++/jin.vcxproj +++ b/build/vc++/jin.vcxproj @@ -143,6 +143,7 @@ </Link> </ItemDefinitionGroup> <ItemGroup> + <ClCompile Include="..\..\src\lua\common\je_lua_port.h" /> <ClCompile Include="..\..\src\lua\jin.cpp" /> <ClCompile Include="..\..\src\lua\main.cpp" /> <ClCompile Include="..\..\src\lua\modules\audio\je_lua_audio.cpp" /> @@ -174,11 +175,11 @@ <ClCompile Include="..\..\src\lua\modules\time\je_lua_time.cpp" /> </ItemGroup> <ItemGroup> - <ClInclude Include="..\..\src\lua\common\common.h" /> - <ClInclude Include="..\..\src\lua\common\constant.h" /> - <ClInclude Include="..\..\src\lua\common\error.h" /> - <ClInclude Include="..\..\src\lua\common\Proxy.h" /> - <ClInclude Include="..\..\src\lua\common\Reference.hpp" /> + <ClInclude Include="..\..\src\lua\common\je_lua_common.h" /> + <ClInclude Include="..\..\src\lua\common\je_lua_constant.h" /> + <ClInclude Include="..\..\src\lua\common\je_lua_error.h" /> + <ClInclude Include="..\..\src\lua\common\je_lua_proxy.h" /> + <ClInclude Include="..\..\src\lua\common\je_lua_reference.hpp" /> <ClInclude Include="..\..\src\lua\embed\boot.lua.h" /> <ClInclude Include="..\..\src\lua\embed\embed.h" /> <ClInclude Include="..\..\src\lua\embed\graphics.lua.h" /> diff --git a/build/vc++/jin.vcxproj.filters b/build/vc++/jin.vcxproj.filters index 825d718..21900ed 100644 --- a/build/vc++/jin.vcxproj.filters +++ b/build/vc++/jin.vcxproj.filters @@ -1,232 +1,235 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> - <Filter Include="src"> + <Filter Include="source"> <UniqueIdentifier>{f3e85b81-1688-49e4-b85c-65d99ddafad9}</UniqueIdentifier> </Filter> - <Filter Include="res"> - <UniqueIdentifier>{579f12b8-5758-4be5-9cd7-e1fa62fdef74}</UniqueIdentifier> - </Filter> - <Filter Include="src\common"> + <Filter Include="source\common"> <UniqueIdentifier>{2264d908-20ee-41c2-8bdc-bc1117959c4f}</UniqueIdentifier> </Filter> - <Filter Include="src\libraries"> + <Filter Include="source\libraries"> <UniqueIdentifier>{269451af-b8e9-451f-940a-9b679e6116d3}</UniqueIdentifier> </Filter> - <Filter Include="src\libraries\luax"> + <Filter Include="source\libraries\luax"> <UniqueIdentifier>{93b29ece-8318-4b20-a65d-2e79c1a2f816}</UniqueIdentifier> </Filter> - <Filter Include="src\modules"> + <Filter Include="source\modules"> <UniqueIdentifier>{923b475a-00e2-4b8f-925a-ca1e5f9b4689}</UniqueIdentifier> </Filter> - <Filter Include="src\modules\thread"> + <Filter Include="source\modules\thread"> <UniqueIdentifier>{7957774a-4f34-4255-ab2e-8da9b6c71983}</UniqueIdentifier> </Filter> - <Filter Include="src\modules\time"> + <Filter Include="source\modules\time"> <UniqueIdentifier>{ee920041-8798-4827-be04-49f9342ba092}</UniqueIdentifier> </Filter> - <Filter Include="src\modules\net"> + <Filter Include="source\modules\net"> <UniqueIdentifier>{6b79b5bf-69c1-458c-81f3-b386b340d39b}</UniqueIdentifier> </Filter> - <Filter Include="src\modules\audio"> + <Filter Include="source\modules\audio"> <UniqueIdentifier>{4eb54d6d-e336-42f6-8670-d271a458eb56}</UniqueIdentifier> </Filter> - <Filter Include="src\modules\bit"> + <Filter Include="source\modules\bit"> <UniqueIdentifier>{b042ed61-32e5-4e86-b4f3-1a293de8918d}</UniqueIdentifier> </Filter> - <Filter Include="src\modules\core"> + <Filter Include="source\modules\core"> <UniqueIdentifier>{b13ee8dc-41fc-42b3-8b64-f9c261ebfc73}</UniqueIdentifier> </Filter> - <Filter Include="src\modules\event"> + <Filter Include="source\modules\event"> <UniqueIdentifier>{8a740640-925a-4cf6-94d5-89283824a141}</UniqueIdentifier> </Filter> - <Filter Include="src\modules\filesystem"> + <Filter Include="source\modules\filesystem"> <UniqueIdentifier>{563ed6fb-3d82-4905-b128-835f3818cc4f}</UniqueIdentifier> </Filter> - <Filter Include="src\modules\graphics"> + <Filter Include="source\modules\graphics"> <UniqueIdentifier>{1ed523c3-e203-487f-a13f-a35396f814f3}</UniqueIdentifier> </Filter> - <Filter Include="src\modules\joypad"> + <Filter Include="source\modules\joypad"> <UniqueIdentifier>{7fd81749-f776-4e5c-b6e2-33372a143560}</UniqueIdentifier> </Filter> - <Filter Include="src\modules\keyboard"> + <Filter Include="source\modules\keyboard"> <UniqueIdentifier>{2a701538-aeee-4f48-a285-0b848c9a3b81}</UniqueIdentifier> </Filter> - <Filter Include="src\modules\math"> + <Filter Include="source\modules\math"> <UniqueIdentifier>{98c4385b-893c-4d60-bb82-2a19ee5ff527}</UniqueIdentifier> </Filter> - <Filter Include="src\modules\mouse"> + <Filter Include="source\modules\mouse"> <UniqueIdentifier>{5b69329e-0aa2-4c77-be52-69c09fdbac65}</UniqueIdentifier> </Filter> - <Filter Include="src\resources"> + <Filter Include="source\resources"> <UniqueIdentifier>{0340fbad-0c07-4923-afd2-183424c70967}</UniqueIdentifier> </Filter> - <Filter Include="src\embed"> + <Filter Include="source\embed"> <UniqueIdentifier>{9cf92f3f-bcc5-442b-aa92-c88eeb1c5e45}</UniqueIdentifier> </Filter> + <Filter Include="resource"> + <UniqueIdentifier>{579f12b8-5758-4be5-9cd7-e1fa62fdef74}</UniqueIdentifier> + </Filter> </ItemGroup> <ItemGroup> <ClCompile Include="..\..\src\lua\jin.cpp"> - <Filter>src</Filter> + <Filter>source</Filter> </ClCompile> <ClCompile Include="..\..\src\lua\main.cpp"> - <Filter>src</Filter> + <Filter>source</Filter> </ClCompile> <ClCompile Include="..\..\src\lua\modules\graphics\je_lua_sprite.cpp"> - <Filter>src\modules\graphics</Filter> + <Filter>source\modules\graphics</Filter> </ClCompile> <ClCompile Include="..\..\src\lua\modules\graphics\je_lua_graphics.cpp"> - <Filter>src\modules\graphics</Filter> + <Filter>source\modules\graphics</Filter> </ClCompile> <ClCompile Include="..\..\src\lua\modules\graphics\je_lua_page.cpp"> - <Filter>src\modules\graphics</Filter> + <Filter>source\modules\graphics</Filter> </ClCompile> <ClCompile Include="..\..\src\lua\modules\graphics\je_lua_shader.cpp"> - <Filter>src\modules\graphics</Filter> + <Filter>source\modules\graphics</Filter> </ClCompile> <ClCompile Include="..\..\src\lua\modules\graphics\je_lua_text.cpp"> - <Filter>src\modules\graphics</Filter> + <Filter>source\modules\graphics</Filter> </ClCompile> <ClCompile Include="..\..\src\lua\modules\graphics\je_lua_texture.cpp"> - <Filter>src\modules\graphics</Filter> + <Filter>source\modules\graphics</Filter> </ClCompile> <ClCompile Include="..\..\src\lua\modules\graphics\je_lua_texture_font.cpp"> - <Filter>src\modules\graphics</Filter> + <Filter>source\modules\graphics</Filter> </ClCompile> <ClCompile Include="..\..\src\lua\modules\graphics\je_lua_ttf.cpp"> - <Filter>src\modules\graphics</Filter> + <Filter>source\modules\graphics</Filter> </ClCompile> <ClCompile Include="..\..\src\lua\modules\graphics\je_lua_ttf_data.cpp"> - <Filter>src\modules\graphics</Filter> + <Filter>source\modules\graphics</Filter> </ClCompile> <ClCompile Include="..\..\src\lua\modules\graphics\je_lua_canvas.cpp"> - <Filter>src\modules\graphics</Filter> + <Filter>source\modules\graphics</Filter> </ClCompile> <ClCompile Include="..\..\src\lua\modules\graphics\je_lua_bitmap.cpp"> - <Filter>src\modules\graphics</Filter> + <Filter>source\modules\graphics</Filter> </ClCompile> <ClCompile Include="..\..\src\lua\modules\audio\je_lua_audio.cpp"> - <Filter>src\modules\audio</Filter> + <Filter>source\modules\audio</Filter> </ClCompile> <ClCompile Include="..\..\src\lua\modules\audio\je_lua_source.cpp"> - <Filter>src\modules\audio</Filter> + <Filter>source\modules\audio</Filter> </ClCompile> <ClCompile Include="..\..\src\lua\modules\bit\je_lua_bit.cpp"> - <Filter>src\modules\bit</Filter> + <Filter>source\modules\bit</Filter> </ClCompile> <ClCompile Include="..\..\src\lua\modules\core\je_lua_core.cpp"> - <Filter>src\modules\core</Filter> + <Filter>source\modules\core</Filter> </ClCompile> <ClCompile Include="..\..\src\lua\modules\event\je_lua_event.cpp"> - <Filter>src\modules\event</Filter> + <Filter>source\modules\event</Filter> </ClCompile> <ClCompile Include="..\..\src\lua\modules\filesystem\je_lua_filesystem.cpp"> - <Filter>src\modules\filesystem</Filter> + <Filter>source\modules\filesystem</Filter> </ClCompile> <ClCompile Include="..\..\src\lua\modules\joypad\je_lua_joypad.cpp"> - <Filter>src\modules\joypad</Filter> + <Filter>source\modules\joypad</Filter> </ClCompile> <ClCompile Include="..\..\src\lua\modules\keyboard\je_lua_keyboard.cpp"> - <Filter>src\modules\keyboard</Filter> + <Filter>source\modules\keyboard</Filter> </ClCompile> <ClCompile Include="..\..\src\lua\modules\math\je_lua_math.cpp"> - <Filter>src\modules\math</Filter> + <Filter>source\modules\math</Filter> </ClCompile> <ClCompile Include="..\..\src\lua\modules\mouse\je_lua_mouse.cpp"> - <Filter>src\modules\mouse</Filter> + <Filter>source\modules\mouse</Filter> </ClCompile> <ClCompile Include="..\..\src\lua\modules\net\je_lua_buffer.cpp"> - <Filter>src\modules\net</Filter> + <Filter>source\modules\net</Filter> </ClCompile> <ClCompile Include="..\..\src\lua\modules\net\je_lua_net.cpp"> - <Filter>src\modules\net</Filter> + <Filter>source\modules\net</Filter> </ClCompile> <ClCompile Include="..\..\src\lua\modules\net\je_lua_socket.cpp"> - <Filter>src\modules\net</Filter> + <Filter>source\modules\net</Filter> </ClCompile> <ClCompile Include="..\..\src\lua\modules\thread\je_lua_thread.cpp"> - <Filter>src\modules\thread</Filter> + <Filter>source\modules\thread</Filter> </ClCompile> <ClCompile Include="..\..\src\lua\modules\time\je_lua_time.cpp"> - <Filter>src\modules\time</Filter> + <Filter>source\modules\time</Filter> </ClCompile> <ClCompile Include="..\..\src\lua\modules\graphics\je_lua_particle_system.cpp"> - <Filter>src\modules\graphics</Filter> + <Filter>source\modules\graphics</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lua\common\je_lua_port.h"> + <Filter>source\common</Filter> </ClCompile> </ItemGroup> <ItemGroup> <ClInclude Include="resource.h"> - <Filter>res</Filter> - </ClInclude> - <ClInclude Include="..\..\src\lua\common\common.h"> - <Filter>src\common</Filter> - </ClInclude> - <ClInclude Include="..\..\src\lua\common\constant.h"> - <Filter>src\common</Filter> + <Filter>resource</Filter> </ClInclude> <ClInclude Include="..\..\src\lua\libraries\luax\luax.h"> - <Filter>src\libraries\luax</Filter> + <Filter>source\libraries\luax</Filter> </ClInclude> <ClInclude Include="..\..\src\lua\resources\font.ttf.h"> - <Filter>src\resources</Filter> + <Filter>source\resources</Filter> </ClInclude> <ClInclude Include="..\..\src\lua\modules\luax.h"> - <Filter>src\modules</Filter> + <Filter>source\modules</Filter> </ClInclude> <ClInclude Include="..\..\src\lua\embed\boot.lua.h"> - <Filter>src\embed</Filter> + <Filter>source\embed</Filter> </ClInclude> <ClInclude Include="..\..\src\lua\embed\embed.h"> - <Filter>src\embed</Filter> + <Filter>source\embed</Filter> </ClInclude> <ClInclude Include="..\..\src\lua\embed\graphics.lua.h"> - <Filter>src\embed</Filter> + <Filter>source\embed</Filter> </ClInclude> <ClInclude Include="..\..\src\lua\embed\keyboard.lua.h"> - <Filter>src\embed</Filter> + <Filter>source\embed</Filter> </ClInclude> <ClInclude Include="..\..\src\lua\embed\mouse.lua.h"> - <Filter>src\embed</Filter> + <Filter>source\embed</Filter> </ClInclude> <ClInclude Include="..\..\src\lua\embed\net.lua.h"> - <Filter>src\embed</Filter> + <Filter>source\embed</Filter> </ClInclude> <ClInclude Include="..\..\src\lua\embed\path.lua.h"> - <Filter>src\embed</Filter> + <Filter>source\embed</Filter> </ClInclude> <ClInclude Include="..\..\src\lua\jin.h"> - <Filter>src</Filter> + <Filter>source</Filter> </ClInclude> <ClInclude Include="..\..\src\lua\luax.h"> - <Filter>src</Filter> + <Filter>source</Filter> </ClInclude> <ClInclude Include="..\..\src\lua\modules\net\je_lua_buffer.h"> - <Filter>src\modules\net</Filter> + <Filter>source\modules\net</Filter> </ClInclude> <ClInclude Include="..\..\src\lua\modules\thread\je_lua_thread.h"> - <Filter>src\modules\thread</Filter> + <Filter>source\modules\thread</Filter> </ClInclude> <ClInclude Include="..\..\src\lua\modules\types.h"> - <Filter>src\modules</Filter> + <Filter>source\modules</Filter> + </ClInclude> + <ClInclude Include="..\..\src\lua\common\je_lua_common.h"> + <Filter>source\common</Filter> + </ClInclude> + <ClInclude Include="..\..\src\lua\common\je_lua_constant.h"> + <Filter>source\common</Filter> </ClInclude> - <ClInclude Include="..\..\src\lua\common\error.h"> - <Filter>src\common</Filter> + <ClInclude Include="..\..\src\lua\common\je_lua_error.h"> + <Filter>source\common</Filter> </ClInclude> - <ClInclude Include="..\..\src\lua\common\Proxy.h"> - <Filter>src\common</Filter> + <ClInclude Include="..\..\src\lua\common\je_lua_proxy.h"> + <Filter>source\common</Filter> </ClInclude> - <ClInclude Include="..\..\src\lua\common\Reference.hpp"> - <Filter>src\common</Filter> + <ClInclude Include="..\..\src\lua\common\je_lua_reference.hpp"> + <Filter>source\common</Filter> </ClInclude> </ItemGroup> <ItemGroup> <ResourceCompile Include="jin.rc"> - <Filter>res</Filter> + <Filter>resource</Filter> </ResourceCompile> </ItemGroup> <ItemGroup> <Image Include="..\..\res\icon.ico"> - <Filter>res</Filter> + <Filter>resource</Filter> </Image> </ItemGroup> </Project>
\ No newline at end of file diff --git a/build/vc++/libjin/libjin.vcxproj b/build/vc++/libjin/libjin.vcxproj index 6497e24..c993555 100644 --- a/build/vc++/libjin/libjin.vcxproj +++ b/build/vc++/libjin/libjin.vcxproj @@ -155,7 +155,7 @@ <ClInclude Include="..\..\..\src\libjin\Filesystem\je_asset_database.h" /> <ClInclude Include="..\..\..\src\libjin\Game\je_entity.h" /> <ClInclude Include="..\..\..\src\libjin\Game\je_application.h" /> - <ClInclude Include="..\..\..\src\libjin\Game\je_game_object.h" /> + <ClInclude Include="..\..\..\src\libjin\Game\je_gameobject.h" /> <ClInclude Include="..\..\..\src\libjin\game\je_scene.h" /> <ClInclude Include="..\..\..\src\libjin\graphics\animation\je_animator.h" /> <ClInclude Include="..\..\..\src\libjin\graphics\animation\je_animation.h" /> @@ -229,7 +229,7 @@ <ClCompile Include="..\..\..\src\libjin\Common\je_utf8.cpp" /> <ClCompile Include="..\..\..\src\libjin\Filesystem\je_asset_database.cpp" /> <ClCompile Include="..\..\..\src\libjin\Game\je_entity.cpp" /> - <ClCompile Include="..\..\..\src\libjin\Game\je_game_object.cpp" /> + <ClCompile Include="..\..\..\src\libjin\Game\je_gameobject.cpp" /> <ClCompile Include="..\..\..\src\libjin\Game\je_application.cpp" /> <ClCompile Include="..\..\..\src\libjin\Game\je_scene.cpp" /> <ClCompile Include="..\..\..\src\libjin\graphics\animation\je_animator.cpp" /> diff --git a/build/vc++/libjin/libjin.vcxproj.filters b/build/vc++/libjin/libjin.vcxproj.filters index 1a6a27b..ea8dbd8 100644 --- a/build/vc++/libjin/libjin.vcxproj.filters +++ b/build/vc++/libjin/libjin.vcxproj.filters @@ -276,9 +276,6 @@ <ClInclude Include="..\..\..\src\libjin\Graphics\je_graphic_batch.h"> <Filter>source\graphics</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\libjin\Game\je_game_object.h"> - <Filter>source\game</Filter> - </ClInclude> <ClInclude Include="..\..\..\src\libjin\Game\je_entity.h"> <Filter>source\game</Filter> </ClInclude> @@ -306,6 +303,9 @@ <ClInclude Include="..\..\..\src\libjin\Game\je_application.h"> <Filter>source\game</Filter> </ClInclude> + <ClInclude Include="..\..\..\src\libjin\Game\je_gameobject.h"> + <Filter>source\game</Filter> + </ClInclude> </ItemGroup> <ItemGroup> <None Include="..\..\..\src\libjin\README.md"> @@ -448,9 +448,6 @@ <ClCompile Include="..\..\..\src\libjin\Graphics\je_graphic_batch.cpp"> <Filter>source\graphics</Filter> </ClCompile> - <ClCompile Include="..\..\..\src\libjin\Game\je_game_object.cpp"> - <Filter>source\game</Filter> - </ClCompile> <ClCompile Include="..\..\..\src\libjin\Game\je_entity.cpp"> <Filter>source\game</Filter> </ClCompile> @@ -469,5 +466,8 @@ <ClCompile Include="..\..\..\src\libjin\Game\je_application.cpp"> <Filter>source\game</Filter> </ClCompile> + <ClCompile Include="..\..\..\src\libjin\Game\je_gameobject.cpp"> + <Filter>source\game</Filter> + </ClCompile> </ItemGroup> </Project>
\ No newline at end of file |