Skip to content

Commit 02b9614

Browse files
committed
Release 1.0.4
* Updated build scripts.
2 parents 3f1c2ed + 7eba9ef commit 02b9614

File tree

7 files changed

+42
-27
lines changed

7 files changed

+42
-27
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.4 ===
6+
* Updated build scripts.
7+
58
=== 1.0.3 ===
69
* Moving towards C++ 11.
710
* Updated build scripts.

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 3
27+
#define LSP_R3D_BASE_LIB_MICRO 4
2828

2929
#ifdef LSP_R3D_BASE_LIB_BUILTIN
3030
#define LSP_R3D_BASE_LIB_EXPORT

make/system.mk

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -198,29 +198,31 @@ TEST := 0
198198

199199
# Set-up list of common variables
200200
COMMON_VARS = \
201-
ROOTDIR \
202-
ROOT_ARTIFACT_ID \
203-
PLATFORM \
204201
ARCHITECTURE \
205202
ARCHITECTURE_FAMILY \
206203
ARCHITECTURE_CFLAGS \
204+
BINDIR \
207205
BUILDDIR \
206+
DEBUG \
207+
ETCDIR \
208+
EXECUTABLE_EXT \
209+
EXPORT_SYMBOLS \
208210
FEATURES \
211+
INCDIR \
212+
INSTALL_HEADERS \
213+
LIBDIR \
209214
LIBRARY_EXT \
210215
LIBRARY_PREFIX \
211-
STATICLIB_EXT \
212-
EXECUTABLE_EXT \
213216
PKGCONFIG_EXT \
217+
PLATFORM \
214218
PREFIX \
215-
LIBDIR \
219+
ROOTDIR \
220+
ROOT_ARTIFACT_ID \
221+
PROFILE \
216222
SHAREDDIR \
217-
BINDIR \
218-
INCDIR \
219-
ETCDIR \
223+
STATICLIB_EXT \
220224
TEMPDIR \
221225
TEST \
222-
DEBUG \
223-
PROFILE \
224226
TRACE
225227

226228
.PHONY: sysvars
@@ -238,8 +240,10 @@ sysvars:
238240
echo " DEVEL build with modules checked out for read/write URL"
239241
echo " ETCDIR location of system configuration files"
240242
echo " EXECUTABLE_EXT file extension for executable files"
243+
echo " EXPORT_SYMBOLS make export symbols visible"
241244
echo " FEATURES list of features enabled in the build"
242245
echo " INCDIR location of the header files"
246+
echo " INSTALL_HEADERS install headers (enabled by default)"
243247
echo " LIBDIR location of the library"
244248
echo " LIBRARY_EXT file extension for library files"
245249
echo " LIBRARY_PREFIX prefix used for library file"

make/tools.mk

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,13 +102,26 @@ endif
102102
ifeq ($(TEST),1)
103103
CFLAGS_EXT += -DLSP_TESTING
104104
CXXFLAGS_EXT += -DLSP_TESTING
105+
EXPORT_SYMBOLS ?= 1
105106
else
106-
ifneq ($(ARTIFACT_EXPORT_ALL),1)
107-
CFLAGS_EXT += -fvisibility=hidden
108-
CXXFLAGS_EXT += -fvisibility=hidden
107+
ifeq ($(ARTIFACT_EXPORT_SYMBOLS),1)
108+
EXPORT_SYMBOLS ?= 1
109+
else
110+
EXPORT_SYMBOLS ?= 0
109111
endif
110112
endif
111113

114+
ifneq ($(EXPORT_SYMBOLS),1)
115+
CFLAGS_EXT += -fvisibility=hidden
116+
CXXFLAGS_EXT += -fvisibility=hidden
117+
endif
118+
119+
ifneq ($(ARTIFACT_EXPORT_HEADERS),0)
120+
INSTALL_HEADERS ?= 1
121+
else
122+
INSTALL_HEADERS ?= 0
123+
endif
124+
112125
# Define flags for (cross) build
113126
CFLAGS += \
114127
$(CFLAGS_EXT) \

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.19
22+
LSP_COMMON_LIB_VERSION := 1.0.20
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.13
28+
LSP_TEST_FW_VERSION := 1.0.14
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.3
34+
LSP_R3D_IFACE_VERSION := 1.0.4
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: 2 additions & 2 deletions
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_EXPORT_ALL = 0
27-
ARTIFACT_VERSION = 1.0.3
26+
ARTIFACT_VERSION = 1.0.4
27+
ARTIFACT_EXPORT_SYMBOLS = 0

src/Makefile

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,6 @@ CXX_FILE = $(patsubst $(ARTIFACT_BIN)/%.o,%.cpp, $(@))
8484
CXX_HDR_PATHS = $(foreach hdr,$(ARTIFACT_HEADERS),$(ARTIFACT_INC)/$(hdr))
8585
CXX_HEADERS = $(foreach path,$(CXX_HDR_PATHS),$(call rwildcard, $(path), *.h))
8686
CXX_INSTHEADERS = $(patsubst $(ARTIFACT_INC)/%,$(DESTDIR)$(INCDIR)/%,$(CXX_HEADERS))
87-
CXX_INSTALL_HEADERS =
88-
89-
ifeq ($(HEADERS),1)
90-
CXX_INSTALL_HEADERS = 1
91-
endif
9287

9388
BUILD_ALL = $(ARTIFACT_LIB) $(ARTIFACT_SLIB) $(ARTIFACT_PC)
9489

@@ -176,8 +171,8 @@ $(ARTIFACT_PC):
176171
install: all
177172
echo "Installing $($(ARTIFACT_ID)_NAME)"
178173
mkdir -p "$(DESTDIR)$(LIBDIR)/pkgconfig"
179-
$(if $(CXX_INSTALL_HEADERS), mkdir -p "$(DESTDIR)$(INCDIR)")
180-
$(if $(CXX_INSTALL_HEADERS), cp -r "$(CXX_HDR_PATHS)" "$(DESTDIR)$(INCDIR)/")
174+
$(if $(filter $(INSTALL_HEADERS),1), mkdir -p "$(DESTDIR)$(INCDIR)")
175+
$(if $(filter $(INSTALL_HEADERS),1), cp -r "$(CXX_HDR_PATHS)" "$(DESTDIR)$(INCDIR)/")
181176
cp $(ARTIFACT_PC) "$(DESTDIR)$(LIBDIR)/pkgconfig/"
182177
$(INSTALL) $(ARTIFACT_LIB) "$(DESTDIR)$(LIBDIR)/"
183178
cp $(ARTIFACT_SLIB) "$(DESTDIR)$(LIBDIR)/"

0 commit comments

Comments
 (0)