This commit is contained in:
Giovanni Cascione 2024-09-22 19:13:35 +02:00
parent eca592d245
commit 030388032f
3 changed files with 11 additions and 8 deletions

View File

@ -45,7 +45,7 @@ ifeq ($(platform), rpi3_64)
LDFLAGS += -shared -Wl,--version-script=$(ROOT_PATH)/link.T -fPIC
CFLAGS += -fPIC -mcpu=cortex-a53 -mtune=cortex-a53 -fomit-frame-pointer -ffast-math
CXXFLAGS = $(CFLAGS) -frtti -std=c++11
HAVE_OPENGLES2 :=1
HAVE_OPENGLES2 := 1
# Raspberry Pi 4 (64 bit)
else ifeq ($(platform), rpi4_64)
@ -477,6 +477,7 @@ else ifeq ($(platform), win)
DEFINES += -DHAVE_FSEEKO -DHAVE_INTTYPES_H -fPIC
CXXFLAGS += -fno-permissive
LDFLAGS += -shared -static-libgcc -static-libstdc++ -s -Wl,--version-script=$(ROOT_PATH)/link.T -fPIC
GLLIB := -lopengl32
ifneq ($(TARGET_64BIT),1)
DEFINES += -DRETRO_CALLCONV=__cdecl
endif
@ -488,6 +489,7 @@ else ifeq ($(platform), osx)
LDFLAGS += -dynamiclib -fPIC
CXXFLAGS := -std=c++11
HAVE_OPENGL := 1
GLLIB := -framework OpenGL
ifeq ($(CROSS_COMPILE),1)
TARGET_RULE = -target $(LIBRETRO_APPLE_PLATFORM) -isysroot $(LIBRETRO_APPLE_ISYSROOT)
CFLAGS += $(TARGET_RULE)

View File

@ -140,21 +140,21 @@ ifeq ($(or $(HAVE_OPENGL), $(HAVE_OPENGLES2)), 1)
DEFINES += -DUSE_OPENGL -DUSE_OPENGL_GAME -DUSE_OPENGL_SHADERS
ifeq ($(HAVE_OPENGL), 1)
DEFINES += -DHAVE_OPENGL
GLES_MODE:= 0
GLLIB := -lGL
GLES_MODE := 0
GLLIB ?= -lGL
$(info Support for OpenGL requested)
else
DEFINES += -DHAVE_OPENGLES2
GLES_MODE:= 2
GLLIB := -lGLESv2
GLES_MODE := 2
GLLIB ?= -lGLESv2
$(info Support for OpenGLES2 requested)
endif
ifeq ($(USE_GLAD), 1)
DEFINES += -DUSE_GLAD
#else
# DEFINES += -DUSE_GLES_MODE=$(GLES_MODE)
# LDFLAGS += $(GLLIB)
else
DEFINES += -DUSE_GLES_MODE=$(GLES_MODE)
LDFLAGS += $(GLLIB)
endif
else

View File

@ -62,4 +62,5 @@
#define GL_STACK_OVERFLOW_KHR GL_STACK_OVERFLOW
#define GL_STACK_UNDERFLOW_KHR GL_STACK_UNDERFLOW
#include "glsym/glsym.h"
#undef TRANSPARENT
#endif