From 70078d30a0c977bd2877a9599cf98781a7807cd5 Mon Sep 17 00:00:00 2001 From: falkTX Date: Fri, 14 May 2021 09:50:14 +0100 Subject: [PATCH] Allow *.S files; Cleanup Signed-off-by: falkTX --- Makefile.plugins.mk | 5 +++++ distrho/DistrhoUI.hpp | 10 +--------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/Makefile.plugins.mk b/Makefile.plugins.mk index e58176fc..5e3b9986 100644 --- a/Makefile.plugins.mk +++ b/Makefile.plugins.mk @@ -131,6 +131,11 @@ all: # --------------------------------------------------------------------------------------------------------------------- # Common +$(BUILD_DIR)/%.S.o: %.S + -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" + @echo "Compiling $<" + @$(CC) $< $(BUILD_C_FLAGS) -c -o $@ + $(BUILD_DIR)/%.c.o: %.c -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" @echo "Compiling $<" diff --git a/distrho/DistrhoUI.hpp b/distrho/DistrhoUI.hpp index c5db90c3..009f0f82 100644 --- a/distrho/DistrhoUI.hpp +++ b/distrho/DistrhoUI.hpp @@ -1,6 +1,6 @@ /* * DISTRHO Plugin Framework (DPF) - * Copyright (C) 2012-2020 Filipe Coelho + * Copyright (C) 2012-2021 Filipe Coelho * * Permission to use, copy, modify, and/or distribute this software for any purpose with * or without fee is hereby granted, provided that the above copyright notice and this @@ -263,14 +263,6 @@ private: friend class UIExporter; friend class UIExporterWindow; -#if !DISTRHO_PLUGIN_HAS_EXTERNAL_UI - // these should not be used - void setAbsoluteX(int) const noexcept {} - void setAbsoluteY(int) const noexcept {} - void setAbsolutePos(int, int) const noexcept {} - void setAbsolutePos(const DGL_NAMESPACE::Point&) const noexcept {} -#endif - DISTRHO_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(UI) };