diff options
| author | assiduous <assiduous@diligentgraphics.com> | 2021-02-17 18:23:38 +0000 |
|---|---|---|
| committer | assiduous <assiduous@diligentgraphics.com> | 2021-02-17 18:23:38 +0000 |
| commit | 2d4cb69b6b400853ec6c8834ebd4b0212439ffd6 (patch) | |
| tree | 012cfa7e6530242ecf863bfce9c34b1bab7a5401 | |
| parent | Travis: updated XCode to 12.2 (diff) | |
| download | DiligentTools-2d4cb69b6b400853ec6c8834ebd4b0212439ffd6.tar.gz DiligentTools-2d4cb69b6b400853ec6c8834ebd4b0212439ffd6.zip | |
Updated imgui
| -rw-r--r-- | Imgui/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | Imgui/src/ImGuiImplWin32.cpp | 2 | ||||
| m--------- | ThirdParty/imgui | 0 |
3 files changed, 6 insertions, 5 deletions
diff --git a/Imgui/CMakeLists.txt b/Imgui/CMakeLists.txt index c0dc295..61d47c3 100644 --- a/Imgui/CMakeLists.txt +++ b/Imgui/CMakeLists.txt @@ -26,6 +26,7 @@ set(DEAR_IMGUI_INTERFACE set(DEAR_IMGUI_SOURCE ${DEAR_IMGUI_PATH}/imgui.cpp ${DEAR_IMGUI_PATH}/imgui_draw.cpp + ${DEAR_IMGUI_PATH}/imgui_tables.cpp ${DEAR_IMGUI_PATH}/imgui_widgets.cpp ${DEAR_IMGUI_PATH}/misc/cpp/imgui_stdlib.cpp ) @@ -47,8 +48,8 @@ set(INTERFACE ) if(PLATFORM_WIN32) - list(APPEND DEAR_IMGUI_SOURCE ${DEAR_IMGUI_PATH}/examples/imgui_impl_win32.cpp) - list(APPEND DEAR_IMGUI_INCLUDE ${DEAR_IMGUI_PATH}/examples/imgui_impl_win32.h) + list(APPEND DEAR_IMGUI_SOURCE ${DEAR_IMGUI_PATH}/backends/imgui_impl_win32.cpp) + list(APPEND DEAR_IMGUI_INCLUDE ${DEAR_IMGUI_PATH}/backends/imgui_impl_win32.h) list(APPEND SOURCE src/ImGuiImplWin32.cpp) list(APPEND INTERFACE interface/ImGuiImplWin32.hpp) @@ -62,8 +63,8 @@ elseif(PLATFORM_ANDROID) list(APPEND SOURCE src/ImGuiImplAndroid.cpp) list(APPEND INTERFACE interface/ImGuiImplAndroid.hpp) elseif(PLATFORM_MACOS) - list(APPEND DEAR_IMGUI_SOURCE ${DEAR_IMGUI_PATH}/examples/imgui_impl_osx.mm) - list(APPEND DEAR_IMGUI_INCLUDE ${DEAR_IMGUI_PATH}/examples/imgui_impl_osx.h) + list(APPEND DEAR_IMGUI_SOURCE ${DEAR_IMGUI_PATH}/backends/imgui_impl_osx.mm) + list(APPEND DEAR_IMGUI_INCLUDE ${DEAR_IMGUI_PATH}/backends/imgui_impl_osx.h) list(APPEND SOURCE src/ImGuiImplMacOS.mm) list(APPEND INTERFACE interface/ImGuiImplMacOS.hpp) diff --git a/Imgui/src/ImGuiImplWin32.cpp b/Imgui/src/ImGuiImplWin32.cpp index ddfb512..2c01cc6 100644 --- a/Imgui/src/ImGuiImplWin32.cpp +++ b/Imgui/src/ImGuiImplWin32.cpp @@ -33,7 +33,7 @@ #include "GraphicsTypes.h" #include "imgui.h" #include "ImGuiImplWin32.hpp" -#include "examples/imgui_impl_win32.h" +#include "backends/imgui_impl_win32.h" #include "DebugUtilities.hpp" IMGUI_IMPL_API LRESULT ImGui_ImplWin32_WndProcHandler(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam); diff --git a/ThirdParty/imgui b/ThirdParty/imgui -Subproject 0eadb0092027f33e463943e62e9353dec7582ef +Subproject a8f04f5e05fe4d0bd6cd83bff3b0c3c4ec74853 |