diff --git a/lib/third_party/imgui/CMakeLists.txt b/lib/third_party/imgui/CMakeLists.txt index 2bef955fc..c53cd36dd 100644 --- a/lib/third_party/imgui/CMakeLists.txt +++ b/lib/third_party/imgui/CMakeLists.txt @@ -10,7 +10,7 @@ add_subdirectory(cimgui) add_subdirectory(implot) add_subdirectory(implot3d) add_subdirectory(imnodes) -add_subdirectory(custom) +add_subdirectory(backend) add_subdirectory(ColorTextEditor) -set(IMGUI_LIBRARIES imgui_imgui imgui_cimgui imgui_implot imgui_implot3d imgui_imnodes imgui_custom imgui_color_text_editor PARENT_SCOPE) \ No newline at end of file +set(IMGUI_LIBRARIES imgui_imgui imgui_cimgui imgui_implot imgui_implot3d imgui_imnodes imgui_backend imgui_color_text_editor PARENT_SCOPE) \ No newline at end of file diff --git a/lib/third_party/imgui/custom/CMakeLists.txt b/lib/third_party/imgui/backend/CMakeLists.txt similarity index 60% rename from lib/third_party/imgui/custom/CMakeLists.txt rename to lib/third_party/imgui/backend/CMakeLists.txt index 874e2b2bf..0d6b78c47 100644 --- a/lib/third_party/imgui/custom/CMakeLists.txt +++ b/lib/third_party/imgui/backend/CMakeLists.txt @@ -1,20 +1,20 @@ cmake_minimum_required(VERSION 3.16) -# https://github.com/ocornut/imgui with custom modifications made to the OpenGL 3 and GLFW backends -project(imgui_custom) +# https://github.com/ocornut/imgui backends with custom modifications made to the OpenGL 3 and GLFW backends +project(imgui_backend) set(CMAKE_CXX_STANDARD 17) if (NOT IMHEX_EXTERNAL_PLUGIN_BUILD) - add_library(imgui_custom OBJECT + add_library(imgui_backend OBJECT source/imgui_impl_opengl3.cpp source/imgui_impl_glfw.cpp ) - target_include_directories(imgui_custom PUBLIC + target_include_directories(imgui_backend PUBLIC include ) - target_link_libraries(imgui_custom PRIVATE imgui_includes) + target_link_libraries(imgui_backend PRIVATE imgui_includes) find_package(OpenGL REQUIRED) find_package(Freetype REQUIRED) @@ -35,9 +35,9 @@ if (NOT IMHEX_EXTERNAL_PLUGIN_BUILD) set(GLFW_LIBRARIES "glfw3") endif () - target_include_directories(imgui_custom PUBLIC ${FREETYPE_INCLUDE_DIRS} ${OpenGL_INCLUDE_DIRS}) - target_link_directories(imgui_custom PUBLIC ${FREETYPE_LIBRARY_DIRS} ${OpenGL_LIBRARY_DIRS}) - target_link_libraries(imgui_custom PUBLIC ${GLFW_LIBRARIES} ${OPENGL_LIBRARIES}) + target_include_directories(imgui_backend PUBLIC ${FREETYPE_INCLUDE_DIRS} ${OpenGL_INCLUDE_DIRS}) + target_link_directories(imgui_backend PUBLIC ${FREETYPE_LIBRARY_DIRS} ${OpenGL_LIBRARY_DIRS}) + target_link_libraries(imgui_backend PUBLIC ${GLFW_LIBRARIES} ${OPENGL_LIBRARIES}) endif() target_include_directories(imgui_all_includes INTERFACE include) \ No newline at end of file diff --git a/lib/third_party/imgui/custom/include/emscripten_browser_clipboard.h b/lib/third_party/imgui/backend/include/emscripten_browser_clipboard.h similarity index 100% rename from lib/third_party/imgui/custom/include/emscripten_browser_clipboard.h rename to lib/third_party/imgui/backend/include/emscripten_browser_clipboard.h diff --git a/lib/third_party/imgui/custom/include/imgui_impl_glfw.h b/lib/third_party/imgui/backend/include/imgui_impl_glfw.h similarity index 100% rename from lib/third_party/imgui/custom/include/imgui_impl_glfw.h rename to lib/third_party/imgui/backend/include/imgui_impl_glfw.h diff --git a/lib/third_party/imgui/custom/include/imgui_impl_opengl3.h b/lib/third_party/imgui/backend/include/imgui_impl_opengl3.h similarity index 100% rename from lib/third_party/imgui/custom/include/imgui_impl_opengl3.h rename to lib/third_party/imgui/backend/include/imgui_impl_opengl3.h diff --git a/lib/third_party/imgui/custom/include/imgui_impl_opengl3_loader.h b/lib/third_party/imgui/backend/include/imgui_impl_opengl3_loader.h similarity index 100% rename from lib/third_party/imgui/custom/include/imgui_impl_opengl3_loader.h rename to lib/third_party/imgui/backend/include/imgui_impl_opengl3_loader.h diff --git a/lib/third_party/imgui/custom/include/opengl_support.h b/lib/third_party/imgui/backend/include/opengl_support.h similarity index 100% rename from lib/third_party/imgui/custom/include/opengl_support.h rename to lib/third_party/imgui/backend/include/opengl_support.h diff --git a/lib/third_party/imgui/custom/include/stb_image.h b/lib/third_party/imgui/backend/include/stb_image.h similarity index 100% rename from lib/third_party/imgui/custom/include/stb_image.h rename to lib/third_party/imgui/backend/include/stb_image.h diff --git a/lib/third_party/imgui/custom/source/imgui_impl_glfw.cpp b/lib/third_party/imgui/backend/source/imgui_impl_glfw.cpp similarity index 100% rename from lib/third_party/imgui/custom/source/imgui_impl_glfw.cpp rename to lib/third_party/imgui/backend/source/imgui_impl_glfw.cpp diff --git a/lib/third_party/imgui/custom/source/imgui_impl_opengl3.cpp b/lib/third_party/imgui/backend/source/imgui_impl_opengl3.cpp similarity index 100% rename from lib/third_party/imgui/custom/source/imgui_impl_opengl3.cpp rename to lib/third_party/imgui/backend/source/imgui_impl_opengl3.cpp