drinkingtea/nostalgia
2
0
Fork 0
Code Issues 4 Pull Requests Actions Releases 13 Activity

[nostalgia] Upgrade ImGui version to 1.86

Browse Source
This commit is contained in:
Gary Talent
2022-01-30 02:27:26 -06:00
parent f6be36741c
commit 35433563c6
4 changed files with 6 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
conanfile.py
View File

@@ -2,13 +2,14 @@ from conans import ConanFile, CMake
class NostalgiaConan(ConanFile): class NostalgiaConan(ConanFile):
settings = 'os', 'compiler', 'build_type', 'arch' 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' generators = 'cmake', 'cmake_find_package', 'cmake_paths'
default_options = { default_options = {
} }
def imports(self): def imports(self):
self.copy('imgui_impl_glfw.cpp', 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_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_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.h', dst='../deps/imgui/src', src='./res/bindings')
self.copy('imgui_impl_opengl3_loader.h', dst='../deps/imgui/src', src='./res/bindings')

12
deps/imgui/CMakeLists.txt vendored
View File

@@ -7,18 +7,6 @@ add_library(
find_package(glfw3 REQUIRED) find_package(glfw3 REQUIRED)
find_package(imgui 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( target_link_libraries(
imgui-glfw PUBLIC imgui-glfw PUBLIC
${OPENGL_gl_LIBRARY} ${OPENGL_gl_LIBRARY}

1
src/nostalgia/core/glfw/gfx.cpp
View File

@@ -3,7 +3,6 @@
*/ */
#include <GLFW/glfw3.h> #include <GLFW/glfw3.h>
#define IMGUI_IMPL_OPENGL_ES3
#include <imgui_impl_opengl3.h> #include <imgui_impl_opengl3.h>
#include <imgui_impl_glfw.h> #include <imgui_impl_glfw.h>

1
src/nostalgia/core/userland/gfx_opengl.cpp
View File

@@ -4,7 +4,6 @@
#include <array> #include <array>
#define IMGUI_IMPL_OPENGL_ES3
#include <imgui_impl_opengl3.h> #include <imgui_impl_opengl3.h>
#include <nostalgia/glutils/glutils.hpp> #include <nostalgia/glutils/glutils.hpp>