Compare commits
3 Commits
1ba64cb5d8
...
8d1701b0bb
Author | SHA1 | Date | |
---|---|---|---|
8d1701b0bb | |||
1048e522fd | |||
ee59da4aa3 |
13
deps/glad/CMakeLists.txt
vendored
13
deps/glad/CMakeLists.txt
vendored
@ -1,2 +1,11 @@
|
|||||||
add_library(glad OBJECT src/glad.c)
|
add_library(glad src/glad.c)
|
||||||
target_include_directories(glad PUBLIC include)
|
|
||||||
|
target_include_directories(glad PUBLIC include)
|
||||||
|
|
||||||
|
install(
|
||||||
|
TARGETS
|
||||||
|
glad
|
||||||
|
DESTINATION
|
||||||
|
LIBRARY DESTINATION lib
|
||||||
|
ARCHIVE DESTINATION lib
|
||||||
|
)
|
||||||
|
12
deps/imgui/CMakeLists.txt
vendored
12
deps/imgui/CMakeLists.txt
vendored
@ -6,7 +6,7 @@ endif()
|
|||||||
# DrinkingTea: end
|
# DrinkingTea: end
|
||||||
|
|
||||||
add_library(
|
add_library(
|
||||||
imgui OBJECT
|
imgui
|
||||||
imgui.cpp
|
imgui.cpp
|
||||||
imgui_demo.cpp
|
imgui_demo.cpp
|
||||||
imgui_draw.cpp
|
imgui_draw.cpp
|
||||||
@ -19,4 +19,12 @@ add_library(
|
|||||||
target_include_directories(
|
target_include_directories(
|
||||||
imgui SYSTEM PUBLIC
|
imgui SYSTEM PUBLIC
|
||||||
.
|
.
|
||||||
)
|
)
|
||||||
|
|
||||||
|
install(
|
||||||
|
TARGETS
|
||||||
|
imgui
|
||||||
|
DESTINATION
|
||||||
|
LIBRARY DESTINATION lib
|
||||||
|
ARCHIVE DESTINATION lib
|
||||||
|
)
|
||||||
|
@ -50,6 +50,7 @@ ox::Result<ContextUPtr> init(
|
|||||||
glfwInit();
|
glfwInit();
|
||||||
OX_RETURN_ERROR(initGfx(*ctx));
|
OX_RETURN_ERROR(initGfx(*ctx));
|
||||||
glfwSetWindowSizeCallback(ctx->window, draw);
|
glfwSetWindowSizeCallback(ctx->window, draw);
|
||||||
|
ctx->mandatoryRefreshPeriodEnd = ticksMs(*ctx) + config::MandatoryRefreshPeriod;
|
||||||
return ox::UPtr<Context, ContextDeleter>(ctx.release());
|
return ox::UPtr<Context, ContextDeleter>(ctx.release());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user