Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2025-07-05 12:38:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into viewport

Browse Source 
# Conflicts:
#	examples/imgui_impl_glfw.cpp
#	examples/imgui_impl_glfw.h
#	examples/imgui_impl_sdl.cpp
#	examples/imgui_impl_sdl.h
#	examples/imgui_impl_win32.cpp
#	examples/imgui_impl_win32.h
#	imgui.cpp
#	imgui_internal.h
This commit is contained in:
omar
2018-07-02 20:13:16 +02:00
parent c38fe6b0e1 ddb09c6011
commit 770cba0bd0
15 changed files with 120 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/example_glfw_vulkan/CMakeLists.txt
View File

@ -20,7 +20,7 @@ include_directories(${GLFW_DIR}/include)
# ImGui
set(IMGUI_DIR ../../)
include_directories(${IMGUI_DIR})
include_directories(${IMGUI_DIR} ..)
# Libraries
find_library(VULKAN_LIBRARY