Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2025-07-04 20:18:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into docking

Browse Source 
# Conflicts:
#	backends/imgui_impl_opengl3.cpp
#	imgui.cpp
This commit is contained in:
ocornut
2020-10-31 00:47:17 +01:00
parent 455c21df71 047d4c4500
commit e3ac52630a
25 changed files with 1018 additions and 1062 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/example_glfw_vulkan/CMakeLists.txt
View File

@ -25,7 +25,7 @@ include_directories(${GLFW_DIR}/include)
# Dear ImGui
set(IMGUI_DIR ../../)
include_directories(${IMGUI_DIR} ..)
include_directories(${IMGUI_DIR} ${IMGUI_DIR}/backends ..)
# Libraries
find_package(Vulkan REQUIRED)