From fcca6317ecae5c8c6368e65eca6c96182a4dfb8e Mon Sep 17 00:00:00 2001 From: Jean Pierre Cimalando Date: Sun, 27 Sep 2020 17:14:54 +0200 Subject: [PATCH] mk: reorganize the link flags, add dbghelp under Windows --- common.mk | 26 ++++++++++++++++++++++++++ dpf.mk | 10 ---------- rack.mk | 10 ---------- 3 files changed, 26 insertions(+), 20 deletions(-) diff --git a/common.mk b/common.mk index a403c542f..c5fba852e 100644 --- a/common.mk +++ b/common.mk @@ -26,6 +26,13 @@ SFIZZ_CPU_AARCH64 := 1 SFIZZ_CPU_ARM_OR_AARCH64 := 1 endif +ifneq (,$(findstring linux,$(SFIZZ_MACHINE))) +SFIZZ_OS_LINUX := 1 +endif +ifneq (,$(findstring mingw,$(SFIZZ_MACHINE))) +SFIZZ_OS_WINDOWS := 1 +endif + ### SFIZZ_C_FLAGS = -I$(SFIZZ_DIR)/src @@ -227,6 +234,10 @@ SFIZZ_SOURCES += \ SFIZZ_SOURCES += \ external/abseil-cpp/absl/numeric/int128.cc +ifdef SFIZZ_OS_WINDOWS +SFIZZ_LINK_FLAGS += -ldbghelp +endif + ### Spline dependency SFIZZ_C_FLAGS += -I$(SFIZZ_DIR)/src/external/spline @@ -263,5 +274,20 @@ SFIZZ_SOURCES += \ src/external/tunings/src/Tunings.cpp ### jsl dependency + SFIZZ_CXX_FLAGS += \ -I$(SFIZZ_DIR)/external/jsl/include + +### math dependency + +ifdef SFIZZ_OS_LINUX +SFIZZ_LINK_FLAGS += -lm +endif + +### pthread dependency + +ifdef SFIZZ_OS_LINUX +SFIZZ_C_FLAGS += -pthread +SFIZZ_CXX_FLAGS += -pthread +SFIZZ_LINK_FLAGS += -pthread +endif diff --git a/dpf.mk b/dpf.mk index d53616921..915db1663 100644 --- a/dpf.mk +++ b/dpf.mk @@ -41,16 +41,6 @@ SFIZZ_LINK_FLAGS = $(SFIZZ_BUILD_DIR)/libsfizz.a SFIZZ_PKG_CONFIG ?= $(PKG_CONFIG) include $(SFIZZ_DIR)/common.mk -ifeq ($(LINUX),true) -SFIZZ_C_FLAGS += -pthread -SFIZZ_CXX_FLAGS += -pthread -SFIZZ_LINK_FLAGS += -pthread -endif - -ifeq ($(LINUX),true) -SFIZZ_LINK_FLAGS += -lm -endif - sfizz-all: sfizz-lib sfizz-lib: $(SFIZZ_BUILD_DIR)/libsfizz.a diff --git a/rack.mk b/rack.mk index e485e2370..4f8d25127 100644 --- a/rack.mk +++ b/rack.mk @@ -47,16 +47,6 @@ include $(SFIZZ_DIR)/common.mk ### -ifdef ARCH_LIN -SFIZZ_C_FLAGS += -pthread -SFIZZ_CXX_FLAGS += -pthread -SFIZZ_LINK_FLAGS += -pthread -endif - -ifdef ARCH_LIN -SFIZZ_LINK_FLAGS += -lm -endif - SFIZZ_TARGET := $(SFIZZ_BUILD_DIR)/libsfizz.a ###