diff options
Diffstat (limited to 'src')
43 files changed, 86 insertions, 87 deletions
diff --git a/src/jin/main.cpp b/src/jin/main.cpp index 8b91cf3..fb3876b 100644 --- a/src/jin/main.cpp +++ b/src/jin/main.cpp @@ -1,4 +1,3 @@ -#include "lua/luax.h" #include "lua/jin.h" #include "libjin/jin.h" diff --git a/src/lua/common/je_lua_callback.h b/src/lua/common/je_lua_callback.h index f3301fc..0467e45 100644 --- a/src/lua/common/je_lua_callback.h +++ b/src/lua/common/je_lua_callback.h @@ -4,7 +4,6 @@ #include <vector> #include "libjin/jin.h" -#include "../luax.h" #include "je_lua_reference.h" namespace JinEngine diff --git a/src/lua/common/je_lua_error.h b/src/lua/common/je_lua_error.h index 3f7e76f..e0f7f35 100644 --- a/src/lua/common/je_lua_error.h +++ b/src/lua/common/je_lua_error.h @@ -1,8 +1,11 @@ #ifndef __JIN_ERROR_H #define __JIN_ERROR_H -#include "../luax.h" + #include <string.h> +#include "LuaJIT/lua.hpp" +#include "libraries/luax/luax.h" + namespace JinEngine { namespace Lua diff --git a/src/lua/common/je_lua_proxy.h b/src/lua/common/je_lua_proxy.h index 5541a5a..17e8da7 100644 --- a/src/lua/common/je_lua_proxy.h +++ b/src/lua/common/je_lua_proxy.h @@ -1,7 +1,8 @@ #ifndef __JIN_COMMON_PROXY_H #define __JIN_COMMON_PROXY_H -#include "../luax.h" +#include "LuaJIT/lua.hpp" +#include "libraries/luax/luax.h" #include "je_lua_shared.hpp" diff --git a/src/lua/common/je_lua_reference.cpp b/src/lua/common/je_lua_reference.cpp index 90223de..05dc82b 100644 --- a/src/lua/common/je_lua_reference.cpp +++ b/src/lua/common/je_lua_reference.cpp @@ -1,5 +1,8 @@ #include "je_lua_reference.h" +#include "LuaJIT/lua.hpp" +#include "libraries/luax/luax.h" + namespace JinEngine { namespace Lua diff --git a/src/lua/common/je_lua_reference.h b/src/lua/common/je_lua_reference.h index f338762..84115a6 100644 --- a/src/lua/common/je_lua_reference.h +++ b/src/lua/common/je_lua_reference.h @@ -1,7 +1,8 @@ #ifndef __JIN_COMMON_REFERENCE_H #define __JIN_COMMON_REFERENCE_H -#include "../luax.h" +#include "LuaJIT/lua.hpp" +#include "libraries/luax/luax.h" namespace JinEngine { diff --git a/src/lua/jin.cpp b/src/lua/jin.cpp index d9f685b..9dc46aa 100644 --- a/src/lua/jin.cpp +++ b/src/lua/jin.cpp @@ -1,5 +1,6 @@ -#include "lua/common/je_lua_common.h" -#include "lua/modules/luax.h" +#include "LuaJIT/lua.hpp" +#include "libraries/luax/luax.h" +#include "common/je_lua_common.h" #include "embed/embed.h" #include "jin.h" diff --git a/src/lua/jin.h b/src/lua/jin.h index a4dcd3e..0287a54 100644 --- a/src/lua/jin.h +++ b/src/lua/jin.h @@ -4,8 +4,9 @@ #ifndef __JIN_M_JIN_H #define __JIN_M_JIN_H -#include "lua/common/je_lua_common.h" -#include "luax.h" +#include "LuaJIT/lua.hpp" +#include "libraries/luax/luax.h" +#include "common/je_lua_common.h" #define MODULE_NAME "jin" #define CODE_NAME "Side Part" diff --git a/src/lua/luax.h b/src/lua/luax.h deleted file mode 100644 index 89e456e..0000000 --- a/src/lua/luax.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef __JIN_LUA_LUAX_H -#define __JIN_LUA_LUAX_H - -#include "LuaJIT/lua.hpp" -#include "lua/libraries/luax/luax.h" - -#endif
\ No newline at end of file diff --git a/src/lua/modules/ai/je_lua_state_machine.cpp b/src/lua/modules/ai/je_lua_state_machine.cpp index 86ce7a5..06338b8 100644 --- a/src/lua/modules/ai/je_lua_state_machine.cpp +++ b/src/lua/modules/ai/je_lua_state_machine.cpp @@ -1,4 +1,4 @@ -#include "lua/common/je_lua_common.h" +#include "common/je_lua_common.h" #include "libjin/jin.h" using namespace JinEngine::AI; diff --git a/src/lua/modules/audio/je_lua_audio.cpp b/src/lua/modules/audio/je_lua_audio.cpp index 50c5268..b9183b2 100644 --- a/src/lua/modules/audio/je_lua_audio.cpp +++ b/src/lua/modules/audio/je_lua_audio.cpp @@ -1,6 +1,6 @@ -#include "lua/modules/luax.h" - -#include "lua/common/je_lua_common.h" +#include "LuaJIT/lua.hpp" +#include "libraries/luax/luax.h" +#include "common/je_lua_common.h" #include "libjin/jin.h" #include "je_lua_source.h" diff --git a/src/lua/modules/audio/je_lua_source.cpp b/src/lua/modules/audio/je_lua_source.cpp index e152847..5058690 100644 --- a/src/lua/modules/audio/je_lua_source.cpp +++ b/src/lua/modules/audio/je_lua_source.cpp @@ -1,7 +1,7 @@ #include "libjin/jin.h" -#include "lua/modules/luax.h" -#include "lua/common/je_lua_common.h" - +#include "LuaJIT/lua.hpp" +#include "libraries/luax/luax.h" +#include "common/je_lua_common.h" using namespace JinEngine::Audio; diff --git a/src/lua/modules/bit/je_lua_bit.cpp b/src/lua/modules/bit/je_lua_bit.cpp index fdd0ae0..2759905 100644 --- a/src/lua/modules/bit/je_lua_bit.cpp +++ b/src/lua/modules/bit/je_lua_bit.cpp @@ -1,5 +1,6 @@ -#include "lua/common/je_lua_common.h" -#include "lua/modules/luax.h" +#include "common/je_lua_common.h" +#include "LuaJIT/lua.hpp" +#include "libraries/luax/luax.h" #include "libjin/jin.h" #include <cstdlib> diff --git a/src/lua/modules/core/je_lua_core.cpp b/src/lua/modules/core/je_lua_core.cpp index f5b06c3..f657910 100644 --- a/src/lua/modules/core/je_lua_core.cpp +++ b/src/lua/modules/core/je_lua_core.cpp @@ -1,5 +1,6 @@ -#include "lua/common/je_lua_common.h" -#include "lua/modules/luax.h" +#include "common/je_lua_common.h" +#include "LuaJIT/lua.hpp" +#include "libraries/luax/luax.h" #include "libjin/jin.h" using namespace JinEngine::Game; diff --git a/src/lua/modules/event/je_lua_event.cpp b/src/lua/modules/event/je_lua_event.cpp index 82ba385..7fd73c8 100644 --- a/src/lua/modules/event/je_lua_event.cpp +++ b/src/lua/modules/event/je_lua_event.cpp @@ -1,8 +1,9 @@ /** * Event module */ -#include "lua/common/je_lua_common.h" -#include "lua/modules/luax.h" +#include "common/je_lua_common.h" +#include "LuaJIT/lua.hpp" +#include "libraries/luax/luax.h" #include "libjin/jin.h" using namespace JinEngine; diff --git a/src/lua/modules/filesystem/je_lua_filesystem.cpp b/src/lua/modules/filesystem/je_lua_filesystem.cpp index 6245ba8..84b9c01 100644 --- a/src/lua/modules/filesystem/je_lua_filesystem.cpp +++ b/src/lua/modules/filesystem/je_lua_filesystem.cpp @@ -1,5 +1,6 @@ -#include "lua/common/je_lua_common.h" -#include "lua/modules/luax.h" +#include "common/je_lua_common.h" +#include "LuaJIT/lua.hpp" +#include "libraries/luax/luax.h" #include "libjin/jin.h" #include <string> diff --git a/src/lua/modules/graphics/je_lua_animation.cpp b/src/lua/modules/graphics/je_lua_animation.cpp index cc82685..9c4eaeb 100644 --- a/src/lua/modules/graphics/je_lua_animation.cpp +++ b/src/lua/modules/graphics/je_lua_animation.cpp @@ -1,6 +1,6 @@ -#include "lua/modules/luax.h" +#include "common/je_lua_proxy.h" -#include "lua/common/je_lua_common.h" +#include "common/je_lua_common.h" #include "libjin/jin.h" #include "je_lua_sprite.h" diff --git a/src/lua/modules/graphics/je_lua_animator.cpp b/src/lua/modules/graphics/je_lua_animator.cpp index 2c835be..519bc75 100644 --- a/src/lua/modules/graphics/je_lua_animator.cpp +++ b/src/lua/modules/graphics/je_lua_animator.cpp @@ -1,6 +1,6 @@ -#include "lua/modules/luax.h" +#include "common/je_lua_proxy.h" -#include "lua/common/je_lua_common.h" +#include "common/je_lua_common.h" #include "libjin/jin.h" #include "je_lua_sprite.h" diff --git a/src/lua/modules/graphics/je_lua_bitmap.cpp b/src/lua/modules/graphics/je_lua_bitmap.cpp index 6b7655f..24641a0 100644 --- a/src/lua/modules/graphics/je_lua_bitmap.cpp +++ b/src/lua/modules/graphics/je_lua_bitmap.cpp @@ -1,5 +1,5 @@ -#include "lua/common/je_lua_common.h" -#include "lua/modules/luax.h" +#include "common/je_lua_common.h" +#include "common/je_lua_proxy.h" #include "libjin/jin.h" #include "je_lua_bitmap.h" diff --git a/src/lua/modules/graphics/je_lua_canvas.cpp b/src/lua/modules/graphics/je_lua_canvas.cpp index f7bd650..3c1e606 100644 --- a/src/lua/modules/graphics/je_lua_canvas.cpp +++ b/src/lua/modules/graphics/je_lua_canvas.cpp @@ -1,6 +1,6 @@ -#include "lua/modules/luax.h" +#include "common/je_lua_proxy.h" -#include "lua/common/je_lua_common.h" +#include "common/je_lua_common.h" #include "libjin/jin.h" #include "je_lua_canvas.h" diff --git a/src/lua/modules/graphics/je_lua_graphics.cpp b/src/lua/modules/graphics/je_lua_graphics.cpp index 4c95fa6..4ebd1ee 100644 --- a/src/lua/modules/graphics/je_lua_graphics.cpp +++ b/src/lua/modules/graphics/je_lua_graphics.cpp @@ -2,9 +2,9 @@ #include <fstream> #include "libjin/jin.h" -#include "lua/modules/luax.h" +#include "common/je_lua_proxy.h" -#include "lua/common/je_lua_common.h" +#include "common/je_lua_common.h" #include "je_lua_canvas.h" #include "je_lua_sprite.h" diff --git a/src/lua/modules/graphics/je_lua_page.cpp b/src/lua/modules/graphics/je_lua_page.cpp index 20ec398..00a9302 100644 --- a/src/lua/modules/graphics/je_lua_page.cpp +++ b/src/lua/modules/graphics/je_lua_page.cpp @@ -1,6 +1,6 @@ -#include "lua/modules/luax.h" +#include "common/je_lua_proxy.h" -#include "lua/common/je_lua_common.h" +#include "common/je_lua_common.h" #include "libjin/jin.h" #include <iostream> diff --git a/src/lua/modules/graphics/je_lua_shader.cpp b/src/lua/modules/graphics/je_lua_shader.cpp index 1612a69..c04b360 100644 --- a/src/lua/modules/graphics/je_lua_shader.cpp +++ b/src/lua/modules/graphics/je_lua_shader.cpp @@ -1,6 +1,6 @@ -#include "lua/modules/luax.h" +#include "common/je_lua_proxy.h" -#include "lua/common/je_lua_common.h" +#include "common/je_lua_common.h" #include "libjin/jin.h" #include "je_lua_shader.h" diff --git a/src/lua/modules/graphics/je_lua_sprite.cpp b/src/lua/modules/graphics/je_lua_sprite.cpp index 0a56de8..01ba103 100644 --- a/src/lua/modules/graphics/je_lua_sprite.cpp +++ b/src/lua/modules/graphics/je_lua_sprite.cpp @@ -1,6 +1,6 @@ -#include "lua/modules/luax.h" +#include "common/je_lua_proxy.h" -#include "lua/common/je_lua_common.h" +#include "common/je_lua_common.h" #include "libjin/jin.h" #include "je_lua_sprite.h" diff --git a/src/lua/modules/graphics/je_lua_spritesheet.cpp b/src/lua/modules/graphics/je_lua_spritesheet.cpp index 504e022..9496fbf 100644 --- a/src/lua/modules/graphics/je_lua_spritesheet.cpp +++ b/src/lua/modules/graphics/je_lua_spritesheet.cpp @@ -1,7 +1,7 @@ #include <vector> -#include "lua/modules/luax.h" -#include "lua/common/je_lua_common.h" +#include "common/je_lua_proxy.h" +#include "common/je_lua_common.h" #include "libjin/jin.h" #include "je_lua_sprite.h" #include "je_lua_spritesheet.h" diff --git a/src/lua/modules/graphics/je_lua_text.cpp b/src/lua/modules/graphics/je_lua_text.cpp index 9377a0a..0db6c32 100644 --- a/src/lua/modules/graphics/je_lua_text.cpp +++ b/src/lua/modules/graphics/je_lua_text.cpp @@ -1,6 +1,6 @@ -#include "lua/modules/luax.h" +#include "common/je_lua_proxy.h" -#include "lua/common/je_lua_common.h" +#include "common/je_lua_common.h" #include "libjin/jin.h" using namespace JinEngine::Graphics; diff --git a/src/lua/modules/graphics/je_lua_texture.cpp b/src/lua/modules/graphics/je_lua_texture.cpp index 79ddc63..712c4ac 100644 --- a/src/lua/modules/graphics/je_lua_texture.cpp +++ b/src/lua/modules/graphics/je_lua_texture.cpp @@ -1,6 +1,6 @@ -#include "lua/modules/luax.h" +#include "common/je_lua_proxy.h" -#include "lua/common/je_lua_common.h" +#include "common/je_lua_common.h" #include "libjin/jin.h" #include "je_lua_texture.h" diff --git a/src/lua/modules/graphics/je_lua_texture_font.cpp b/src/lua/modules/graphics/je_lua_texture_font.cpp index 8ca3ce5..5bbe154 100644 --- a/src/lua/modules/graphics/je_lua_texture_font.cpp +++ b/src/lua/modules/graphics/je_lua_texture_font.cpp @@ -1,6 +1,6 @@ -#include "lua/modules/luax.h" +#include "common/je_lua_proxy.h" -#include "lua/common/je_lua_common.h" +#include "common/je_lua_common.h" #include "libjin/jin.h" #include "je_lua_page.h" diff --git a/src/lua/modules/graphics/je_lua_ttf.cpp b/src/lua/modules/graphics/je_lua_ttf.cpp index c5d922b..a1da345 100644 --- a/src/lua/modules/graphics/je_lua_ttf.cpp +++ b/src/lua/modules/graphics/je_lua_ttf.cpp @@ -1,6 +1,6 @@ -#include "lua/modules/luax.h" +#include "common/je_lua_proxy.h" -#include "lua/common/je_lua_common.h" +#include "common/je_lua_common.h" #include "libjin/jin.h" #include "je_lua_page.h" diff --git a/src/lua/modules/graphics/je_lua_ttf_data.cpp b/src/lua/modules/graphics/je_lua_ttf_data.cpp index 1277318..dedf082 100644 --- a/src/lua/modules/graphics/je_lua_ttf_data.cpp +++ b/src/lua/modules/graphics/je_lua_ttf_data.cpp @@ -1,6 +1,6 @@ -#include "lua/modules/luax.h" +#include "common/je_lua_proxy.h" -#include "lua/common/je_lua_common.h" +#include "common/je_lua_common.h" #include "libjin/jin.h" #include "je_lua_ttf.h" diff --git a/src/lua/modules/joypad/je_lua_joypad.cpp b/src/lua/modules/joypad/je_lua_joypad.cpp index a57fc99..8c71dc1 100644 --- a/src/lua/modules/joypad/je_lua_joypad.cpp +++ b/src/lua/modules/joypad/je_lua_joypad.cpp @@ -1,5 +1,5 @@ -#include "lua/modules/luax.h" -#include "lua/common/je_lua_common.h" +#include "common/je_lua_proxy.h" +#include "common/je_lua_common.h" #include "libjin/jin.h" namespace JinEngine diff --git a/src/lua/modules/keyboard/je_lua_keyboard.cpp b/src/lua/modules/keyboard/je_lua_keyboard.cpp index 6b7f3cd..899fe9c 100644 --- a/src/lua/modules/keyboard/je_lua_keyboard.cpp +++ b/src/lua/modules/keyboard/je_lua_keyboard.cpp @@ -1,5 +1,5 @@ -#include "lua/common/je_lua_common.h" -#include "lua/modules/luax.h" +#include "common/je_lua_common.h" +#include "common/je_lua_proxy.h" namespace JinEngine { diff --git a/src/lua/modules/luax.h b/src/lua/modules/luax.h deleted file mode 100644 index f45af39..0000000 --- a/src/lua/modules/luax.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __JIN_MODULES_LUAX_H -#define __JIN_MODULES_LUAX_H - -#include "../luax.h" - -#endif
\ No newline at end of file diff --git a/src/lua/modules/math/je_lua_math.cpp b/src/lua/modules/math/je_lua_math.cpp index 2afeaf9..c163203 100644 --- a/src/lua/modules/math/je_lua_math.cpp +++ b/src/lua/modules/math/je_lua_math.cpp @@ -1,5 +1,5 @@ -#include "lua/common/je_lua_common.h" -#include "lua/modules/luax.h" +#include "common/je_lua_common.h" +#include "common/je_lua_proxy.h" #include "libjin/jin.h" namespace JinEngine diff --git a/src/lua/modules/mouse/je_lua_mouse.cpp b/src/lua/modules/mouse/je_lua_mouse.cpp index 9e6824a..37677c1 100644 --- a/src/lua/modules/mouse/je_lua_mouse.cpp +++ b/src/lua/modules/mouse/je_lua_mouse.cpp @@ -1,5 +1,5 @@ -#include "lua/common/je_lua_common.h" -#include "lua/modules/luax.h" +#include "common/je_lua_common.h" +#include "common/je_lua_proxy.h" #include "libjin/jin.h" using namespace JinEngine::Input; diff --git a/src/lua/modules/net/je_lua_buffer.cpp b/src/lua/modules/net/je_lua_buffer.cpp index 0198095..582eec9 100644 --- a/src/lua/modules/net/je_lua_buffer.cpp +++ b/src/lua/modules/net/je_lua_buffer.cpp @@ -1,6 +1,6 @@ -#include "lua/modules/luax.h" +#include "common/je_lua_proxy.h" -#include "lua/common/je_lua_common.h" +#include "common/je_lua_common.h" #include "libjin/jin.h" #include "je_lua_buffer.h" diff --git a/src/lua/modules/net/je_lua_buffer.h b/src/lua/modules/net/je_lua_buffer.h index d226640..7584f47 100644 --- a/src/lua/modules/net/je_lua_buffer.h +++ b/src/lua/modules/net/je_lua_buffer.h @@ -3,7 +3,7 @@ #include <cstring> #include <cstdlib> -#include "lua/common/je_lua_common.h" +#include "common/je_lua_common.h" namespace JinEngine { diff --git a/src/lua/modules/net/je_lua_net.cpp b/src/lua/modules/net/je_lua_net.cpp index b081733..178a93e 100644 --- a/src/lua/modules/net/je_lua_net.cpp +++ b/src/lua/modules/net/je_lua_net.cpp @@ -1,7 +1,7 @@ -#include "lua/modules/luax.h" +#include "common/je_lua_proxy.h" #include "libjin/jin.h" -#include "lua/common/je_lua_common.h" +#include "common/je_lua_common.h" #include "je_lua_buffer.h" #include "je_lua_socket.h" diff --git a/src/lua/modules/net/je_lua_socket.cpp b/src/lua/modules/net/je_lua_socket.cpp index db170e4..3af3319 100644 --- a/src/lua/modules/net/je_lua_socket.cpp +++ b/src/lua/modules/net/je_lua_socket.cpp @@ -1,6 +1,6 @@ -#include "lua/modules/luax.h" +#include "common/je_lua_proxy.h" -#include "lua/common/je_lua_common.h" +#include "common/je_lua_common.h" #include "libjin/jin.h" #include "je_lua_buffer.h" diff --git a/src/lua/modules/thread/je_lua_thread.cpp b/src/lua/modules/thread/je_lua_thread.cpp index d7b50ab..070e9ac 100644 --- a/src/lua/modules/thread/je_lua_thread.cpp +++ b/src/lua/modules/thread/je_lua_thread.cpp @@ -1,8 +1,8 @@ -#include "lua/modules/luax.h" +#include "common/je_lua_proxy.h" #include "libjin/jin.h" #include "lua/jin.h" -#include "lua/common/je_lua_common.h" +#include "common/je_lua_common.h" #include "je_lua_thread.h" namespace JinEngine diff --git a/src/lua/modules/thread/je_lua_thread.h b/src/lua/modules/thread/je_lua_thread.h index a3e4e76..12d482e 100644 --- a/src/lua/modules/thread/je_lua_thread.h +++ b/src/lua/modules/thread/je_lua_thread.h @@ -1,5 +1,5 @@ #include "libjin/jin.h" -#include "lua/common/je_lua_common.h" +#include "common/je_lua_common.h" namespace JinEngine { diff --git a/src/lua/modules/time/je_lua_time.cpp b/src/lua/modules/time/je_lua_time.cpp index 39ec899..626d843 100644 --- a/src/lua/modules/time/je_lua_time.cpp +++ b/src/lua/modules/time/je_lua_time.cpp @@ -1,6 +1,6 @@ #include "SDL2/SDL.h" -#include "lua/common/je_lua_common.h" -#include "lua/modules/luax.h" +#include "common/je_lua_common.h" +#include "common/je_lua_proxy.h" #include "libjin/jin.h" diff --git a/src/lua/modules/time/je_lua_timer.cpp b/src/lua/modules/time/je_lua_timer.cpp index 540f205..281f3c2 100644 --- a/src/lua/modules/time/je_lua_timer.cpp +++ b/src/lua/modules/time/je_lua_timer.cpp @@ -1,6 +1,6 @@ -#include "lua/common/je_lua_callback.h" -#include "lua/common/je_lua_common.h" +#include "common/je_lua_callback.h" +#include "common/je_lua_common.h" #include "je_lua_timer.h" using namespace JinEngine::Time; |