Release 0.5.2

* Build updates.

Author: sadko4u

CHANGELOG

@@ -2,6 +2,9 @@
 * RECENT CHANGES
 *******************************************************************************
 
+=== 0.5.2 ===
+* Build updates.
+
 === 0.5.1 ===
 * Modified base R3D interface constants and metadata structures.
 

dependencies.mk

@@ -1,13 +1,14 @@
 # Variables that describe dependencies
-LSP_COMMON_LIB_VERSION     := 1.0.4
+LSP_COMMON_LIB_VERSION     := 1.0.7
 LSP_COMMON_LIB_NAME        := lsp-common-lib
 LSP_COMMON_LIB_URL         := https://github.com/sadko4u/$(LSP_COMMON_LIB_NAME).git
 LSP_COMMON_LIB_TYPE        := hdr
 
-LSP_TEST_FW_VERSION        := 1.0.3
+LSP_TEST_FW_VERSION        := 1.0.5
 LSP_TEST_FW_NAME           := lsp-test-fw
 LSP_TEST_FW_URL            := https://github.com/sadko4u/$(LSP_TEST_FW_NAME).git
 LSP_TEST_FW_TYPE           := src
 
 STDLIB_VERSION             := system
+STDLIB_TYPE                := opt
 STDLIB_LDFLAGS             := -lpthread -ldl

include/lsp-plug.in/r3d/factory.h

@@ -13,7 +13,7 @@
 #include <lsp-plug.in/r3d/types.h>
 
 #define LSP_R3D_FACTORY_FUNCTION_NAME           "lsp_r3d_factory"
-#define LSP_R3D_FACTORY_FUNCTION_HEADER         LSP_CSYMBOL_EXPORT ::lsp::r3d::factory_t *lsp_r3d_factory()
+#define LSP_R3D_FACTORY_FUNCTION_HEADER         ::lsp::r3d::factory_t *lsp_r3d_factory()
 
 namespace lsp
 {

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

@@ -8,8 +8,20 @@
 #ifndef LSP_PLUG_IN_R3D_VERSION_H_
 #define LSP_PLUG_IN_R3D_VERSION_H_
 
-#define LSP_R3D_BASE_MAJOR          0
-#define LSP_R3D_BASE_MINOR          5
-#define LSP_R3D_BASE_MICRO          1
+#define LSP_R3D_BASE_LIB_MAJOR          0
+#define LSP_R3D_BASE_LIB_MINOR          5
+#define LSP_R3D_BASE_LIB_MICRO          2
+
+#ifdef LSP_R3D_BASE_LIB_BUILTIN
+    #define LSP_R3D_BASE_LIB_EXPORT
+    #define LSP_R3D_BASE_LIB_CEXPORT
+    #define LSP_R3D_BASE_LIB_IMPORT         LSP_SYMBOL_IMPORT
+    #define LSP_R3D_BASE_LIB_CIMPORT        LSP_CSYMBOL_IMPORT
+#else
+    #define LSP_R3D_BASE_LIB_EXPORT         LSP_SYMBOL_EXPORT
+    #define LSP_R3D_BASE_LIB_CEXPORT        LSP_CSYMBOL_EXPORT
+    #define LSP_R3D_BASE_LIB_IMPORT         LSP_SYMBOL_IMPORT
+    #define LSP_R3D_BASE_LIB_CIMPORT        LSP_CSYMBOL_IMPORT
+#endif
 
 #endif /* LSP_PLUG_IN_R3D_VERSION_H_ */

make/configure.mk

@@ -16,13 +16,13 @@ include $(BASEDIR)/dependencies.mk
 
 DEPENDENCIES               += $(TEST_DEPENDENCIES)
 
-ifeq ($(findstring -devel,$(VERSION)),-devel)
+ifeq ($(findstring -devel,$(ARTIFACT_VERSION)),-devel)
   $(foreach dep, $(DEPENDENCIES), \
     $(eval $(dep)_BRANCH=devel) \
   )
   # Strip '-devel' from version
-  tmp_version :=$(shell echo "$(VERSION)" | sed s/-devel//g)
-  VERSION=$(tmp_version)
+  tmp_version :=$(shell echo "$(ARTIFACT_VERSION)" | sed s/-devel//g)
+  ARTIFACT_VERSION=$(tmp_version)
 else
   $(foreach dep, $(DEPENDENCIES), \
     $(eval \
@@ -32,7 +32,7 @@ else
 endif
 
 define pkgconfig =
-  $(eval name = $(1))
+  $(eval name=$(1))
   $(if $($(name)_NAME), \
     $(if $($(name)_CFLAGS),,  $(eval $(name)_CFLAGS  := $(shell pkg-config --cflags "$($(name)_NAME)"))) \
   )
@@ -43,45 +43,41 @@ define pkgconfig =
 endef
 
 define libconfig =
-  $(eval name = $(1))
+  $(eval name=$(1))
   $(if $($(name)_NAME), \
     $(if $($(name)_LDLAGS),,  $(eval $(name)_LDFLAGS := -l$($(name)_NAME))) \
   )
   $(if $($(name)_OBJ),,     $(eval $(name)_OBJ     :=))
 endef
 
 define optconfig =
-  $(eval name = $(1))
+  $(eval name=$(1))
   $(if $($(name)_OBJ),,     $(eval $(name)_OBJ     :=))
 endef
 
 define srcconfig =
-  $(eval name = $(1))
+  $(eval name=$(1))
+  $(eval builtin=$(patsubst $(ARTIFACT_NAME),,$($(name)_NAME)))
   $(if $($(name)_PATH),,    $(eval $(name)_PATH    := $(MODULES)/$($(name)_NAME)))
   $(if $($(name)_INC),,     $(eval $(name)_INC     := $($(name)_PATH)/include))
   $(if $($(name)_SRC),,     $(eval $(name)_SRC     := $($(name)_PATH)/src))
   $(if $($(name)_TEST),,    $(eval $(name)_TEST    := $($(name)_PATH)/test))
   $(if $($(name)_TESTING),, $(eval $(name)_TESTING := 0))
   $(if $($(name)_BIN),,     $(eval $(name)_BIN     := $(BUILDDIR)/$($(name)_NAME)))
-  $(if $($(name)_CFLAGS),,  $(eval $(name)_CFLAGS  := "-I\"$($(name)_INC)\""$(xflags)))
+  $(if $($(name)_CFLAGS),,  $(eval $(name)_CFLAGS  := "-I\"$($(name)_INC)\"" $(if $(builtin),"-D$(name)_BUILTIN")))
   $(if $($(name)_LDLAGS),,  $(eval $(name)_LDFLAGS :=))
   $(if $($(name)_OBJ),,     $(eval $(name)_OBJ     := "$($(name)_BIN)/$($(name)_NAME).o"))
-  $(if $($(name)_MFLAGS),, \
-    $(eval $(name)_MFLAGS := \
-      $(if $(patsubst $(ARTIFACT_NAME),,$($(name)_NAME)),"-DLSP_BUILTIN_MODULE -fvisibility=hidden",)) \
-  )
+  $(if $($(name)_MFLAGS),,  $(eval $(name)_MFLAGS  := $(if $(builtin),"-D$(name)_BUILTIN -fvisibility=hidden")))
 endef
 
 define hdrconfig =
-  $(eval name = $(1))
+  $(eval name=$(1))
+  $(eval builtin=$(patsubst $(ARTIFACT_NAME),,$($(name)_NAME)))
   $(if $($(name)_PATH),,    $(eval $(name)_PATH    := $(MODULES)/$($(name)_NAME)))
   $(if $($(name)_INC),,     $(eval $(name)_INC     := $($(name)_PATH)/include))
   $(if $($(name)_TESTING),, $(eval $(name)_TESTING := 0))
-  $(if $($(name)_CFLAGS),,  $(eval $(name)_CFLAGS  := "-I\"$($(name)_INC)\""$(xflags)))
-  $(if $($(name)_MFLAGS),, \
-    $(eval $(name)_MFLAGS := \
-      $(if $(patsubst $(ARTIFACT_NAME),,$($(name)_NAME)),"-DLSP_BUILTIN_MODULE -fvisibility=hidden",)) \
-  )
+  $(if $($(name)_CFLAGS),,  $(eval $(name)_CFLAGS  := "-I\"$($(name)_INC)\"" $(if $(builtin),"-D$(name)_BUILTIN")))
+  $(if $($(name)_MFLAGS),,  $(eval $(name)_MFLAGS  := $(if $(builtin),"-D$(name)_BUILTIN -fvisibility=hidden")))
 endef
 
 define vardef =
@@ -99,7 +95,7 @@ ifndef $(ARTIFACT_VARS)_NAME
   $(ARTIFACT_VARS)_NAME      := $(ARTIFACT_NAME)
 endif
 ifndef $(ARTIFACT_VARS)_VERSION 
-  $(ARTIFACT_VARS)_VERSION   := $(VERSION)
+  $(ARTIFACT_VARS)_VERSION   := $(ARTIFACT_VERSION)
 endif
 ifndef $(ARTIFACT_VARS)_PATH
   $(ARTIFACT_VARS)_PATH      := $(BASEDIR)

make/modules.mk

@@ -17,6 +17,7 @@ HDR_MODULES         = $(foreach dep, $(DEPENDENCIES), $(if $(findstring hdr,$($(
 $(SRC_MODULES) $(HDR_MODULES):
 	@echo "Cloning $($(@)_URL) -> $($(@)_PATH) [$($(@)_BRANCH)]"
 	@test -f "$($(@)_PATH)/.git/config" || $(GIT) clone "$($(@)_URL)" "$($(@)_PATH)"
+	@$(GIT) -C "$($(@)_PATH)" reset --hard
 	@$(GIT) -C "$($(@)_PATH)" fetch origin --force
 	@$(GIT) -C "$($(@)_PATH)" fetch origin '+refs/heads/*:refs/tags/*' --force
 	@$(GIT) -c advice.detachedHead=false -C "$($(@)_PATH)" checkout origin/$($(@)_BRANCH) || \

make/system.mk

@@ -10,14 +10,13 @@ ifndef PLATFORM
 
   ifeq ($(BUILD_SYSTEM),Windows)
     PLATFORM       := Windows
-  endif
-  ifeq ($(findstring BSD,$(BUILD_SYSTEM)),BSD)
+  else ifeq ($(findstring OpenBSD,$(BUILD_SYSTEM)),OpenBSD)
+    PLATFORM       := OpenBSD
+  else ifeq ($(findstring BSD,$(BUILD_SYSTEM)),BSD)
     PLATFORM       := BSD
-  endif
-  ifeq ($(findstring Linux,$(BUILD_SYSTEM)),Linux)
+  else ifeq ($(findstring Linux,$(BUILD_SYSTEM)),Linux)
     PLATFORM       := Linux
-  endif
-  ifeq ($(findstring SunOS,$(BUILD_SYSTEM)),SunOS)
+  else ifeq ($(findstring SunOS,$(BUILD_SYSTEM)),SunOS)
     PLATFORM       := Solaris
   endif
 endif

make/tools.mk

@@ -1,6 +1,18 @@
+# Determine tools
+ifeq ($(PLATFORM),OpenBSD)
+  X_CC_TOOL          := egcc
+  X_CXX_TOOL         := eg++
+  X_AS_TOOL          := gas
+else
+  X_CC_TOOL          := gcc
+  X_CXX_TOOL         := g++
+  X_AS_TOOL          := as
+endif
+
 # Define tool variables
-CC                 := gcc
-CXX                := g++
+CC                 := $(X_CC_TOOL)
+CXX                := $(X_CXX_TOOL)
+AS                 := $(X_AS_TOOL)
 LD                 := ld
 GIT                := git
 INSTALL            := install
@@ -83,7 +95,7 @@ CFLAGS             := \
 CXXFLAGS           := \
   $(CXXFLAGS_EXT) \
   -std=c++98 \
-  -exceptions \
+  -fno-exceptions \
   -fno-rtti \
   -fdata-sections \
   -ffunction-sections \
@@ -97,13 +109,14 @@ EXE_FLAGS          := $(EXE_FLAGS_EXT) $(FLAG_RELRO) -Wl,--gc-sections
 SO_FLAGS           := $(SO_FLAGS_EXT) $(FLAG_RELRO) -Wl,--gc-sections -shared -Llibrary $(FLAG_STDLIB) -fPIC 
 
 TOOL_VARS := \
-  CC CXX LD GIT INSTALL \
+  AS CC CXX LD GIT INSTALL \
   CFLAGS CXXFLAGS LDFLAGS EXE_FLAGS SO_FLAGS \
   INCLUDE
 
 .PHONY: toolvars
 toolvars:
 	@echo "List of tool variables:"
+	@echo "  AS                        Assembler tool"
 	@echo "  CC                        C compiler execution command line"
 	@echo "  CFLAGS                    C compiler build flags"
 	@echo "  CXX                       C++ compiler execution command line"

project.mk

@@ -3,7 +3,7 @@ ARTIFACT_NAME               = lsp-r3d-base-lib
 ARTIFACT_VARS               = LSP_R3D_BASE_LIB
 ARTIFACT_HEADERS            = lsp-plug.in
 ARTIFACT_EXPORT_ALL         = 0
-VERSION                     = 0.5.1
+ARTIFACT_VERSION            = 0.5.2
 
 # List of dependencies
 TEST_DEPENDENCIES = \

src/Makefile.d

@@ -0,0 +1,14 @@
+$(LSP_R3D_BASE_LIB_BIN)/main/base_backend.o: main/base_backend.cpp \
+ $(LSP_R3D_BASE_LIB_INC)/lsp-plug.in/r3d/base.h \
+ $(LSP_COMMON_LIB_INC)/lsp-plug.in/common/types.h \
+ $(LSP_COMMON_LIB_INC)/lsp-plug.in/common/version.h \
+ $(LSP_R3D_BASE_LIB_INC)/lsp-plug.in/r3d/version.h \
+ $(LSP_R3D_BASE_LIB_INC)/lsp-plug.in/r3d/backend.h \
+ $(LSP_R3D_BASE_LIB_INC)/lsp-plug.in/r3d/types.h \
+ $(LSP_COMMON_LIB_INC)/lsp-plug.in/common/status.h \
+ $(LSP_COMMON_LIB_INC)/lsp-plug.in/stdlib/string.h
+$(LSP_R3D_BASE_LIB_BIN)/test/main.o: test/main.cpp \
+ $(LSP_TEST_FW_INC)/lsp-plug.in/test-fw/main.h \
+ $(LSP_TEST_FW_INC)/lsp-plug.in/test-fw/version.h \
+ $(LSP_COMMON_LIB_INC)/lsp-plug.in/common/types.h \
+ $(LSP_COMMON_LIB_INC)/lsp-plug.in/common/version.h