Skip to content

Commit e205ab5

Browse files
committed
Release 1.0.2
* Updated build scripts.
2 parents 5536521 + 8777cd5 commit e205ab5

File tree

7 files changed

+40
-15
lines changed

7 files changed

+40
-15
lines changed

CHANGELOG

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
* RECENT CHANGES
33
*******************************************************************************
44

5+
=== 1.0.2 ===
6+
* Updated build scripts.
7+
58
=== 1.0.1 ===
69
* Updated build scripts.
710

include/lsp-plug.in/r3d/base/version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
#define LSP_R3D_BASE_LIB_MAJOR 1
2626
#define LSP_R3D_BASE_LIB_MINOR 0
27-
#define LSP_R3D_BASE_LIB_MICRO 1
27+
#define LSP_R3D_BASE_LIB_MICRO 2
2828

2929
#ifdef LSP_R3D_BASE_LIB_BUILTIN
3030
#define LSP_R3D_BASE_LIB_EXPORT

make/configure.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ $(CONFIG_VARS): prepare
266266
echo "$(@)=$($(@))" >> "$(CONFIG)"
267267

268268
config: $(CONFIG_VARS)
269-
echo "Architecture: $(ARCHITECTURE) ($(ARCHITECTURE_CFLAGS))"
269+
echo "Architecture: $(ARCHITECTURE_FAMILY)/$(ARCHITECTURE) ($(ARCHITECTURE_CFLAGS))"
270270
echo "Features: $(FEATURES)"
271271
echo "Configured OK"
272272

make/system.mk

Lines changed: 27 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,20 @@
22
# Copyright (C) 2020 Linux Studio Plugins Project <https://lsp-plug.in/>
33
# (C) 2020 Vladimir Sadovnikov <sadko4u@gmail.com>
44
#
5-
# This file is part of lsp-r3d-base-lib
5+
# This file is part of lsp-plugins
66
#
7-
# lsp-r3d-base-lib is free software: you can redistribute it and/or modify
7+
# lsp-plugins is free software: you can redistribute it and/or modify
88
# it under the terms of the GNU Lesser General Public License as published by
99
# the Free Software Foundation, either version 3 of the License, or
1010
# any later version.
1111
#
12-
# lsp-r3d-base-lib is distributed in the hope that it will be useful,
12+
# lsp-plugins is distributed in the hope that it will be useful,
1313
# but WITHOUT ANY WARRANTY; without even the implied warranty of
1414
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1515
# GNU Lesser General Public License for more details.
1616
#
1717
# You should have received a copy of the GNU Lesser General Public License
18-
# along with lsp-r3d-base-lib. If not, see <https://www.gnu.org/licenses/>.
18+
# along with lsp-plugins. If not, see <https://www.gnu.org/licenses/>.
1919
#
2020

2121
# Detect operating system
@@ -56,51 +56,71 @@ endif
5656
# The current architecture can be obtained by: gcc -Q --help=target
5757
ifeq ($(patsubst armv6%,armv6,$(BUILD_ARCH)),armv6)
5858
override ARCHITECTURE = arm32
59+
ARCHITECTURE_FAMILY = arm32
5960
ARCHITECTURE_CFLAGS := -march=armv6 -marm
6061
else ifeq ($(patsubst armv7ve%,armv7ve,$(BUILD_ARCH)),armv7ve)
6162
override ARCHITECTURE = arm32
63+
ARCHITECTURE_FAMILY = arm32
6264
ARCHITECTURE_CFLAGS := -march=armv7ve -marm
6365
else ifeq ($(patsubst armv7%,armv7,$(BUILD_ARCH)),armv7)
6466
override ARCHITECTURE = arm32
67+
ARCHITECTURE_FAMILY = arm32
6568
ARCHITECTURE_CFLAGS := -march=armv7-a -marm
6669
else ifeq ($(patsubst armv8%,armv8,$(BUILD_ARCH)),armv8)
6770
override ARCHITECTURE = aarch64
71+
ARCHITECTURE_FAMILY = aarch64
6872
ARCHITECTURE_CFLAGS := -march=armv8-a
6973
else ifeq ($(patsubst aarch64%,aarch64,$(BUILD_ARCH)),aarch64)
7074
override ARCHITECTURE = aarch64
75+
ARCHITECTURE_FAMILY = aarch64
7176
ARCHITECTURE_CFLAGS := -march=armv8-a
7277
else ifeq ($(BUILD_ARCH),arm32)
7378
override ARCHITECTURE = arm32
79+
ARCHITECTURE_FAMILY = arm32
7480
ARCHITECTURE_CFLAGS := -march=armv6 -marm
7581
else ifeq ($(BUILD_ARCH),arm)
7682
override ARCHITECTURE = arm32
83+
ARCHITECTURE_FAMILY = arm32
7784
ARCHITECTURE_CFLAGS := -march=armv6 -marm
7885
else ifeq ($(patsubst %x86_64%,x86_64,$(BUILD_ARCH)),x86_64)
7986
override ARCHITECTURE = x86_64
87+
ARCHITECTURE_FAMILY = x86_64
8088
ARCHITECTURE_CFLAGS := -march=x86-64 -m64
8189
else ifeq ($(patsubst %amd64%,amd64,$(BUILD_ARCH)),amd64)
8290
override ARCHITECTURE = x86_64
91+
ARCHITECTURE_FAMILY = x86_64
8392
ARCHITECTURE_CFLAGS := -march=x86-64 -m64
8493
else ifeq ($(patsubst %AMD64%,AMD64,$(BUILD_ARCH)),AMD64)
8594
override ARCHITECTURE = x86_64
95+
ARCHITECTURE_FAMILY = x86_64
8696
ARCHITECTURE_CFLAGS := -march=x86-64 -m64
8797
else ifeq ($(BUILD_ARCH),i86pc)
8898
override ARCHITECTURE = x86_64
99+
ARCHITECTURE_FAMILY = x86_64
89100
ARCHITECTURE_CFLAGS := -march=x86-64 -m64
101+
else ifeq ($(patsubst %i686%,i686,$(BUILD_ARCH)),i686)
102+
override ARCHITECTURE = i686
103+
ARCHITECTURE_FAMILY = ia32
104+
ARCHITECTURE_CFLAGS := -march=i686 -m32
90105
else ifeq ($(patsubst i%86,i586,$(BUILD_ARCH)),i586)
91106
override ARCHITECTURE = i586
107+
ARCHITECTURE_FAMILY = ia32
92108
ARCHITECTURE_CFLAGS := -march=i586 -m32
93109
else ifeq ($(BUILD_ARCH),x86)
94110
override ARCHITECTURE = i586
111+
ARCHITECTURE_FAMILY = ia32
95112
ARCHITECTURE_CFLAGS := -march=i586 -m32
96113
else ifeq ($(BUILD_ARCH),riscv32)
97114
override ARCHITECTURE = riscv32
115+
ARCHITECTURE_FAMILY = riscv32
98116
ARCHITECTURE_CFLAGS := -march=rv32imafdc -mabi=lp32d
99117
else ifeq ($(BUILD_ARCH),riscv64)
100118
override ARCHITECTURE = riscv64
119+
ARCHITECTURE_FAMILY = riscv64
101120
ARCHITECTURE_CFLAGS := -march=rv64imafdc -mabi=lp64d
102121
else
103-
override ARCHITECTURE =
122+
override ARCHITECTURE = $(BUILD_ARCH)
123+
ARCHITECTURE_FAMILY = generic
104124
ARCHITECTURE_CFLAGS :=
105125
endif
106126

@@ -182,6 +202,7 @@ COMMON_VARS = \
182202
ROOT_ARTIFACT_ID \
183203
PLATFORM \
184204
ARCHITECTURE \
205+
ARCHITECTURE_FAMILY \
185206
ARCHITECTURE_CFLAGS \
186207
BUILDDIR \
187208
FEATURES \
@@ -209,6 +230,7 @@ sysvars:
209230
echo " ADD_FEATURES list of features enabled in the build as an addition to default"
210231
echo " ARCHITECTURE target architecture to perform build"
211232
echo " ARCHITECTURE_CFLAGS compiler flags to specify architecture"
233+
echo " ARCHITECTURE_FAMILY compiler flags to specify architecture family"
212234
echo " ARCHITECTURE_LDFLAGS linker flags to specify architecture"
213235
echo " BINDIR location of the binaries"
214236
echo " BUILDDIR location of the build directory"

make/tools.mk

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ INSTALL := $(X_INSTALL_TOOL)
6363

6464
# Patch flags and tools for (cross) build
6565
FLAG_RELRO = -Wl,-z,relro,-z,now
66-
FLAG_STDLIB = -lc
66+
FLAG_STDLIB =
6767
CFLAGS_EXT = $(ARCHITECTURE_CFLAGS)
6868
CXXFLAGS_EXT = $(ARCHITECTURE_CFLAGS)
6969
EXE_FLAGS_EXT = $(ARCHITECTURE_CFLAGS)
@@ -110,7 +110,7 @@ else
110110
endif
111111

112112
# Define flags for (cross) build
113-
CFLAGS := \
113+
CFLAGS ?= \
114114
$(CFLAGS_EXT) \
115115
-fdata-sections \
116116
-ffunction-sections \
@@ -120,7 +120,7 @@ CFLAGS := \
120120

121121
CDEFS += -DLSP_INSTALL_PREFIX=\\\"$(PREFIX)\\\"
122122

123-
CXXFLAGS := \
123+
CXXFLAGS ?= \
124124
$(CXXFLAGS_EXT) \
125125
-std=c++98 \
126126
-fno-exceptions \
@@ -136,7 +136,7 @@ CXXDEFS += -DLSP_INSTALL_PREFIX=\\\"$(PREFIX)\\\"
136136
INCLUDE :=
137137
LDFLAGS := $(LDFLAGS_EXT) -r
138138
EXE_FLAGS := $(EXE_FLAGS_EXT) $(FLAG_RELRO) -Wl,--gc-sections
139-
SO_FLAGS := $(SO_FLAGS_EXT) $(FLAG_RELRO) -Wl,--gc-sections -shared -Llibrary $(FLAG_STDLIB) -fPIC
139+
SO_FLAGS := $(SO_FLAGS_EXT) $(FLAG_RELRO) -Wl,--gc-sections -shared $(FLAG_STDLIB) -fPIC
140140

141141
# Define flags for host build
142142
HOST_CFLAGS := $(CFLAGS)

modules.mk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,19 @@
1919
#
2020

2121
# Variables that describe dependencies
22-
LSP_COMMON_LIB_VERSION := 1.0.16
22+
LSP_COMMON_LIB_VERSION := 1.0.17
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 := git@github.com:lsp-plugins/$(LSP_COMMON_LIB_NAME).git
2727

28-
LSP_TEST_FW_VERSION := 1.0.10
28+
LSP_TEST_FW_VERSION := 1.0.11
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
3232
LSP_TEST_FW_URL_RW := git@github.com:lsp-plugins/$(LSP_TEST_FW_NAME).git
3333

34-
LSP_R3D_IFACE_VERSION := 1.0.1
34+
LSP_R3D_IFACE_VERSION := 1.0.2
3535
LSP_R3D_IFACE_NAME := lsp-r3d-iface
3636
LSP_R3D_IFACE_TYPE := src
3737
LSP_R3D_IFACE_URL_RO := https://github.com/lsp-plugins/$(LSP_R3D_IFACE_NAME).git

project.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ ARTIFACT_NAME = lsp-r3d-base-lib
2424
ARTIFACT_DESC = Base library for implementing and loading 3D rendering backend
2525
ARTIFACT_HEADERS = lsp-plug.in
2626
ARTIFACT_EXPORT_ALL = 0
27-
ARTIFACT_VERSION = 1.0.1
27+
ARTIFACT_VERSION = 1.0.2

0 commit comments

Comments
 (0)