diff options
-rw-r--r-- | bin/Jin.exe | bin | 554496 -> 535040 bytes | |||
-rw-r--r-- | bin/jin.exe | bin | 554496 -> 535040 bytes | |||
-rw-r--r-- | build/vc++/jin.vcxproj | 23 | ||||
-rw-r--r-- | build/vc++/jin.vcxproj.filters | 59 |
4 files changed, 39 insertions, 43 deletions
diff --git a/bin/Jin.exe b/bin/Jin.exe Binary files differindex ef43340..b8399cd 100644 --- a/bin/Jin.exe +++ b/bin/Jin.exe diff --git a/bin/jin.exe b/bin/jin.exe Binary files differindex ef43340..b8399cd 100644 --- a/bin/jin.exe +++ b/bin/jin.exe diff --git a/build/vc++/jin.vcxproj b/build/vc++/jin.vcxproj index 82059af..16064de 100644 --- a/build/vc++/jin.vcxproj +++ b/build/vc++/jin.vcxproj @@ -143,7 +143,8 @@ </Link> </ItemDefinitionGroup> <ItemGroup> - <ClCompile Include="..\..\src\jinc.cpp" /> + <ClCompile Include="..\..\src\lua\jin.cpp" /> + <ClCompile Include="..\..\src\lua\main.cpp" /> <ClCompile Include="..\..\src\lua\modules\audio\audio.cpp" /> <ClCompile Include="..\..\src\lua\modules\audio\source.cpp" /> <ClCompile Include="..\..\src\lua\modules\bit\bit.cpp" /> @@ -158,7 +159,6 @@ <ClCompile Include="..\..\src\lua\modules\graphics\shader.cpp" /> <ClCompile Include="..\..\src\lua\modules\joypad\joypad.cpp" /> <ClCompile Include="..\..\src\lua\modules\keyboard\keyboard.cpp" /> - <ClCompile Include="..\..\src\lua\modules\jin.cpp" /> <ClCompile Include="..\..\src\lua\modules\math\math.cpp" /> <ClCompile Include="..\..\src\lua\modules\mouse\mouse.cpp" /> <ClCompile Include="..\..\src\lua\modules\net\Buffer.cpp" /> @@ -166,28 +166,27 @@ <ClCompile Include="..\..\src\lua\modules\net\socket.cpp" /> <ClCompile Include="..\..\src\lua\modules\thread\thread.cpp" /> <ClCompile Include="..\..\src\lua\modules\time\time.cpp" /> - <ClCompile Include="..\..\src\main.cpp" /> </ItemGroup> <ItemGroup> - <ClInclude Include="..\..\src\luax.h" /> <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\embed\boot.lua.h" /> + <ClInclude Include="..\..\src\lua\embed\embed.h" /> + <ClInclude Include="..\..\src\lua\embed\graphics.lua.h" /> + <ClInclude Include="..\..\src\lua\embed\keyboard.lua.h" /> + <ClInclude Include="..\..\src\lua\embed\mouse.lua.h" /> + <ClInclude Include="..\..\src\lua\embed\net.lua.h" /> + <ClInclude Include="..\..\src\lua\embed\path.lua.h" /> + <ClInclude Include="..\..\src\lua\jin.h" /> <ClInclude Include="..\..\src\lua\libraries\luax\luax.h" /> - <ClInclude Include="..\..\src\lua\modules\jin.h" /> + <ClInclude Include="..\..\src\lua\luax.h" /> <ClInclude Include="..\..\src\lua\modules\luax.h" /> <ClInclude Include="..\..\src\lua\modules\net\Buffer.h" /> <ClInclude Include="..\..\src\lua\modules\thread\thread.h" /> <ClInclude Include="..\..\src\lua\modules\types.h" /> - <ClInclude Include="..\..\src\lua\modules\_embed\boot.lua.h" /> - <ClInclude Include="..\..\src\lua\modules\_embed\embed.h" /> - <ClInclude Include="..\..\src\lua\modules\_embed\graphics.lua.h" /> - <ClInclude Include="..\..\src\lua\modules\_embed\keyboard.lua.h" /> - <ClInclude Include="..\..\src\lua\modules\_embed\mouse.lua.h" /> - <ClInclude Include="..\..\src\lua\modules\_embed\net.lua.h" /> - <ClInclude Include="..\..\src\lua\modules\_embed\path.lua.h" /> <ClInclude Include="..\..\src\lua\resources\font.ttf.h" /> <ClInclude Include="resource.h" /> </ItemGroup> diff --git a/build/vc++/jin.vcxproj.filters b/build/vc++/jin.vcxproj.filters index c8397b5..b44ba99 100644 --- a/build/vc++/jin.vcxproj.filters +++ b/build/vc++/jin.vcxproj.filters @@ -61,17 +61,11 @@ <Filter Include="src\resources"> <UniqueIdentifier>{0340fbad-0c07-4923-afd2-183424c70967}</UniqueIdentifier> </Filter> - <Filter Include="src\modules\_embed"> - <UniqueIdentifier>{cb6d9d4e-046b-44c7-b00a-c316e87e035c}</UniqueIdentifier> + <Filter Include="src\embed"> + <UniqueIdentifier>{9cf92f3f-bcc5-442b-aa92-c88eeb1c5e45}</UniqueIdentifier> </Filter> </ItemGroup> <ItemGroup> - <ClCompile Include="..\..\src\main.cpp"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="..\..\src\jinc.cpp"> - <Filter>src</Filter> - </ClCompile> <ClCompile Include="..\..\src\lua\modules\audio\audio.cpp"> <Filter>src\modules\audio</Filter> </ClCompile> @@ -126,9 +120,6 @@ <ClCompile Include="..\..\src\lua\modules\time\time.cpp"> <Filter>src\modules\time</Filter> </ClCompile> - <ClCompile Include="..\..\src\lua\modules\jin.cpp"> - <Filter>src\modules</Filter> - </ClCompile> <ClCompile Include="..\..\src\lua\modules\graphics\texture.cpp"> <Filter>src\modules\graphics</Filter> </ClCompile> @@ -138,6 +129,12 @@ <ClCompile Include="..\..\src\lua\modules\graphics\shader.cpp"> <Filter>src\modules\graphics</Filter> </ClCompile> + <ClCompile Include="..\..\src\lua\jin.cpp"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lua\main.cpp"> + <Filter>src</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <ClInclude Include="resource.h"> @@ -170,38 +167,38 @@ <ClInclude Include="..\..\src\lua\modules\thread\thread.h"> <Filter>src\modules\thread</Filter> </ClInclude> - <ClInclude Include="..\..\src\lua\modules\jin.h"> - <Filter>src\modules</Filter> - </ClInclude> - <ClInclude Include="..\..\src\luax.h"> - <Filter>src</Filter> - </ClInclude> <ClInclude Include="..\..\src\lua\common\error.h"> <Filter>src\common</Filter> </ClInclude> <ClInclude Include="..\..\src\lua\modules\luax.h"> <Filter>src\modules</Filter> </ClInclude> - <ClInclude Include="..\..\src\lua\modules\_embed\boot.lua.h"> - <Filter>src\modules\_embed</Filter> + <ClInclude Include="..\..\src\lua\embed\boot.lua.h"> + <Filter>src\embed</Filter> </ClInclude> - <ClInclude Include="..\..\src\lua\modules\_embed\embed.h"> - <Filter>src\modules\_embed</Filter> + <ClInclude Include="..\..\src\lua\embed\embed.h"> + <Filter>src\embed</Filter> </ClInclude> - <ClInclude Include="..\..\src\lua\modules\_embed\graphics.lua.h"> - <Filter>src\modules\_embed</Filter> + <ClInclude Include="..\..\src\lua\embed\graphics.lua.h"> + <Filter>src\embed</Filter> </ClInclude> - <ClInclude Include="..\..\src\lua\modules\_embed\keyboard.lua.h"> - <Filter>src\modules\_embed</Filter> + <ClInclude Include="..\..\src\lua\embed\keyboard.lua.h"> + <Filter>src\embed</Filter> </ClInclude> - <ClInclude Include="..\..\src\lua\modules\_embed\mouse.lua.h"> - <Filter>src\modules\_embed</Filter> + <ClInclude Include="..\..\src\lua\embed\mouse.lua.h"> + <Filter>src\embed</Filter> </ClInclude> - <ClInclude Include="..\..\src\lua\modules\_embed\net.lua.h"> - <Filter>src\modules\_embed</Filter> + <ClInclude Include="..\..\src\lua\embed\net.lua.h"> + <Filter>src\embed</Filter> </ClInclude> - <ClInclude Include="..\..\src\lua\modules\_embed\path.lua.h"> - <Filter>src\modules\_embed</Filter> + <ClInclude Include="..\..\src\lua\embed\path.lua.h"> + <Filter>src\embed</Filter> + </ClInclude> + <ClInclude Include="..\..\src\lua\jin.h"> + <Filter>src</Filter> + </ClInclude> + <ClInclude Include="..\..\src\lua\luax.h"> + <Filter>src</Filter> </ClInclude> </ItemGroup> <ItemGroup> |