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

More changes for debian build

Browse Source
This commit is contained in:
Dane Johnson 2021-04-07 13:13:04 -05:00
parent fbaf5ec460
commit 30a955bc31
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/CMakeLists.txt
View File

@ -94,6 +94,7 @@ target_link_libraries(couchlib OpenGL::GL)
target_link_libraries(couchlib GLEW::GLEW) target_link_libraries(couchlib GLEW::GLEW)
if (LUA_ENABLED) if (LUA_ENABLED)
target_link_libraries(couchlib_luascripting ${LUA_LIBRARIES}) target_link_libraries(couchlib_luascripting ${LUA_LIBRARIES})
target_include_directories(couchlib_luascripting PRIVATE "${LUA_INCLUDE_DIR}")
endif () endif ()
target_link_libraries(couchlib ${BULLET_LIBRARIES}) target_link_libraries(couchlib ${BULLET_LIBRARIES})
target_link_libraries(couchlib ${ASSIMP_LIBRARY}) target_link_libraries(couchlib ${ASSIMP_LIBRARY})

2
core/Window.cpp
View File

@ -10,7 +10,7 @@ void Window::Init() {
glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 3); glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 3);
glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE); glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
glfwWindowHint(GLFW_FLOATING, GLFW_TRUE); glfwWindowHint(GLFW_FLOATING, GLFW_TRUE);
#if GLFW_VERSION_MINOR >= 2 #if GLFW_VERSION_REVISION >= 2
glfwWindowHintString(GLFW_X11_CLASS_NAME, "Couch"); glfwWindowHintString(GLFW_X11_CLASS_NAME, "Couch");
#endif #endif

7
scripting/CMakeLists.txt
View File

@ -4,12 +4,17 @@ set_property(SOURCE couch.i PROPERTY CPLUSPLUS ON)
set_property(SOURCE couch.i PROPERTY USE_TARGET_INCLUDE_DIRECTORIES ON) set_property(SOURCE couch.i PROPERTY USE_TARGET_INCLUDE_DIRECTORIES ON)
if (LUA_ENABLED) if (LUA_ENABLED)
## Find Lua
find_package(Lua REQUIRED)
swig_add_library(couchlua swig_add_library(couchlua
TYPE STATIC TYPE STATIC
LANGUAGE lua LANGUAGE lua
SOURCES couch.i lua/helpers.i) SOURCES couch.i lua/helpers.i)
target_include_directories(couchlua PRIVATE "${PROJECT_SOURCE_DIR}/core") target_include_directories(couchlua PRIVATE
"${PROJECT_SOURCE_DIR}/core"
"${LUA_INCLUDE_DIR}")
swig_link_libraries(couchlua swig_link_libraries(couchlua
PRIVATE PRIVATE