Updated header and dependencies

Author: sadko4u

dependencies.mk

@@ -10,4 +10,5 @@ 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_BASE_LIB_CEXPORT    ::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          2
+#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
+    #define LSP_R3D_BASE_LIB_CIMPORT
+#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

@@ -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 =

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) || \