Skip to content

Commit b280742

Browse files
committed
Fixes to imgui
1 parent 90be512 commit b280742

18 files changed

+80
-46830
lines changed

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,3 +84,6 @@
8484
[submodule "3rdparty/tcpp"]
8585
path = 3rdparty/tcpp
8686
url = git@github.com:Erfan-Ahmadi/tcpp.git
87+
[submodule "3rdparty/imgui"]
88+
path = 3rdparty/imgui
89+
url = https://github.com/ocornut/imgui

3rdparty/CMakeLists.txt

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,12 +238,18 @@ if(NBL_BUILD_IMGUI)
238238
"imgui/imgui_widgets.cpp"
239239
"imgui/imgui.cpp"
240240
"imgui/imgui.h"
241-
"imgui/imgui_stdlib.cpp"
242-
"imgui/imgui_stdlib.h"
241+
"imgui/misc/cpp/imgui_stdlib.cpp"
242+
"imgui/misc/cpp/imgui_stdlib.h"
243243
"imgui/imstb_rectpack.h"
244244
"imgui/imstb_textedit.h"
245245
"imgui/imstb_truetype.h"
246246
)
247+
target_include_directories(imgui
248+
PUBLIC "imgui"
249+
PUBLIC "imgui/misc/cpp"
250+
PUBLIC "imgui/backends"
251+
)
252+
247253
endif()
248254

249255
add_library(aesGladman OBJECT

3rdparty/imgui

Submodule imgui added at e489e40

3rdparty/imgui/imconfig.h

Lines changed: 0 additions & 109 deletions
This file was deleted.

0 commit comments

Comments
 (0)