Cleanup

Signed-off-by: falkTX <[email protected]>
DISTRHO · May 10, 2024 · d855726 · d855726
1 parent fffc4a3
commit d855726
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 31 deletions.
diff --git a/Makefile.base.mk b/Makefile.base.mk
@@ -600,11 +600,11 @@ SHARED_MEMORY_LIBS = -lrt
 endif
 
 # ---------------------------------------------------------------------------------------------------------------------
-# Backwards-compatible HAVE_DGL
+# Generic HAVE_DGL
 
 ifeq ($(HAIKU_OR_MACOS_OR_WASM_OR_WINDOWS),true)
 HAVE_DGL = true
-else ifeq ($(HAVE_OPENGL),true)
+else
 HAVE_DGL = $(HAVE_X11)
 endif
 

diff --git a/dgl/Makefile b/dgl/Makefile
@@ -113,25 +113,12 @@ endif
 
 # ---------------------------------------------------------------------------------------------------------------------
 
-OBJS_web = $(OBJS_common) \
-	$(BUILD_DIR)/dgl/Web.cpp.o
-
-ifeq ($(MACOS),true)
-OBJS_web += $(BUILD_DIR)/dgl/pugl.mm.o
-else
-OBJS_web += $(BUILD_DIR)/dgl/pugl.cpp.o
-endif
-
-# ---------------------------------------------------------------------------------------------------------------------
-
 ifeq ($(HAVE_CAIRO),true)
 TARGETS += $(BUILD_DIR)/libdgl-cairo.a
 endif
 
 ifeq ($(HAVE_OPENGL),true)
 TARGETS += $(BUILD_DIR)/libdgl-opengl.a
-# Compat name, to be removed soon
-TARGETS += $(BUILD_DIR)/libdgl.a
 endif
 
 ifeq ($(HAVE_STUB),true)
@@ -185,17 +172,6 @@ $(BUILD_DIR)/libdgl-vulkan.a: $(OBJS_vulkan)
 	$(SILENT)rm -f $@
 	$(SILENT)$(AR) crs $@ $^
 
-$(BUILD_DIR)/libdgl-web.a: $(OBJS_web)
-	-@mkdir -p $(BUILD_DIR)
-	@echo "Creating libdgl-web.a"
-	$(SILENT)rm -f $@
-	$(SILENT)$(AR) crs $@ $^
-
-# Compat name, to be removed soon
-$(BUILD_DIR)/libdgl.a: $(BUILD_DIR)/libdgl-opengl.a
-	@echo "Symlinking libdgl.a"
-	$(SILENT)ln -sf $< $@
-
 # ---------------------------------------------------------------------------------------------------------------------
 
 $(BUILD_DIR)/dgl/%.c.o: src/%.c
@@ -289,6 +265,5 @@ debug:
 -include $(OBJS_opengl3:%.o=%.d)
 -include $(OBJS_stub:%.o=%.d)
 -include $(OBJS_vulkan:%.o=%.d)
--include $(OBJS_web:%.o=%.d)
 
 # ---------------------------------------------------------------------------------------------------------------------
diff --git a/distrho/src/DistrhoPluginChecks.h b/distrho/src/DistrhoPluginChecks.h
@@ -200,12 +200,9 @@
 // --------------------------------------------------------------------------------------------------------------------
 // Disable UI if DGL is not available
 
-#if (defined(DGL_CAIRO) && ! defined(HAVE_CAIRO)) || (defined(DGL_OPENGL) && ! defined(HAVE_OPENGL))
+#if DISTRHO_PLUGIN_HAS_UI && !defined(HAVE_DGL)
 # undef DISTRHO_PLUGIN_HAS_UI
 # define DISTRHO_PLUGIN_HAS_UI 0
-# ifdef HAVE_DGL
-#  error HAVE_DGL is defined in a wrong configuration
-# endif
 #endif
 
 // --------------------------------------------------------------------------------------------------------------------