Skip to content

Commit 9b8f381

Browse files
committed
fix build to work with a current version of ImGui
Master and docking branch both work.
1 parent 6fb9358 commit 9b8f381

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

CMakeLists.txt

+5-4
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@ set(SOURCES
1010
libs/imgui/imgui.cpp
1111
libs/imgui/imgui_widgets.cpp
1212
libs/imgui/imgui_draw.cpp
13-
libs/imgui/examples/imgui_impl_opengl3.cpp
14-
libs/imgui/examples/imgui_impl_sdl.cpp
13+
libs/imgui/imgui_tables.cpp
14+
libs/imgui/backends/imgui_impl_opengl3.cpp
15+
libs/imgui/backends/imgui_impl_sdl.cpp
1516
)
1617

1718
# cmake toolchain
@@ -50,7 +51,7 @@ set_target_properties(ImFileDialogExample PROPERTIES
5051

5152
# include directories
5253
target_include_directories(ImFileDialogExample PRIVATE ${SDL2_INCLUDE_DIRS} ${GLEW_INCLUDE_DIRS} ${OPENGL_INCLUDE_DIRS})
53-
target_include_directories(ImFileDialogExample PRIVATE libs/)
54+
target_include_directories(ImFileDialogExample PRIVATE libs libs/imgui)
5455

5556
# link libraries
5657
target_link_libraries(ImFileDialogExample ${OPENGL_LIBRARIES})
@@ -64,4 +65,4 @@ elseif(UNIX AND NOT APPLE)
6465
target_link_libraries(ImFileDialogExample ${GLEW_LIBRARIES} ${SDL2_LIBRARIES} ${CMAKE_DL_LIBS} stdc++fs pthread)
6566
elseif(APPLE)
6667
target_link_libraries(ImFileDialogExample GLEW::GLEW ${SDL2_LIBRARIES} ${CMAKE_DL_LIBS})
67-
endif()
68+
endif()

example.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include <SDL2/SDL.h>
2-
#include <imgui/imgui.h>
3-
#include <imgui/examples/imgui_impl_sdl.h>
4-
#include <imgui/examples/imgui_impl_opengl3.h>
2+
#include <imgui.h>
3+
#include <backends/imgui_impl_sdl.h>
4+
#include <backends/imgui_impl_opengl3.h>
55
#include <time.h>
66

77
#ifdef _WIN32
@@ -166,4 +166,4 @@ int main(int argc, char* argv[])
166166
SDL_Quit();
167167

168168
return 0;
169-
}
169+
}

0 commit comments

Comments
 (0)