Skip to content

Commit e721005

Browse files
committed
Release 1.0.9
* Added test build for Windows using MSYS2. * Updated build scripts. * Updated module versions in dependencies.
2 parents 8ea914f + 7beff8d commit e721005

File tree

7 files changed

+52
-6
lines changed

7 files changed

+52
-6
lines changed

.github/workflows/build.yml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,3 +133,32 @@ jobs:
133133
echo "***** MEMCHECK $test *****"; \
134134
valgrind ${{env.VALGRIND_ARGS}} .build/target/${{env.ARTIFACT}}/${{env.ARTIFACT}}-test utest --verbose --jobs 1 --nofork --debug $test; \
135135
done
136+
windows_mingw64:
137+
runs-on: windows-2022
138+
defaults:
139+
run:
140+
shell: msys2 {0}
141+
steps:
142+
- name: Setup MSYS2 and install dependencies
143+
uses: msys2/setup-msys2@v2
144+
with:
145+
msystem: MINGW64
146+
release: false
147+
update: false
148+
install: >-
149+
base-devel
150+
git
151+
mingw-w64-x86_64-gcc
152+
- uses: actions/checkout@v3
153+
- name: Configure project
154+
shell: msys2 {0}
155+
run: make config TEST=1
156+
- name: Fetch project dependencies
157+
shell: msys2 {0}
158+
run: make fetch
159+
- name: Build project
160+
shell: msys2 {0}
161+
run: make VERBOSE=1
162+
- name: Run unit tests
163+
shell: msys2 {0}
164+
run: .build/target/${{env.ARTIFACT}}/${{env.ARTIFACT}}-test.exe utest --verbose --jobs 1

CHANGELOG

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

5+
=== 1.0.9 ===
6+
* Added test build for Windows using MSYS2.
7+
* Updated build scripts.
8+
* Updated module versions in dependencies.
9+
510
=== 1.0.8 ===
611
* Added Clang build for the CI.
712

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 8
27+
#define LSP_R3D_BASE_LIB_MICRO 9
2828

2929
#if defined(LSP_R3D_BASE_LIB_PUBLISHER)
3030
#define LSP_R3D_BASE_LIB_PUBLIC LSP_EXPORT_MODIFIER

make/functions.mk

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,10 @@ intersection = $(foreach v,$1,$(if $(findstring $(v),$2),$(v)))
5151
# $(call subtraction, list1, list2)
5252
subtraction = $(foreach v,$2,$(if $(findstring $(v),$1),,$(v)))
5353

54+
# Check feature presence in list
55+
# $(call fcheck, features-to-check, all-feature-list, action-if-enabled, action-if-disabled)
56+
fcheck = $(if $(call intersection,$1,$2),$3,$4)
57+
5458
# Fetch different versions from version string
5559
# $(call vmajor, <version-string>)
5660
vmajor = $(shell echo "$(strip $1)" | sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+)(-(.*))?/\1/')

make/system.mk

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,15 @@ endif
5454

5555
# Set actual architecture
5656
# The current architecture can be obtained by: gcc -Q --help=target
57-
ifeq ($(patsubst armv6%,armv6,$(BUILD_ARCH)),armv6)
57+
ifeq ($(BUILD_ARCH),armel)
58+
override ARCHITECTURE = $(BUILD_ARCH)
59+
ARCHITECTURE_FAMILY = generic
60+
ARCHITECTURE_CFLAGS :=
61+
else ifeq ($(BUILD_ARCH),armhf)
62+
override ARCHITECTURE = arm32
63+
ARCHITECTURE_FAMILY = arm32
64+
ARCHITECTURE_CFLAGS := -march=armv7-a+fp -marm
65+
else ifeq ($(patsubst armv6%,armv6,$(BUILD_ARCH)),armv6)
5866
override ARCHITECTURE = arm32
5967
ARCHITECTURE_FAMILY = arm32
6068
ARCHITECTURE_CFLAGS := -march=armv6 -marm

modules.mk

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

2121
#------------------------------------------------------------------------------
2222
# Variables that describe source code dependencies
23-
LSP_COMMON_LIB_VERSION := 1.0.25
23+
LSP_COMMON_LIB_VERSION := 1.0.26
2424
LSP_COMMON_LIB_NAME := lsp-common-lib
2525
LSP_COMMON_LIB_TYPE := src
2626
LSP_COMMON_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_COMMON_LIB_NAME).git
2727
LSP_COMMON_LIB_URL_RW := git@github.com:lsp-plugins/$(LSP_COMMON_LIB_NAME).git
2828

29-
LSP_TEST_FW_VERSION := 1.0.18
29+
LSP_TEST_FW_VERSION := 1.0.19
3030
LSP_TEST_FW_NAME := lsp-test-fw
3131
LSP_TEST_FW_TYPE := src
3232
LSP_TEST_FW_URL_RO := https://github.com/lsp-plugins/$(LSP_TEST_FW_NAME).git
3333
LSP_TEST_FW_URL_RW := git@github.com:lsp-plugins/$(LSP_TEST_FW_NAME).git
3434

35-
LSP_R3D_IFACE_VERSION := 1.0.8
35+
LSP_R3D_IFACE_VERSION := 1.0.9
3636
LSP_R3D_IFACE_NAME := lsp-r3d-iface
3737
LSP_R3D_IFACE_TYPE := src
3838
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
@@ -23,5 +23,5 @@ ARTIFACT_ID = LSP_R3D_BASE_LIB
2323
ARTIFACT_NAME = lsp-r3d-base-lib
2424
ARTIFACT_DESC = Base library for implementing and loading 3D rendering backend
2525
ARTIFACT_HEADERS = lsp-plug.in
26-
ARTIFACT_VERSION = 1.0.8
26+
ARTIFACT_VERSION = 1.0.9
2727
ARTIFACT_EXPORT_SYMBOLS = 0

0 commit comments

Comments
 (0)