From 4ff990126dcef93090e2e92b9cb544d1f28972e3 Mon Sep 17 00:00:00 2001
From: falkTX <falktx@falktx.com>
Date: Sun, 9 Jan 2022 02:50:07 +0000
Subject: [PATCH] Move DGL flags to Makefile.base.mk

Signed-off-by: falkTX <falktx@falktx.com>
---
 Makefile.base.mk | 32 ++++++++++++++++++++++++++++++++
 dgl/Makefile     | 19 -------------------
 2 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/Makefile.base.mk b/Makefile.base.mk
index b0aaee81..efccd0e3 100644
--- a/Makefile.base.mk
+++ b/Makefile.base.mk
@@ -426,6 +426,38 @@ HAVE_DGL = $(HAVE_X11)
 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
 
diff --git a/dgl/Makefile b/dgl/Makefile
index 590fc1a8..6eb1d192 100644
--- 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)