Browse Source

Alternative build fix

Signed-off-by: falkTX <falktx@falktx.com>
tags/22.12
falkTX 2 years ago
parent
commit
c90850602d
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
4 changed files with 13 additions and 7 deletions
  1. +9
    -3
      deps/Makefile
  2. +1
    -1
      plugins/Makefile
  3. +1
    -1
      src/Makefile
  4. +2
    -2
      src/Makefile.cardinal.mk

+ 9
- 3
deps/Makefile View File

@@ -34,15 +34,21 @@ 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

ifeq ($(HEADLESS),true)
ifeq ($(WITH_LTO),true)
ifeq ($(MOD_BUILD)$(WITH_LTO),true)
BASE_FLAGS += -ffat-lto-objects
endif
endif

ifneq ($(SYSDEPS),true)
BASE_FLAGS += -DZSTDLIB_VISIBILITY=


+ 1
- 1
plugins/Makefile View File

@@ -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=11
BUILD_CXX_FLAGS += -fabi-version=12
endif
endif



+ 1
- 1
src/Makefile View File

@@ -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=11
BUILD_CXX_FLAGS += -fabi-version=12
endif
endif



+ 2
- 2
src/Makefile.cardinal.mk View File

@@ -289,8 +289,8 @@ 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=11
LINK_FLAGS += -fabi-version=11
BUILD_CXX_FLAGS += -fabi-version=12
LINK_FLAGS += -fabi-version=12
endif
endif



Loading…
Cancel
Save