From bf4be75cb7b863b2d6901e34f98d1b92e0790c74 Mon Sep 17 00:00:00 2001
From: falkTX <falktx@falktx.com>
Date: Sun, 18 Dec 2022 22:13:28 +0000
Subject: [PATCH] Fix MOD builds

Signed-off-by: falkTX <falktx@falktx.com>
---
 deps/Makefile            |  8 --------
 plugins/Makefile         | 11 ++++++-----
 src/Makefile             |  7 ++++++-
 src/Makefile.cardinal.mk |  3 +--
 4 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/deps/Makefile b/deps/Makefile
index 6c83d0e..8b4ec3f 100644
--- a/deps/Makefile
+++ b/deps/Makefile
@@ -34,14 +34,6 @@ endif
 BASE_FLAGS += -I$(abspath ../include)
 BASE_FLAGS += -I$(abspath ../include/simd-compat)
 
-# SSE must always be enabled, even in debug builds
-ifeq ($(CPU_I386_OR_X86_64),true)
-BASE_FLAGS += -msse -msse2 -msse3
-ifeq ($(WASM),true)
-BASE_FLAGS += -msimd128
-endif
-endif
-
 ifeq ($(HAIKU)$(WASM),true)
 BASE_FLAGS += -I$(abspath ../include/linux-compat)
 endif
diff --git a/plugins/Makefile b/plugins/Makefile
index 0ba155c..e6f7057 100644
--- a/plugins/Makefile
+++ b/plugins/Makefile
@@ -1145,9 +1145,9 @@ BASE_FLAGS += -I../src/Rack/dep/pffft
 
 # SSE must always be enabled, even in debug builds
 ifeq ($(CPU_I386_OR_X86_64),true)
-BASE_FLAGS += -msse -msse2 -msse3
+BASE_FLAGS += -msse -msse2
 ifeq ($(WASM),true)
-BASE_FLAGS += -msimd128
+BASE_FLAGS += -msse3 -msimd128
 endif
 endif
 
@@ -1202,7 +1202,7 @@ BUILD_CXX_FLAGS += -fno-finite-math-only -fno-strict-aliasing
 ifneq ($(MACOS),true)
 BUILD_CXX_FLAGS += -faligned-new -Wno-abi
 ifeq ($(MOD_BUILD),true)
-BUILD_CXX_FLAGS += -fabi-version=12
+BUILD_CXX_FLAGS += -std=gnu++17
 endif
 endif
 
@@ -1212,8 +1212,9 @@ BUILD_CXX_FLAGS += -U_GLIBCXX_ASSERTIONS -Wp,-U_GLIBCXX_ASSERTIONS
 # Ignore bad behaviour from Rack API
 BUILD_CXX_FLAGS += -Wno-format-security
 
-ifeq ($(WASM),true)
-BUILD_CXX_FLAGS += -fexceptions
+# Ignore warnings from simde
+ifeq ($(MOD_BUILD),true)
+BUILD_CXX_FLAGS += -Wno-overflow
 endif
 
 # --------------------------------------------------------------
diff --git a/src/Makefile b/src/Makefile
index aaa90ac..170ebc2 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -113,7 +113,7 @@ BUILD_CXX_FLAGS += -fno-finite-math-only -fno-strict-aliasing
 ifneq ($(MACOS),true)
 BUILD_CXX_FLAGS += -faligned-new -Wno-abi
 ifeq ($(MOD_BUILD),true)
-BUILD_CXX_FLAGS += -fabi-version=12
+BUILD_CXX_FLAGS += -std=gnu++17
 endif
 endif
 
@@ -127,6 +127,11 @@ BUILD_CXX_FLAGS += -U_GLIBCXX_ASSERTIONS -Wp,-U_GLIBCXX_ASSERTIONS
 # Ignore bad behaviour from Rack API
 BUILD_CXX_FLAGS += -Wno-format-security
 
+# Ignore warnings from simde
+ifeq ($(MOD_BUILD),true)
+BUILD_CXX_FLAGS += -Wno-overflow
+endif
+
 # --------------------------------------------------------------
 # Rack files to build
 
diff --git a/src/Makefile.cardinal.mk b/src/Makefile.cardinal.mk
index 444b01d..05e9f22 100644
--- a/src/Makefile.cardinal.mk
+++ b/src/Makefile.cardinal.mk
@@ -289,8 +289,7 @@ BUILD_CXX_FLAGS += -fno-finite-math-only -fno-strict-aliasing
 ifneq ($(MACOS),true)
 BUILD_CXX_FLAGS += -faligned-new -Wno-abi
 ifeq ($(MOD_BUILD),true)
-BUILD_CXX_FLAGS += -fabi-version=12
-LINK_FLAGS      += -fabi-version=12
+BUILD_CXX_FLAGS += -std=gnu++17
 endif
 endif