Skip to content

Commit cfe499f

Browse files
committed
Release 1.0.27
* Updated build scripts. * Updated module versions in dependencies.
2 parents 706f353 + 3cf5368 commit cfe499f

File tree

7 files changed

+40
-20
lines changed

7 files changed

+40
-20
lines changed

CHANGELOG

+4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
* RECENT CHANGES
33
*******************************************************************************
44

5+
=== 1.0.27 ===
6+
* Updated build scripts.
7+
* Updated module versions in dependencies.
8+
59
=== 1.0.26 ===
610
* Updated build scripts.
711
* Updated module versions in dependencies.

include/lsp-plug.in/dsp/version.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
// Define version of headers
2626
#define LSP_DSP_LIB_MAJOR 1
2727
#define LSP_DSP_LIB_MINOR 0
28-
#define LSP_DSP_LIB_MICRO 26
28+
#define LSP_DSP_LIB_MICRO 27
2929

3030
#if defined(__WINDOWS__) || defined(__WIN32__) || defined(__WIN64__) || defined(_WIN64) || defined(_WIN32) || defined(__WINNT) || defined(__WINNT__)
3131
#define LSP_DSP_LIB_EXPORT_MODIFIER __declspec(dllexport)

make/configure.mk

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ MERGED_DEPENDENCIES := \
4949
$(TEST_DEPENDENCIES)
5050
UNIQ_MERGED_DEPENDENCIES := $(call uniq, $(MERGED_DEPENDENCIES))
5151
DEPENDENCIES = $(UNIQ_MERGED_DEPENDENCIES)
52-
FEATURES := $(sort $(call subtraction,$(SUB_FEATURES),$(DEFAULT_FEATURES) $(ADD_FEATURES)))
52+
BUILD_FEATURES := $(sort $(call subtraction,$(SUB_FEATURES),$(if $(FEATURES),$(FEATURES),$(DEFAULT_FEATURES)) $(ADD_FEATURES)))
5353

5454
# Determine versions
5555
ifeq ($(findstring -devel,$(ARTIFACT_VERSION)),-devel)
@@ -270,7 +270,7 @@ $(CONFIG_VARS): prepare
270270
config: $(CONFIG_VARS)
271271
echo "Host architecture: $(HOST_ARCHITECTURE_FAMILY)/$(HOST_ARCHITECTURE) ($(HOST_ARCHITECTURE_CFLAGS))"
272272
echo "Architecture: $(ARCHITECTURE_FAMILY)/$(ARCHITECTURE) ($(ARCHITECTURE_CFLAGS))"
273-
echo "Features: $(FEATURES)"
273+
echo "Features: $(BUILD_FEATURES)"
274274
echo "Configured OK"
275275

276276
help: | pathvars toolvars sysvars

make/system.mk

+19-1
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,17 @@ else
5353
endif
5454
BUILD_ARCH := $(if $(ARCHITECTURE),$(ARCHITECTURE),$(HOST_BUILD_ARCH))
5555

56+
ifeq ($(PLATFORM),Linux)
57+
OBJ_LDFLAGS_X86 = -m elf_i386
58+
OBJ_LDFLAGS_X86_64 = -m elf_x86_64
59+
else ifeq ($(PLATFORM),BSD)
60+
OBJ_LDFLAGS_X86 = -m elf_i386
61+
OBJ_LDFLAGS_X86_64 = -m elf_x86_64
62+
else ifeq ($(PLATFORM),Windows)
63+
OBJ_LDFLAGS_X86 = -m i386pe
64+
OBJ_LDFLAGS_X86_64 = -m i386pep
65+
endif
66+
5667
# Set actual architecture for HOST and TARGET builds
5768
# The current architecture can be obtained by: gcc -Q --help=target
5869
define detect_architecture =
@@ -100,30 +111,37 @@ define detect_architecture =
100111
$(2)_NAME = x86_64
101112
$(2)_FAMILY = x86_64
102113
$(2)_CFLAGS := -march=x86-64 -m64
114+
$(2)_LDFLAGS := $(OBJ_LDFLAGS_X86_64)
103115
else ifeq ($(patsubst %amd64%,amd64,$(1)),amd64)
104116
$(2)_NAME = x86_64
105117
$(2)_FAMILY = x86_64
106118
$(2)_CFLAGS := -march=x86-64 -m64
119+
$(2)_LDFLAGS := $(OBJ_LDFLAGS_X86_64)
107120
else ifeq ($(patsubst %AMD64%,AMD64,$(1)),AMD64)
108121
$(2)_NAME = x86_64
109122
$(2)_FAMILY = x86_64
110123
$(2)_CFLAGS := -march=x86-64 -m64
124+
$(2)_LDFLAGS := $(OBJ_LDFLAGS_X86_64)
111125
else ifeq ($(1),i86pc)
112126
$(2)_NAME = x86_64
113127
$(2)_FAMILY = x86_64
114128
$(2)_CFLAGS := -march=x86-64 -m64
129+
$(2)_LDFLAGS := $(OBJ_LDFLAGS_X86_64)
115130
else ifeq ($(patsubst %i686%,i686,$(1)),i686)
116131
$(2)_NAME = i686
117132
$(2)_FAMILY = ia32
118133
$(2)_CFLAGS := -march=i686 -m32
134+
$(2)_LDFLAGS := $(OBJ_LDFLAGS_X86)
119135
else ifeq ($(patsubst i%86,i586,$(1)),i586)
120136
$(2)_NAME = i586
121137
$(2)_FAMILY = ia32
122138
$(2)_CFLAGS := -march=i586 -m32
139+
$(2)_LDFLAGS := $(OBJ_LDFLAGS_X86)
123140
else ifeq ($(1),x86)
124141
$(2)_NAME = i686
125142
$(2)_FAMILY = ia32
126143
$(2)_CFLAGS := -march=i686 -m32
144+
$(2)_LDFLAGS := $(OBJ_LDFLAGS_X86)
127145
else ifeq ($(1),riscv32)
128146
$(2)_NAME = riscv32
129147
$(2)_FAMILY = riscv32
@@ -191,11 +209,11 @@ COMMON_VARS = \
191209
ARCHITECTURE \
192210
ARCHITECTURE_FAMILY \
193211
ARCHITECTURE_CFLAGS \
212+
BUILD_FEATURES \
194213
CROSS_COMPILE \
195214
DEBUG \
196215
EXECUTABLE_EXT \
197216
EXPORT_SYMBOLS \
198-
FEATURES \
199217
HOST_ARCHITECTURE \
200218
HOST_ARCHITECTURE_FAMILY \
201219
HOST_ARCHITECTURE_CFLAGS \

modules.mk

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@
1919
#
2020

2121
# Variables that describe dependencies
22-
LSP_COMMON_LIB_VERSION := 1.0.38
22+
LSP_COMMON_LIB_VERSION := 1.0.39
2323
LSP_COMMON_LIB_NAME := lsp-common-lib
2424
LSP_COMMON_LIB_TYPE := src
2525
LSP_COMMON_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_COMMON_LIB_NAME).git
2626
LSP_COMMON_LIB_URL_RW := [email protected]:lsp-plugins/$(LSP_COMMON_LIB_NAME).git
2727

28-
LSP_TEST_FW_VERSION := 1.0.27
28+
LSP_TEST_FW_VERSION := 1.0.28
2929
LSP_TEST_FW_NAME := lsp-test-fw
3030
LSP_TEST_FW_TYPE := src
3131
LSP_TEST_FW_URL_RO := https://github.com/lsp-plugins/$(LSP_TEST_FW_NAME).git

project.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ ARTIFACT_ID = LSP_DSP_LIB
2323
ARTIFACT_NAME = lsp-dsp-lib
2424
ARTIFACT_DESC = DSP library for digital signal processing
2525
ARTIFACT_HEADERS = lsp-plug.in
26-
ARTIFACT_VERSION = 1.0.26
26+
ARTIFACT_VERSION = 1.0.27

src/Makefile

+11-13
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
2-
# Copyright (C) 2020 Linux Studio Plugins Project <https://lsp-plug.in/>
3-
# (C) 2020 Vladimir Sadovnikov <[email protected]>
2+
# Copyright (C) 2024 Linux Studio Plugins Project <https://lsp-plug.in/>
3+
# (C) 2024 Vladimir Sadovnikov <[email protected]>
44
#
55
# This file is part of lsp-dsp-lib
66
#
@@ -97,16 +97,14 @@ CXX_OBJ_ALL = \
9797
$(CXX_OBJ_TEST) \
9898
$(CXX_OBJ_NOTEST)
9999

100-
ifneq ($(BUILD_HOST),1)
101-
ifeq ($(ARCHITECTURE_FAMILY),ia32)
102-
CXX_OBJ_EXT += $(CXX_OBJ_X86) $(CXX_OBJ_SSE) $(CXX_OBJ_SSE2) $(CXX_OBJ_SSE3) $(CXX_OBJ_SSE4) $(CXX_OBJ_AVX) $(CXX_OBJ_AVX2) $(CXX_OBJ_AVX512)
103-
else ifeq ($(ARCHITECTURE_FAMILY),x86_64)
104-
CXX_OBJ_EXT += $(CXX_OBJ_X86) $(CXX_OBJ_SSE) $(CXX_OBJ_SSE2) $(CXX_OBJ_SSE3) $(CXX_OBJ_SSE4) $(CXX_OBJ_AVX) $(CXX_OBJ_AVX2) $(CXX_OBJ_AVX512)
105-
else ifeq ($(ARCHITECTURE_FAMILY),arm32)
106-
CXX_OBJ_EXT += $(CXX_OBJ_ARM) $(CXX_OBJ_NEON_D32)
107-
else ifeq ($(ARCHITECTURE_FAMILY),aarch64)
108-
CXX_OBJ_EXT += $(CXX_OBJ_AARCH64) $(CXX_OBJ_ASIMD)
109-
endif
100+
ifeq ($($(HOST)ARCHITECTURE_FAMILY),ia32)
101+
CXX_OBJ_EXT += $(CXX_OBJ_X86) $(CXX_OBJ_SSE) $(CXX_OBJ_SSE2) $(CXX_OBJ_SSE3) $(CXX_OBJ_SSE4) $(CXX_OBJ_AVX) $(CXX_OBJ_AVX2) $(CXX_OBJ_AVX512)
102+
else ifeq ($($(HOST)ARCHITECTURE_FAMILY),x86_64)
103+
CXX_OBJ_EXT += $(CXX_OBJ_X86) $(CXX_OBJ_SSE) $(CXX_OBJ_SSE2) $(CXX_OBJ_SSE3) $(CXX_OBJ_SSE4) $(CXX_OBJ_AVX) $(CXX_OBJ_AVX2) $(CXX_OBJ_AVX512)
104+
else ifeq ($($(HOST)ARCHITECTURE_FAMILY),arm32)
105+
CXX_OBJ_EXT += $(CXX_OBJ_ARM) $(CXX_OBJ_NEON_D32)
106+
else ifeq ($($(HOST)ARCHITECTURE_FAMILY),aarch64)
107+
CXX_OBJ_EXT += $(CXX_OBJ_AARCH64) $(CXX_OBJ_ASIMD)
110108
endif
111109

112110
ALL_HEADERS = $(call rwildcard, $(ARTIFACT_INC), *.h)
@@ -151,7 +149,7 @@ compile: $(ARTIFACT_OBJ)
151149
$(CXX_OBJ_ALL):
152150
echo " $($(HOST)CXX) [$(ARTIFACT_NAME)] $(CXX_FILE)"
153151
mkdir -p $(dir $@)
154-
$($(HOST)CXX) -o $(@) -c $(CXX_FILE) -fPIC $($(HOST)CXXFLAGS) $(ARTIFACT_MFLAGS) $($(HOST)EXT_FLAGS) $(INCLUDE) $(ARTIFACT_CFLAGS) -MMD -MP -MF $(DEP_FILE) -MT $(@)
152+
$($(HOST)CXX) -o $(@) -c $(CXX_FILE) -fPIC $($(HOST)CXXFLAGS) $(ARTIFACT_MFLAGS) $(EXT_FLAGS) $(INCLUDE) $(ARTIFACT_CFLAGS) -MMD -MP -MF $(DEP_FILE) -MT $(@)
155153

156154
# Producing large object files
157155
$(ARTIFACT_OBJ): $(CXX_OBJ)

0 commit comments

Comments
 (0)