diff options
| -rw-r--r-- | bin/jin.exe | bin | 1443840 -> 1443840 bytes | |||
| -rw-r--r-- | build/vs2015/jin.vcxproj | 10 | ||||
| -rw-r--r-- | build/vs2015/jin.vcxproj.filters | 28 | ||||
| -rw-r--r-- | src/data/font.ttf (renamed from src/res/font.ttf) | bin | 84564 -> 84564 bytes | |||
| -rw-r--r-- | src/data/font.ttf.h (renamed from src/res/font.ttf.h) | 0 | ||||
| -rw-r--r-- | src/data/icon.png (renamed from src/res/icon.png) | bin | 773 -> 773 bytes | |||
| -rw-r--r-- | src/data/icon.png.h (renamed from src/res/icon.png.h) | 0 | ||||
| -rw-r--r-- | src/script/graphics/luaopen_graphics.cpp | 2 | ||||
| -rw-r--r-- | src/script/luaopen_jin.cpp | 4 |
9 files changed, 13 insertions, 31 deletions
diff --git a/bin/jin.exe b/bin/jin.exe Binary files differindex 9cb4cba..a3864ad 100644 --- a/bin/jin.exe +++ b/bin/jin.exe diff --git a/build/vs2015/jin.vcxproj b/build/vs2015/jin.vcxproj index 3f1ec4a..cb5dab9 100644 --- a/build/vs2015/jin.vcxproj +++ b/build/vs2015/jin.vcxproj @@ -205,6 +205,8 @@ <ClCompile Include="..\..\src\libjin\utils\matrix.cpp" /> </ItemGroup> <ItemGroup> + <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\core\core.h" /> <ClInclude Include="..\..\src\libjin\core\game.h" /> @@ -267,8 +269,6 @@ <ClInclude Include="..\..\src\libjin\render\jsl.h" /> <ClInclude Include="..\..\src\libjin\render\quad.h" /> <ClInclude Include="..\..\src\libjin\render\window.h" /> - <ClInclude Include="..\..\src\res\font.ttf.h" /> - <ClInclude Include="..\..\src\res\icon.png.h" /> <ClInclude Include="..\..\src\libjin\utils\endian.h" /> <ClInclude Include="..\..\src\libjin\utils\macros.h" /> <ClInclude Include="..\..\src\libjin\utils\math.h" /> @@ -276,12 +276,6 @@ <ClInclude Include="..\..\src\libjin\utils\utils.h" /> </ItemGroup> <ItemGroup> - <Font Include="..\..\src\res\font.ttf" /> - </ItemGroup> - <ItemGroup> - <Image Include="..\..\src\res\icon.png" /> - </ItemGroup> - <ItemGroup> <None Include="..\..\src\3rdparty\lua51\Makefile" /> <None Include="..\..\src\script\embed\debug.lua" /> <None Include="..\..\src\script\embed\graphics.lua" /> diff --git a/build/vs2015/jin.vcxproj.filters b/build/vs2015/jin.vcxproj.filters index d02d6ab..67d4d9d 100644 --- a/build/vs2015/jin.vcxproj.filters +++ b/build/vs2015/jin.vcxproj.filters @@ -25,9 +25,6 @@ <Filter Include="src\libjin\render"> <UniqueIdentifier>{23033979-4942-4f08-8a1d-ecc0dec442b5}</UniqueIdentifier> </Filter> - <Filter Include="src\res"> - <UniqueIdentifier>{0340fbad-0c07-4923-afd2-183424c70967}</UniqueIdentifier> - </Filter> <Filter Include="src\libjin\utils"> <UniqueIdentifier>{e9abe7cb-bbbf-4315-a9ab-285b52efa3b7}</UniqueIdentifier> </Filter> @@ -94,6 +91,9 @@ <Filter Include="src\script\embed\script"> <UniqueIdentifier>{1b7a28ed-7715-48bc-8793-6e575e887f77}</UniqueIdentifier> </Filter> + <Filter Include="src\data"> + <UniqueIdentifier>{0340fbad-0c07-4923-afd2-183424c70967}</UniqueIdentifier> + </Filter> </ItemGroup> <ItemGroup> <ClCompile Include="..\..\src\main.cpp"> @@ -452,12 +452,6 @@ <ClInclude Include="..\..\src\script\embed\mouse.lua.h"> <Filter>src\script\embed</Filter> </ClInclude> - <ClInclude Include="..\..\src\res\font.ttf.h"> - <Filter>src\res</Filter> - </ClInclude> - <ClInclude Include="..\..\src\res\icon.png.h"> - <Filter>src\res</Filter> - </ClInclude> <ClInclude Include="..\..\src\script\embed\path.lua.h"> <Filter>src\script\embed</Filter> </ClInclude> @@ -509,16 +503,12 @@ <ClInclude Include="..\..\src\libjin\core\core.h"> <Filter>src\libjin\core</Filter> </ClInclude> - </ItemGroup> - <ItemGroup> - <Font Include="..\..\src\res\font.ttf"> - <Filter>src\res</Filter> - </Font> - </ItemGroup> - <ItemGroup> - <Image Include="..\..\src\res\icon.png"> - <Filter>src\res</Filter> - </Image> + <ClInclude Include="..\..\src\data\font.ttf.h"> + <Filter>src\data</Filter> + </ClInclude> + <ClInclude Include="..\..\src\data\icon.png.h"> + <Filter>src\data</Filter> + </ClInclude> </ItemGroup> <ItemGroup> <None Include="..\..\src\3rdparty\lua51\Makefile"> diff --git a/src/res/font.ttf b/src/data/font.ttf Binary files differindex 153c608..153c608 100644 --- a/src/res/font.ttf +++ b/src/data/font.ttf diff --git a/src/res/font.ttf.h b/src/data/font.ttf.h index 519d723..519d723 100644 --- a/src/res/font.ttf.h +++ b/src/data/font.ttf.h diff --git a/src/res/icon.png b/src/data/icon.png Binary files differindex 94eeb9f..94eeb9f 100644 --- a/src/res/icon.png +++ b/src/data/icon.png diff --git a/src/res/icon.png.h b/src/data/icon.png.h index e69de29..e69de29 100644 --- a/src/res/icon.png.h +++ b/src/data/icon.png.h diff --git a/src/script/graphics/luaopen_graphics.cpp b/src/script/graphics/luaopen_graphics.cpp index 71637a9..4f61023 100644 --- a/src/script/graphics/luaopen_graphics.cpp +++ b/src/script/graphics/luaopen_graphics.cpp @@ -422,7 +422,7 @@ namespace lua { if (context.defaultFont == 0) { - #include "res/font.ttf.h" + #include "data/font.ttf.h" // load default font context.defaultFont = new Font(); context.defaultFont->loadb(font_ttf); diff --git a/src/script/luaopen_jin.cpp b/src/script/luaopen_jin.cpp index c4ee955..d7262e1 100644 --- a/src/script/luaopen_jin.cpp +++ b/src/script/luaopen_jin.cpp @@ -8,9 +8,7 @@ namespace jin { namespace lua { - /** - * sub modules - */ + extern int luaopen_core(lua_State* L); extern int luaopen_graphics(lua_State* L); extern int luaopen_audio(lua_State* L); |
