brian/Cardinal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow forcing GLES mode

Browse source 
Signed-off-by: falkTX <falktx@falktx.com>
This commit is contained in:
falkTX 2022-07-05 10:55:17 +01:00
parent e79038812b
commit f4c2c03003
6 changed files with 21 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -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

2
carla

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

2
dpf

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

6
plugins/Makefile
View file

@ -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

6
src/Makefile
View file

@ -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

6
src/Makefile.cardinal.mk
View file

@ -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