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

Simplify makefile a bit

Browse source
This commit is contained in:
falkTX 2022-08-09 23:39:16 +01:00
parent ec4c65ff37
commit 69072da3c9
4 changed files with 6 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/build.yml vendored
View file

@ -4,7 +4,7 @@ on:
push: push:
env: env:
CACHE_VERSION: 29 CACHE_VERSION: 30
CARDINAL_UNDER_WINE: 1 CARDINAL_UNDER_WINE: 1
DEBIAN_FRONTEND: noninteractive DEBIAN_FRONTEND: noninteractive
HOMEBREW_NO_AUTO_UPDATE: 1 HOMEBREW_NO_AUTO_UPDATE: 1

9
deps/Makefile vendored
View file

@ -66,15 +66,12 @@ BUILD_CXX_FLAGS += -U_GLIBCXX_ASSERTIONS -Wp,-U_GLIBCXX_ASSERTIONS
# -------------------------------------------------------------- # --------------------------------------------------------------
# override VCV arch.mk stuff so we can build more architectures # override VCV arch.mk stuff so we can build more architectures
ifeq ($(CPU_AARCH64),true) ifeq ($(CPU_ARM32),true)
ARCH_NAME = aarch64 ARCH_NAME = arm
MACHINE = x86_64-the-rack MACHINE = i686-the-rack
else ifeq ($(CPU_ARM64),true) else ifeq ($(CPU_ARM64),true)
ARCH_NAME = arm64 ARCH_NAME = arm64
MACHINE = x86_64-the-rack MACHINE = x86_64-the-rack
else ifeq ($(CPU_ARM),true)
ARCH_NAME = arm
MACHINE = i686-the-rack
else ifeq ($(WASM),true) else ifeq ($(WASM),true)
MACHINE = i686-wasm MACHINE = i686-wasm
else else

2
dpf

@ -1 +1 @@
Subproject commit f1925ebcc22a412ac2ae5c5b5d2c50851052654d Subproject commit 639c5100f2ac0a8ce2077f29020e91f673d7c2f8

5
plugins/Makefile
View file

@ -1042,10 +1042,7 @@ BASE_FLAGS += -ffat-lto-objects
endif endif
endif endif
ifeq ($(BSD),true) ifeq ($(BSD)$(WASM),true)
BASE_FLAGS += -D'aligned_alloc_16(ptr)'='aligned_alloc(16,ptr)'
BASE_FLAGS += -D'aligned_free_16(ptr)'='free(ptr)'
else ifeq ($(WASM),true)
BASE_FLAGS += -D'aligned_alloc_16(ptr)'='aligned_alloc(16,ptr)' BASE_FLAGS += -D'aligned_alloc_16(ptr)'='aligned_alloc(16,ptr)'
BASE_FLAGS += -D'aligned_free_16(ptr)'='free(ptr)' BASE_FLAGS += -D'aligned_free_16(ptr)'='free(ptr)'
endif endif