From cd02ffe80f375911a356c1258433668314b6bbae Mon Sep 17 00:00:00 2001 From: falkTX Date: Fri, 25 Feb 2022 18:37:38 +0000 Subject: [PATCH] Fix build Signed-off-by: falkTX --- deps/Makefile | 4 ++-- plugins/Makefile | 11 ++++++++--- src/Makefile | 5 ++--- src/Makefile.cardinal.mk | 5 ++--- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/deps/Makefile b/deps/Makefile index 924ea9c..1d77f37 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -54,8 +54,8 @@ BASE_FLAGS += -I../include/mingw-compat BASE_FLAGS += -I../include/mingw-std-threads endif -BUILD_C_FLAGS += -fno-finite-math-only -BUILD_CXX_FLAGS += -fno-finite-math-only +BUILD_C_FLAGS += -fno-finite-math-only -fno-strict-aliasing +BUILD_CXX_FLAGS += -fno-finite-math-only -fno-strict-aliasing # Rack code is not tested for this flag, unset it BUILD_CXX_FLAGS += -U_GLIBCXX_ASSERTIONS -Wp,-U_GLIBCXX_ASSERTIONS diff --git a/plugins/Makefile b/plugins/Makefile index 5a44d27..4a3eb77 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -574,6 +574,9 @@ JW_CUSTOM = PlayHead Quantizer PLUGIN_FILES += $(wildcard kocmoc/src/*.cpp) +# modules/types which are present in other plugins +KOCMOC_CUSTOM = Phasor __ct_base __ct_comp + # -------------------------------------------------------------- # LifeFormModular @@ -587,6 +590,9 @@ LIFEFORMMODULAR_CUSTOM = IO MS __ct_base __ct_comp PLUGIN_FILES += $(wildcard LilacLoop/src/*.cpp) +# modules/types which are present in other plugins +LILACLOOP_CUSTOM = AudioFile Mode + # -------------------------------------------------------------- # LittleUtils @@ -809,7 +815,6 @@ BASE_FLAGS += -DARCH_LIN endif BASE_FLAGS += -DBUILDING_PLUGIN_MODULES -BASE_FLAGS += -fno-strict-aliasing BASE_FLAGS += -I../dpf/dgl/src/nanovg BASE_FLAGS += -I../dpf/distrho @@ -879,8 +884,8 @@ BASE_FLAGS += -DHAVE_SNDFILE endif BUILD_C_FLAGS += -std=gnu11 -BUILD_C_FLAGS += -fno-finite-math-only -BUILD_CXX_FLAGS += -fno-finite-math-only +BUILD_C_FLAGS += -fno-finite-math-only -fno-strict-aliasing +BUILD_CXX_FLAGS += -fno-finite-math-only -fno-strict-aliasing # Rack code is not tested for this flag, unset it BUILD_CXX_FLAGS += -U_GLIBCXX_ASSERTIONS -Wp,-U_GLIBCXX_ASSERTIONS diff --git a/src/Makefile b/src/Makefile index e370fa5..f5c196e 100644 --- a/src/Makefile +++ b/src/Makefile @@ -36,7 +36,6 @@ ifeq ($(HAIKU),true) BASE_FLAGS += -I../include/haiku-compat endif -BASE_FLAGS += -fno-strict-aliasing BASE_FLAGS += -DPRIVATE= BASE_FLAGS += -I../dpf/dgl/src/nanovg BASE_FLAGS += -I../dpf/distrho @@ -95,8 +94,8 @@ BASE_FLAGS += -I../include/mingw-std-threads endif BUILD_C_FLAGS += -std=gnu11 -BUILD_C_FLAGS += -fno-finite-math-only -BUILD_CXX_FLAGS += -fno-finite-math-only +BUILD_C_FLAGS += -fno-finite-math-only -fno-strict-aliasing +BUILD_CXX_FLAGS += -fno-finite-math-only -fno-strict-aliasing # use our custom function to invert some colors BUILD_CXX_FLAGS += -DnsvgParseFromFile=nsvgParseFromFileCardinal diff --git a/src/Makefile.cardinal.mk b/src/Makefile.cardinal.mk index b3b06d8..fe4022f 100644 --- a/src/Makefile.cardinal.mk +++ b/src/Makefile.cardinal.mk @@ -129,7 +129,6 @@ else BASE_FLAGS += -DARCH_LIN endif -BASE_FLAGS += -fno-strict-aliasing BASE_FLAGS += -DPRIVATE= BASE_FLAGS += -I.. BASE_FLAGS += -I../../dpf/dgl/src/nanovg @@ -170,8 +169,8 @@ BASE_FLAGS += -I../../include/mingw-std-threads endif BUILD_C_FLAGS += -std=gnu11 -BUILD_C_FLAGS += -fno-finite-math-only -BUILD_CXX_FLAGS += -fno-finite-math-only +BUILD_C_FLAGS += -fno-finite-math-only -fno-strict-aliasing +BUILD_CXX_FLAGS += -fno-finite-math-only -fno-strict-aliasing # Rack code is not tested for this flag, unset it BUILD_CXX_FLAGS += -U_GLIBCXX_ASSERTIONS -Wp,-U_GLIBCXX_ASSERTIONS