DPF

DISTRHO Plugin Framework
Log | Files | Refs | Submodules | README | LICENSE

commit 4ff990126dcef93090e2e92b9cb544d1f28972e3
parent 7f206b99dcccadbf26376ea6db0b9557800dd97d
Author: falkTX <falktx@falktx.com>
Date:   Sun,  9 Jan 2022 02:49:40 +0000

Move DGL flags to Makefile.base.mk

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

Diffstat:
MMakefile.base.mk | 32++++++++++++++++++++++++++++++++
Mdgl/Makefile | 19-------------------
2 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/Makefile.base.mk b/Makefile.base.mk @@ -427,6 +427,38 @@ endif endif # --------------------------------------------------------------------------------------------------------------------- +# Optional flags + +ifeq ($(NVG_DISABLE_SKIPPING_WHITESPACE),true) +BUILD_CXX_FLAGS += -DNVG_DISABLE_SKIPPING_WHITESPACE +endif + +ifneq ($(NVG_FONT_TEXTURE_FLAGS),) +BUILD_CXX_FLAGS += -DNVG_FONT_TEXTURE_FLAGS=$(NVG_FONT_TEXTURE_FLAGS) +endif + +ifeq ($(FILE_BROWSER_DISABLED),true) +BUILD_CXX_FLAGS += -DDGL_FILE_BROWSER_DISABLED +endif + +ifeq ($(USE_OPENGL3),true) +BUILD_CXX_FLAGS += -DDGL_USE_OPENGL3 +endif + +ifeq ($(USE_NANOVG_FBO),true) +BUILD_CXX_FLAGS += -DDGL_USE_NANOVG_FBO +endif + +ifeq ($(USE_NANOVG_FREETYPE),true) +BUILD_CXX_FLAGS += -DFONS_USE_FREETYPE $(shell $(PKG_CONFIG) --cflags freetype2) +endif + +ifeq ($(USE_RGBA),true) +BUILD_CXX_FLAGS += -DDGL_USE_RGBA +endif + + +# --------------------------------------------------------------------------------------------------------------------- # Set app extension ifeq ($(WINDOWS),true) diff --git a/dgl/Makefile b/dgl/Makefile @@ -13,25 +13,6 @@ BUILD_CXX_FLAGS += $(DGL_FLAGS) -I. -Isrc -DDONT_SET_USING_DGL_NAMESPACE -Wno-un BUILD_CXX_FLAGS += -Isrc/pugl-upstream/include LINK_FLAGS += $(DGL_LIBS) -ifeq ($(NVG_DISABLE_SKIPPING_WHITESPACE),true) -BUILD_CXX_FLAGS += -DNVG_DISABLE_SKIPPING_WHITESPACE -endif -ifneq ($(NVG_FONT_TEXTURE_FLAGS),) -BUILD_CXX_FLAGS += -DNVG_FONT_TEXTURE_FLAGS=$(NVG_FONT_TEXTURE_FLAGS) -endif -ifeq ($(USE_OPENGL3),true) -BUILD_CXX_FLAGS += -DDGL_USE_OPENGL3 -endif -ifeq ($(USE_NANOVG_FBO),true) -BUILD_CXX_FLAGS += -DDGL_USE_NANOVG_FBO -endif -ifeq ($(USE_NANOVG_FREETYPE),true) -BUILD_CXX_FLAGS += -DFONS_USE_FREETYPE $(shell $(PKG_CONFIG) --cflags freetype2) -endif -ifeq ($(USE_RGBA),true) -BUILD_CXX_FLAGS += -DDGL_USE_RGBA -endif - # TODO fix these after pugl-upstream is done BUILD_CXX_FLAGS += -Wno-attributes -Wno-extra -Wno-missing-field-initializers ifneq ($(MACOS),true)