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

Consistent macos build flags, allow debug jucewrapper

Browse source
This commit is contained in:
falkTX 2022-08-18 22:57:28 +01:00
parent 6bd74114c7
commit 25b70b9931
4 changed files with 17 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

9
deps/Makefile vendored
View file

@ -120,7 +120,7 @@ ifeq ($(MACOS),true)
ifneq (,$(findstring -arch$(SPACE),$(CXXFLAGS)))
CMAKE += -DCMAKE_OSX_ARCHITECTURES='$(subst $(SPACE),;,$(subst -arch=,,$(filter -arch=%,$(subst -arch$(SPACE),-arch=,$(CXXFLAGS)))))'
else ifeq ($(CIBUILD),true)
$(error CI build requires -march flag on macOS)
$(error CI build requires -arch flag on macOS)
endif
ifneq (,$(findstring -mmacosx-version-min=,$(CXXFLAGS)))
export MACOSX_DEPLOYMENT_TARGET = $(subst -mmacosx-version-min=,,$(filter -mmacosx-version-min=%,$(CXXFLAGS)))
@ -128,7 +128,7 @@ CMAKE += -DCMAKE_OSX_DEPLOYMENT_TARGET=$(MACOSX_DEPLOYMENT_TARGET)
else ifeq ($(CIBUILD),true)
$(error CI build requires -mmacosx-version-min flag on macOS)
endif
CMAKE += -DCMAKE_OSX_SYSROOT=$(shell xcrun --sdk macosx --show-sdk-path)
CMAKE += -DCMAKE_OSX_SYSROOT="macosx"
endif
# fix emar and emranlib usage
@ -147,11 +147,6 @@ CMAKE += -DCMAKE_SYSTEM_NAME=Generic
endif
endif
# fix cmake forcing SDK for us
ifeq ($(MACOS),true)
CMAKE += -DCMAKE_OSX_SYSROOT="macosx"
endif
# fix cross-compilation for windows
ifeq ($(WINDOWS),true)
CMAKE += -G 'Unix Makefiles'