Skip to content

Commit

Permalink
Release 1.0.21
Browse files Browse the repository at this point in the history 
* Updated build scripts.
* Updated module versions in dependencies.
  • Loading branch information
@sadko4u
sadko4u committed Oct 11, 2024
2 parents c37b8f6 + c561927 commit d46d821
Show file tree
Hide file tree
Showing 6 changed files with 31 additions and 9 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
* RECENT CHANGES
*******************************************************************************

=== 1.0.21 ===
* Updated build scripts.
* Updated module versions in dependencies.

=== 1.0.20 ===
* Updated build scripts.
* Updated module versions in dependencies.
Expand Down
2 changes: 1 addition & 1 deletion include/lsp-plug.in/r3d/glx/version.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

#define LSP_R3D_GLX_LIB_MAJOR 1
#define LSP_R3D_GLX_LIB_MINOR 0
#define LSP_R3D_GLX_LIB_MICRO 20
#define LSP_R3D_GLX_LIB_MICRO 21

#if defined(LSP_R3D_GLX_LIB_PUBLISHER)
#define LSP_R3D_GLX_LIB_PUBLIC LSP_EXPORT_MODIFIER
Expand Down
4 changes: 2 additions & 2 deletions make/configure.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ MERGED_DEPENDENCIES := \
$(TEST_DEPENDENCIES)
UNIQ_MERGED_DEPENDENCIES := $(call uniq, $(MERGED_DEPENDENCIES))
DEPENDENCIES = $(UNIQ_MERGED_DEPENDENCIES)
FEATURES := $(sort $(call subtraction,$(SUB_FEATURES),$(DEFAULT_FEATURES) $(ADD_FEATURES)))
BUILD_FEATURES := $(sort $(call subtraction,$(SUB_FEATURES),$(if $(FEATURES),$(FEATURES),$(DEFAULT_FEATURES)) $(ADD_FEATURES)))

# Determine versions
ifeq ($(findstring -devel,$(ARTIFACT_VERSION)),-devel)
Expand Down Expand Up @@ -270,7 +270,7 @@ $(CONFIG_VARS): prepare
config: $(CONFIG_VARS)
echo "Host architecture: $(HOST_ARCHITECTURE_FAMILY)/$(HOST_ARCHITECTURE) ($(HOST_ARCHITECTURE_CFLAGS))"
echo "Architecture: $(ARCHITECTURE_FAMILY)/$(ARCHITECTURE) ($(ARCHITECTURE_CFLAGS))"
echo "Features: $(FEATURES)"
echo "Features: $(BUILD_FEATURES)"
echo "Configured OK"

help: | pathvars toolvars sysvars
Expand Down
20 changes: 19 additions & 1 deletion make/system.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,17 @@ else
endif
BUILD_ARCH := $(if $(ARCHITECTURE),$(ARCHITECTURE),$(HOST_BUILD_ARCH))

ifeq ($(PLATFORM),Linux)
OBJ_LDFLAGS_X86 = -m elf_i386
OBJ_LDFLAGS_X86_64 = -m elf_x86_64
else ifeq ($(PLATFORM),BSD)
OBJ_LDFLAGS_X86 = -m elf_i386
OBJ_LDFLAGS_X86_64 = -m elf_x86_64
else ifeq ($(PLATFORM),Windows)
OBJ_LDFLAGS_X86 = -m i386pe
OBJ_LDFLAGS_X86_64 = -m i386pep
endif

# Set actual architecture for HOST and TARGET builds
# The current architecture can be obtained by: gcc -Q --help=target
define detect_architecture =
Expand Down Expand Up @@ -100,30 +111,37 @@ define detect_architecture =
$(2)_NAME = x86_64
$(2)_FAMILY = x86_64
$(2)_CFLAGS := -march=x86-64 -m64
$(2)_LDFLAGS := $(OBJ_LDFLAGS_X86_64)
else ifeq ($(patsubst %amd64%,amd64,$(1)),amd64)
$(2)_NAME = x86_64
$(2)_FAMILY = x86_64
$(2)_CFLAGS := -march=x86-64 -m64
$(2)_LDFLAGS := $(OBJ_LDFLAGS_X86_64)
else ifeq ($(patsubst %AMD64%,AMD64,$(1)),AMD64)
$(2)_NAME = x86_64
$(2)_FAMILY = x86_64
$(2)_CFLAGS := -march=x86-64 -m64
$(2)_LDFLAGS := $(OBJ_LDFLAGS_X86_64)
else ifeq ($(1),i86pc)
$(2)_NAME = x86_64
$(2)_FAMILY = x86_64
$(2)_CFLAGS := -march=x86-64 -m64
$(2)_LDFLAGS := $(OBJ_LDFLAGS_X86_64)
else ifeq ($(patsubst %i686%,i686,$(1)),i686)
$(2)_NAME = i686
$(2)_FAMILY = ia32
$(2)_CFLAGS := -march=i686 -m32
$(2)_LDFLAGS := $(OBJ_LDFLAGS_X86)
else ifeq ($(patsubst i%86,i586,$(1)),i586)
$(2)_NAME = i586
$(2)_FAMILY = ia32
$(2)_CFLAGS := -march=i586 -m32
$(2)_LDFLAGS := $(OBJ_LDFLAGS_X86)
else ifeq ($(1),x86)
$(2)_NAME = i686
$(2)_FAMILY = ia32
$(2)_CFLAGS := -march=i686 -m32
$(2)_LDFLAGS := $(OBJ_LDFLAGS_X86)
else ifeq ($(1),riscv32)
$(2)_NAME = riscv32
$(2)_FAMILY = riscv32
Expand Down Expand Up @@ -191,11 +209,11 @@ COMMON_VARS = \
ARCHITECTURE \
ARCHITECTURE_FAMILY \
ARCHITECTURE_CFLAGS \
BUILD_FEATURES \
CROSS_COMPILE \
DEBUG \
EXECUTABLE_EXT \
EXPORT_SYMBOLS \
FEATURES \
HOST_ARCHITECTURE \
HOST_ARCHITECTURE_FAMILY \
HOST_ARCHITECTURE_CFLAGS \
Expand Down
8 changes: 4 additions & 4 deletions modules.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,25 +20,25 @@

#------------------------------------------------------------------------------
# Variables that describe source code dependencies
LSP_COMMON_LIB_VERSION := 1.0.38
LSP_COMMON_LIB_VERSION := 1.0.39
LSP_COMMON_LIB_NAME := lsp-common-lib
LSP_COMMON_LIB_TYPE := src
LSP_COMMON_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_COMMON_LIB_NAME).git
LSP_COMMON_LIB_URL_RW := [email protected]:lsp-plugins/$(LSP_COMMON_LIB_NAME).git

LSP_TEST_FW_VERSION := 1.0.27
LSP_TEST_FW_VERSION := 1.0.28
LSP_TEST_FW_NAME := lsp-test-fw
LSP_TEST_FW_TYPE := src
LSP_TEST_FW_URL_RO := https://github.com/lsp-plugins/$(LSP_TEST_FW_NAME).git
LSP_TEST_FW_URL_RW := [email protected]:lsp-plugins/$(LSP_TEST_FW_NAME).git

LSP_R3D_IFACE_VERSION := 1.0.20
LSP_R3D_IFACE_VERSION := 1.0.21
LSP_R3D_IFACE_NAME := lsp-r3d-iface
LSP_R3D_IFACE_TYPE := src
LSP_R3D_IFACE_URL_RO := https://github.com/lsp-plugins/$(LSP_R3D_IFACE_NAME).git
LSP_R3D_IFACE_URL_RW := [email protected]:lsp-plugins/$(LSP_R3D_IFACE_NAME).git

LSP_R3D_BASE_LIB_VERSION := 1.0.20
LSP_R3D_BASE_LIB_VERSION := 1.0.21
LSP_R3D_BASE_LIB_NAME := lsp-r3d-base-lib
LSP_R3D_BASE_LIB_TYPE := src
LSP_R3D_BASE_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_R3D_BASE_LIB_NAME).git
Expand Down
2 changes: 1 addition & 1 deletion project.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ ARTIFACT_ID = LSP_R3D_GLX_LIB
ARTIFACT_NAME = lsp-r3d-glx-lib
ARTIFACT_DESC = GLX-based 3D backend library for rendering scenes
ARTIFACT_HEADERS = lsp-plug.in
ARTIFACT_VERSION = 1.0.20
ARTIFACT_VERSION = 1.0.21
ARTIFACT_EXPORT_HEADERS = 0

0 comments on commit d46d821

Please sign in to comment.