Skip to content

Commit

Permalink
0.20.1
Browse files Browse the repository at this point in the history
  • Loading branch information
lkasso committed Mar 25, 2021
1 parent 184cf5a commit 174d54a
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ PROJECT_NAME = "MetaWear C++ API"
# could be handy for archiving the generated documentation or if some version
# control system is used.

PROJECT_NUMBER = 0.20.0
PROJECT_NUMBER = 0.20.1

# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
Expand Down
31 changes: 26 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.PHONY: build clean test doc archive publish install generator bindings pythonbindings javascriptbindings swiftbindings
.PHONY: build stbuild clean test doc archive publish install generator bindings pythonbindings javascriptbindings swiftbindings

include config.mk
include project_version.mk
Expand Down Expand Up @@ -34,7 +34,8 @@ ifneq ($(KERNEL),Darwin)
LD_FLAGS:=$(LD_FLAGS)--soname
else
EXTENSION:=dylib
LD_FLAGS:=-flat_namespace -undefined suppress -dynamiclib $(LD_FLAGS)-install_name
ST_LD_FLAGS:=-flat_namespace -undefined suppress
LD_FLAGS:=-dynamiclib $(LD_FLAGS)-install_name
endif
LIB_SO_NAME:=lib$(APP_NAME).$(EXTENSION)
LIB_SHORT_NAME:=$(LIB_SO_NAME).$(VERSION_MAJOR)
Expand All @@ -61,17 +62,18 @@ LD_FLAGS:=$(LD_FLAGS),$(LIB_SHORT_NAME) $(ARCH)
REAL_DIST_DIR:=$(DIST_DIR)/$(CONFIGURATION)/lib/$(MACHINE)
REAL_BUILD_DIR:=$(BUILD_DIR)/$(MACHINE)/$(CONFIGURATION)
MODULES_BUILD_DIR:=$(addprefix $(REAL_BUILD_DIR)/, $(MODULES_SRC_DIR))
LIBMETAWEAR_JAVASCRIPT_PATH:=$(BUILD_DIR)/bindings/javascript/libmetawear-path.js
LIBMETAWEAR_JAVASCRIPT_PATH:=$(BINDINGS_DIR)/javascript/libmetawear-path.js
#LIBMETAWEAR_JAVASCRIPT_PATH:=$(BUILD_DIR)/bindings/javascript/libmetawear-path.js

OBJS:=$(addprefix $(REAL_BUILD_DIR)/,$(SRCS:%.cpp=%.o))
DEPS:=$(OBJS:%.o=%.d)

APP_OUTPUT:=$(REAL_DIST_DIR)/$(LIB_NAME)

build: $(APP_OUTPUT)
build: $(APP_OUTPUT) $(LIBMETAWEAR_JAVASCRIPT_PATH)

$(REAL_BUILD_DIR)/%.o: %.cpp
clang-5.0 -MMD -MP -MF "$(@:%.o=%.d)" -c -o $@ $(CXXFLAGS) $<
$(CXX) -MMD -MP -MF "$(@:%.o=%.d)" -c -o $@ $(CXXFLAGS) $<

-include $(DEPS)

Expand All @@ -87,6 +89,25 @@ $(APP_OUTPUT): $(OBJS) | $(REAL_DIST_DIR)
ln -sf $(LIB_NAME) $(REAL_DIST_DIR)/$(LIB_SHORT_NAME)
ln -sf $(LIB_SHORT_NAME) $(REAL_DIST_DIR)/$(LIB_SO_NAME)

#build: $(APP_OUTPUT)

#$(REAL_BUILD_DIR)/%.o: %.cpp
# clang-5.0 -MMD -MP -MF "$(@:%.o=%.d)" -c -o $@ $(CXXFLAGS) $<

#-include $(DEPS)

#$(MODULES_BUILD_DIR):
# mkdir -p $@

#$(REAL_DIST_DIR):
# mkdir -p $@

#$(OBJS): | $(MODULES_BUILD_DIR)
#$(APP_OUTPUT): $(OBJS) | $(REAL_DIST_DIR)
# $(CXX) -o $@ $(LD_FLAGS) $(ST_LD_FLAGS) $^
# ln -sf $(LIB_NAME) $(REAL_DIST_DIR)/$(LIB_SHORT_NAME)
# ln -sf $(LIB_SHORT_NAME) $(REAL_DIST_DIR)/$(LIB_SO_NAME)

PUBLISH_NAME:=$(APP_NAME)-$(VERSION).tar
PUBLISH_NAME_ZIP:=$(PUBLISH_NAME).gz

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ dist/
└── lib
└── x64
├── libmetawear.so -> libmetawear.so.0
├── libmetawear.so.0 -> libmetawear.so.0.20.0
└── libmetawear.so.0.20.0
├── libmetawear.so.0 -> libmetawear.so.0.20.1
└── libmetawear.so.0.20.1

```

Expand Down
4 changes: 2 additions & 2 deletions project_version.mk
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
VERSION=0.20.0
VERSION=0.20.1
VERSION_MAJOR=0
VERSION_MINOR=20
VERSION_STEP=0
VERSION_STEP=1

0 comments on commit 174d54a

Please sign in to comment.