dane/couch
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow non-lua builds

Browse Source
This commit is contained in:
Dane Johnson
2021-01-27 16:05:46 -06:00
parent 1bbba40ebf
commit 28c4088bdc
4 changed files with 34 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/CMakeLists.txt
View File

@@ -8,8 +8,10 @@ find_package(glfw3 3.3 REQUIRED)
## Find Bullet
find_package(Bullet REQUIRED)
if (LUA_ENABLED)
## Find Lua
find_package(Lua REQUIRED)
endif ()
add_library(couchlib SHARED)
target_sources(couchlib PUBLIC
@@ -74,7 +76,9 @@ if(NOT WIN32)
endif()
target_link_libraries(couchlib OpenGL::GL)
target_link_libraries(couchlib GLEW::GLEW)
target_link_libraries(couchlib ${LUA_LIBRARIES})
if (LUA_ENABLED)
target_link_libraries(couchlib ${LUA_LIBRARIES})
endif ()
target_link_libraries(couchlib ${BULLET_LIBRARIES})
## Add documentation

9
core/Scripting/Lua.cpp
View File

@@ -85,8 +85,9 @@ bool Lua::HasHook(const char *name) {
return exists;
}
void Lua::LuaKeyHandler(Window *window, int key, int code, int action, int mods) {
#ifdef LUA_SCRIPTING
void Lua::LuaKeyHandler(Window *window, int key, int code, int action, int mods) {
// lua_State *L = (lua_State*) glfwGetWindowUserPointer(window);
lua_getglobal(L, "onkey");
lua_pushinteger(L, key);
@@ -97,11 +98,9 @@ void Lua::LuaKeyHandler(Window *window, int key, int code, int action, int mods)
if (err != LUA_OK) {
Error();
}
#endif // LUA_SCRIPTING
}
void Lua::LuaMousePositionHandler(Window *window, double xpos, double ypos, double relx, double rely) {
#ifdef LUA_SCRIPTING
// lua_State *L = (lua_State*) glfwGetWindowUserPointer(window);
lua_getglobal(L, "onmousemotion");
lua_pushnumber(L, xpos);
@@ -112,5 +111,7 @@ void Lua::LuaMousePositionHandler(Window *window, double xpos, double ypos, doub
if (err != LUA_OK) {
Error();
}
#endif // LUA_SCRIPTING
}
#endif // LUA_SCRIPTING