diff --git a/conanfile.py b/conanfile.py index 699eb13f..0f5c1b8f 100644 --- a/conanfile.py +++ b/conanfile.py @@ -2,13 +2,14 @@ from conans import ConanFile, CMake class NostalgiaConan(ConanFile): settings = 'os', 'compiler', 'build_type', 'arch' - requires = 'jsoncpp/1.9.4', 'glfw/3.3.4', 'imgui/1.83' + requires = 'jsoncpp/1.9.4', 'glfw/3.3.4', 'imgui/1.86' generators = 'cmake', 'cmake_find_package', 'cmake_paths' default_options = { } def imports(self): - self.copy('imgui_impl_glfw.cpp', dst='../deps/imgui/src', src='./res/bindings') - self.copy('imgui_impl_opengl3.cpp', dst='../deps/imgui/src', src='./res/bindings') - self.copy('imgui_impl_glfw.h', dst='../deps/imgui/src', src='./res/bindings') - self.copy('imgui_impl_opengl3.h', dst='../deps/imgui/src', src='./res/bindings') + self.copy('imgui_impl_glfw.cpp', dst='../deps/imgui/src', src='./res/bindings') + self.copy('imgui_impl_opengl3.cpp', dst='../deps/imgui/src', src='./res/bindings') + self.copy('imgui_impl_glfw.h', dst='../deps/imgui/src', src='./res/bindings') + self.copy('imgui_impl_opengl3.h', dst='../deps/imgui/src', src='./res/bindings') + self.copy('imgui_impl_opengl3_loader.h', dst='../deps/imgui/src', src='./res/bindings') diff --git a/deps/imgui/CMakeLists.txt b/deps/imgui/CMakeLists.txt index f5a1aac9..e3599319 100644 --- a/deps/imgui/CMakeLists.txt +++ b/deps/imgui/CMakeLists.txt @@ -7,18 +7,6 @@ add_library( find_package(glfw3 REQUIRED) find_package(imgui REQUIRED) -if(APPLE) - target_compile_definitions( - imgui-glfw PRIVATE - IMGUI_IMPL_OPENGL_LOADER_CUSTOM="OpenGL/gl3.h" - ) -else() - target_compile_definitions( - imgui-glfw PRIVATE - IMGUI_IMPL_OPENGL_LOADER_CUSTOM="GLES3/gl3.h" - ) -endif() - target_link_libraries( imgui-glfw PUBLIC ${OPENGL_gl_LIBRARY} diff --git a/src/nostalgia/core/glfw/gfx.cpp b/src/nostalgia/core/glfw/gfx.cpp index ad2b1c3f..6f8c4aee 100644 --- a/src/nostalgia/core/glfw/gfx.cpp +++ b/src/nostalgia/core/glfw/gfx.cpp @@ -3,7 +3,6 @@ */ #include -#define IMGUI_IMPL_OPENGL_ES3 #include #include diff --git a/src/nostalgia/core/userland/gfx_opengl.cpp b/src/nostalgia/core/userland/gfx_opengl.cpp index 1f8b1d74..2ecd82e3 100644 --- a/src/nostalgia/core/userland/gfx_opengl.cpp +++ b/src/nostalgia/core/userland/gfx_opengl.cpp @@ -4,7 +4,6 @@ #include -#define IMGUI_IMPL_OPENGL_ES3 #include #include