dubey/tview
dubey/tview
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Compare commits

base: dubey:2e64485c684a2c9f41947fb75c353356e16b7461
Branches Tags
dubey:main
dubey:build
dubey:macos
..
compare: dubey:bb4f324016b2e41be2ff864a1a3cc069397ad35c
Branches Tags
dubey:main
dubey:build
dubey:macos

8 Commits
2e64485c68 ... bb4f324016

Author SHA1 Message Date
Tanishq Dubey
bb4f324016 Merge branch 'macos' 2024-06-14 19:38:28 -04:00
Tanishq Dubey
5cf05f1419 Add platform check 2024-06-14 19:33:45 -04:00
Tanishq Dubey
6cafeb0834 remove gui ini 2024-06-14 19:28:50 -04:00
Tanishq Dubey
a7aefc10ec resolve conflict 2024-06-14 19:28:48 -04:00
Tanishq Dubey
1d54148b3e fix build 2024-06-14 19:28:18 -04:00
Tanishq Dubey
460e63af26 a little lcean up 2024-06-14 19:28:18 -04:00
Tanishq Dubey
844d23b3fd resolve conflict 2024-06-14 19:28:07 -04:00
Tanishq Dubey
e34e38778e changes to get macos building 2024-06-12 16:27:32 -04:00
2 changed files with 6 additions and 1 deletions
Show Stats Expand all files Collapse all files

2
Makefile
View File

@ -24,7 +24,7 @@ UNAME_S := $(shell uname -s)
LINUX_GL_LIBS = -lGL
CXXFLAGS = -std=c++20 -I$(IMGUI_DIR) -I$(IMGUI_DIR)/backends
CXXFLAGS += -DIMGUI_DEFINE_MATH_OPERATORS -Ofast
CXXFLAGS += -DIMGUI_DEFINE_MATH_OPERATORS -O3 -DGL_SILENCE_DEPRECATION
LIBS = -lexiv2
##---------------------------------------------------------------------

5
lib/backends/tex_inspect_opengl.cpp
View File

@ -77,11 +77,16 @@ using namespace gl;
#elif defined(IMGUI_IMPL_OPENGL_LOADER_EPOXY)
#include <epoxy/gl.h>
#else
#if defined(__APPLE__)
#include <OpenGL/gl.h>
#include <OpenGL/gl3.h>
#else
#include <SDL2/SDL_opengl.h>
#include <SDL2/SDL_opengles2.h>
#include <SDL2/SDL_opengles2_gl2.h>
#endif
#endif
#endif
// Desktop GL 3.2+ has glDrawElementsBaseVertex() which GL ES and WebGL don't have.
#if !defined(IMGUI_IMPL_OPENGL_ES2) && !defined(IMGUI_IMPL_OPENGL_ES3) && defined(GL_VERSION_3_2)