diff options
| author | Andy Belle-Isle <drumsetmonkey@gmail.com> | 2019-08-26 23:11:30 -0400 |
|---|---|---|
| committer | Andy Belle-Isle <drumsetmonkey@gmail.com> | 2019-08-26 23:11:30 -0400 |
| commit | 6acad98c1dba2c07045ae724da1f833ee8369d47 (patch) | |
| tree | f8678d42598e378f95ba14feaeb9bbee2e5c749c /src/Script/entityx | |
| parent | 3cea77e3e6ef432d1bfc6026139b482154ccf604 (diff) | |
| parent | 3412f3bd9fc6cf9dbac0f0b5c8bc8a7ffe0c22a6 (diff) | |
Fixed Makefile to be fully recursive
Diffstat (limited to 'src/Script/entityx')
| -rw-r--r-- | src/Script/entityx/entity_lua.cpp | 6 | ||||
| -rw-r--r-- | src/Script/entityx/entity_lua.hpp | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/Script/entityx/entity_lua.cpp b/src/Script/entityx/entity_lua.cpp index e62f040..b23628b 100644 --- a/src/Script/entityx/entity_lua.cpp +++ b/src/Script/entityx/entity_lua.cpp @@ -1,4 +1,7 @@ -#include "entityx_lua.h" +//#include "entityx_lua.h" +#include <Script/entityx/entity_lua.hpp> +#include <stdio.h> +#include <string.h> using namespace entityx::lua; ComponentList entityx::lua::components; @@ -62,7 +65,6 @@ void entityx::lua::setup_entityx_api(lua_State* L) // We don't need __gc for Entity::Id (with static_assert it is_trivially_destructible) ref_EntityId = luaL_ref(L, LUA_REGISTRYINDEX); - // Create global entityx table lua_newtable(L); diff --git a/src/Script/entityx/entity_lua.hpp b/src/Script/entityx/entity_lua.hpp index 034640a..bcad91c 100644 --- a/src/Script/entityx/entity_lua.hpp +++ b/src/Script/entityx/entity_lua.hpp @@ -5,7 +5,7 @@ #include <type_traits> #include <lua.hpp> -#include <entityx.h> +#include <entityx/entityx.h> #include <Script/entityx/LuaTypes.hpp> #include <Script/entityx/EntityLua.hpp> |