brian/Cardinal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix MOD builds

Browse source 
Signed-off-by: falkTX <falktx@falktx.com>
This commit is contained in:
falkTX 2022-12-18 22:13:28 +00:00
parent d2b51b442f
commit bf4be75cb7
No known key found for this signature in database
GPG key ID: CDBAA37ABC74FBA0
4 changed files with 13 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

8
deps/Makefile vendored
View file

@ -34,14 +34,6 @@ endif
BASE_FLAGS += -I$(abspath ../include) BASE_FLAGS += -I$(abspath ../include)
BASE_FLAGS += -I$(abspath ../include/simd-compat) 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) ifeq ($(HAIKU)$(WASM),true)
BASE_FLAGS += -I$(abspath ../include/linux-compat) BASE_FLAGS += -I$(abspath ../include/linux-compat)
endif endif

11
plugins/Makefile
View file

@ -1145,9 +1145,9 @@ BASE_FLAGS += -I../src/Rack/dep/pffft
# SSE must always be enabled, even in debug builds # SSE must always be enabled, even in debug builds
ifeq ($(CPU_I386_OR_X86_64),true) ifeq ($(CPU_I386_OR_X86_64),true)
BASE_FLAGS += -msse -msse2 -msse3 BASE_FLAGS += -msse -msse2
ifeq ($(WASM),true) ifeq ($(WASM),true)
BASE_FLAGS += -msimd128 BASE_FLAGS += -msse3 -msimd128
endif endif
endif endif
@ -1202,7 +1202,7 @@ BUILD_CXX_FLAGS += -fno-finite-math-only -fno-strict-aliasing
ifneq ($(MACOS),true) ifneq ($(MACOS),true)
BUILD_CXX_FLAGS += -faligned-new -Wno-abi BUILD_CXX_FLAGS += -faligned-new -Wno-abi
ifeq ($(MOD_BUILD),true) ifeq ($(MOD_BUILD),true)
BUILD_CXX_FLAGS += -fabi-version=12 BUILD_CXX_FLAGS += -std=gnu++17
endif endif
endif endif
@ -1212,8 +1212,9 @@ BUILD_CXX_FLAGS += -U_GLIBCXX_ASSERTIONS -Wp,-U_GLIBCXX_ASSERTIONS
# Ignore bad behaviour from Rack API # Ignore bad behaviour from Rack API
BUILD_CXX_FLAGS += -Wno-format-security BUILD_CXX_FLAGS += -Wno-format-security
ifeq ($(WASM),true) # Ignore warnings from simde
BUILD_CXX_FLAGS += -fexceptions ifeq ($(MOD_BUILD),true)
BUILD_CXX_FLAGS += -Wno-overflow
endif endif
# -------------------------------------------------------------- # --------------------------------------------------------------

7
src/Makefile
View file

@ -113,7 +113,7 @@ BUILD_CXX_FLAGS += -fno-finite-math-only -fno-strict-aliasing
ifneq ($(MACOS),true) ifneq ($(MACOS),true)
BUILD_CXX_FLAGS += -faligned-new -Wno-abi BUILD_CXX_FLAGS += -faligned-new -Wno-abi
ifeq ($(MOD_BUILD),true) ifeq ($(MOD_BUILD),true)
BUILD_CXX_FLAGS += -fabi-version=12 BUILD_CXX_FLAGS += -std=gnu++17
endif endif
endif endif
@ -127,6 +127,11 @@ BUILD_CXX_FLAGS += -U_GLIBCXX_ASSERTIONS -Wp,-U_GLIBCXX_ASSERTIONS
# Ignore bad behaviour from Rack API # Ignore bad behaviour from Rack API
BUILD_CXX_FLAGS += -Wno-format-security BUILD_CXX_FLAGS += -Wno-format-security
# Ignore warnings from simde
ifeq ($(MOD_BUILD),true)
BUILD_CXX_FLAGS += -Wno-overflow
endif
# -------------------------------------------------------------- # --------------------------------------------------------------
# Rack files to build # Rack files to build

3
src/Makefile.cardinal.mk
View file

@ -289,8 +289,7 @@ BUILD_CXX_FLAGS += -fno-finite-math-only -fno-strict-aliasing
ifneq ($(MACOS),true) ifneq ($(MACOS),true)
BUILD_CXX_FLAGS += -faligned-new -Wno-abi BUILD_CXX_FLAGS += -faligned-new -Wno-abi
ifeq ($(MOD_BUILD),true) ifeq ($(MOD_BUILD),true)
BUILD_CXX_FLAGS += -fabi-version=12 BUILD_CXX_FLAGS += -std=gnu++17
LINK_FLAGS += -fabi-version=12
endif endif
endif endif