Allow forcing GLES mode

Signed-off-by: falkTX <falktx@falktx.com>

Makefile

@@ -97,8 +97,7 @@ endif
 # --------------------------------------------------------------
 # Check for X11+OpenGL dependencies (unless headless build)
 
-ifneq ($(HAIKU_OR_MACOS_OR_WINDOWS),true)
-ifneq ($(WASM),true)
+ifneq ($(HAIKU_OR_MACOS_OR_WASM_OR_WINDOWS),true)
 ifneq ($(HEADLESS),true)
 
 ifneq ($(HAVE_OPENGL),true)
@@ -125,7 +124,6 @@ CARLA_EXTRA_ARGS += HAVE_XCURSOR=false
 CARLA_EXTRA_ARGS += HAVE_XEXT=false
 CARLA_EXTRA_ARGS += HAVE_XRANDR=false
 
-endif
 endif
 endif
 

carla

@@ -1 +1 @@
-Subproject commit 770364fd8e684d08aa08f74d88c6d8cb41f77c21
+Subproject commit ca15445429d7ff872fd40db23e24840cc6b90436

dpf

@@ -1 +1 @@
-Subproject commit 194f04aee8396c98f320052626603d77a1b1931e
+Subproject commit 717c7596c29530998fc8522d000c9e856618a56b

plugins/Makefile

@@ -1004,6 +1004,12 @@ ifeq ($(NOPLUGINS),true)
 BASE_FLAGS += -DNOPLUGINS
 endif
 
+ifeq ($(USE_GLES2),true)
+BASE_FLAGS += -DNANOVG_GLES2_FORCED
+else ifeq ($(USE_GLES3),true)
+BASE_FLAGS += -DNANOVG_GLES3_FORCED
+endif
+
 ifeq ($(shell $(PKG_CONFIG) --exists sndfile && echo true),true)
 BASE_FLAGS += -DHAVE_SNDFILE
 endif

src/Makefile

@@ -95,6 +95,12 @@ BASE_FLAGS += -I../include/mingw-compat
 BASE_FLAGS += -I../include/mingw-std-threads
 endif
 
+ifeq ($(USE_GLES2),true)
+BASE_FLAGS += -DNANOVG_GLES2_FORCED
+else ifeq ($(USE_GLES3),true)
+BASE_FLAGS += -DNANOVG_GLES3_FORCED
+endif
+
 BUILD_C_FLAGS += -std=gnu11
 BUILD_C_FLAGS += -fno-finite-math-only -fno-strict-aliasing
 BUILD_CXX_FLAGS += -fno-finite-math-only -fno-strict-aliasing

src/Makefile.cardinal.mk

@@ -178,6 +178,12 @@ BASE_FLAGS += -I../../include/mingw-compat
 BASE_FLAGS += -I../../include/mingw-std-threads
 endif
 
+ifeq ($(USE_GLES2),true)
+BASE_FLAGS += -DNANOVG_GLES2_FORCED
+else ifeq ($(USE_GLES3),true)
+BASE_FLAGS += -DNANOVG_GLES3_FORCED
+endif
+
 BUILD_C_FLAGS += -std=gnu11
 BUILD_C_FLAGS += -fno-finite-math-only -fno-strict-aliasing
 BUILD_CXX_FLAGS += -fno-finite-math-only -fno-strict-aliasing