From d634f55fffde8e6679a66971efb2eac2710c2e38 Mon Sep 17 00:00:00 2001 From: falkTX Date: Mon, 14 Feb 2022 23:24:23 +0000 Subject: [PATCH] Fix -fno-finite-math-only for CI builds --- plugins/Makefile | 1 - src/Makefile | 7 +++---- src/Makefile.cardinal.mk | 5 ++--- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/plugins/Makefile b/plugins/Makefile index 69d964a..b5c8bd2 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -722,7 +722,6 @@ BASE_FLAGS += -DARCH_LIN endif BASE_FLAGS += -DBUILDING_PLUGIN_MODULES -BASE_FLAGS += -fno-finite-math-only BASE_FLAGS += -fno-strict-aliasing BASE_FLAGS += -I../dpf/dgl/src/nanovg BASE_FLAGS += -I../dpf/distrho diff --git a/src/Makefile b/src/Makefile index 05df6b1..25eba84 100644 --- a/src/Makefile +++ b/src/Makefile @@ -32,11 +32,8 @@ else BASE_FLAGS += -DARCH_LIN endif -BASE_FLAGS += -fno-finite-math-only BASE_FLAGS += -fno-strict-aliasing - BASE_FLAGS += -DPRIVATE= - BASE_FLAGS += -I../dpf/dgl/src/nanovg BASE_FLAGS += -I../dpf/distrho BASE_FLAGS += -I../include @@ -90,8 +87,10 @@ 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 -# use our custom function to filter out VCV trademarks +# 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 2a6ba23..f9c513c 100644 --- a/src/Makefile.cardinal.mk +++ b/src/Makefile.cardinal.mk @@ -129,11 +129,8 @@ else BASE_FLAGS += -DARCH_LIN endif -BASE_FLAGS += -fno-finite-math-only BASE_FLAGS += -fno-strict-aliasing - BASE_FLAGS += -DPRIVATE= - BASE_FLAGS += -I.. BASE_FLAGS += -I../../dpf/dgl/src/nanovg BASE_FLAGS += -I../../include @@ -174,6 +171,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 # -------------------------------------------------------------- # FIXME lots of warnings from VCV side