Compare commits
5 Commits
bb4f324016
...
2e64485c68
Author | SHA1 | Date | |
---|---|---|---|
2e64485c68 | |||
a7317de4e4 | |||
2ea4211c4b | |||
ac27995669 | |||
515c3028cc |
2
Makefile
2
Makefile
@ -24,7 +24,7 @@ UNAME_S := $(shell uname -s)
|
|||||||
LINUX_GL_LIBS = -lGL
|
LINUX_GL_LIBS = -lGL
|
||||||
|
|
||||||
CXXFLAGS = -std=c++20 -I$(IMGUI_DIR) -I$(IMGUI_DIR)/backends
|
CXXFLAGS = -std=c++20 -I$(IMGUI_DIR) -I$(IMGUI_DIR)/backends
|
||||||
CXXFLAGS += -DIMGUI_DEFINE_MATH_OPERATORS -O3 -DGL_SILENCE_DEPRECATION
|
CXXFLAGS += -DIMGUI_DEFINE_MATH_OPERATORS -Ofast
|
||||||
LIBS = -lexiv2
|
LIBS = -lexiv2
|
||||||
|
|
||||||
##---------------------------------------------------------------------
|
##---------------------------------------------------------------------
|
||||||
|
@ -77,16 +77,11 @@ using namespace gl;
|
|||||||
#elif defined(IMGUI_IMPL_OPENGL_LOADER_EPOXY)
|
#elif defined(IMGUI_IMPL_OPENGL_LOADER_EPOXY)
|
||||||
#include <epoxy/gl.h>
|
#include <epoxy/gl.h>
|
||||||
#else
|
#else
|
||||||
#if defined(__APPLE__)
|
|
||||||
#include <OpenGL/gl.h>
|
|
||||||
#include <OpenGL/gl3.h>
|
|
||||||
#else
|
|
||||||
#include <SDL2/SDL_opengl.h>
|
#include <SDL2/SDL_opengl.h>
|
||||||
#include <SDL2/SDL_opengles2.h>
|
#include <SDL2/SDL_opengles2.h>
|
||||||
#include <SDL2/SDL_opengles2_gl2.h>
|
#include <SDL2/SDL_opengles2_gl2.h>
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
#endif
|
|
||||||
|
|
||||||
// Desktop GL 3.2+ has glDrawElementsBaseVertex() which GL ES and WebGL don't have.
|
// 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)
|
#if !defined(IMGUI_IMPL_OPENGL_ES2) && !defined(IMGUI_IMPL_OPENGL_ES3) && defined(GL_VERSION_3_2)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user