From 174d54a9732df9f059719164f3b850d6fb8a2299 Mon Sep 17 00:00:00 2001
From: lkasso <laura@kassovic.com>
Date: Thu, 25 Mar 2021 16:37:21 -0700
Subject: [PATCH] 0.20.1

---
 Doxyfile           |  2 +-
 Makefile           | 31 ++++++++++++++++++++++++++-----
 README.md          |  4 ++--
 project_version.mk |  4 ++--
 4 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/Doxyfile b/Doxyfile
index 4bb8f35..3463b18 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -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
diff --git a/Makefile b/Makefile
index c604f2b..3e879da 100644
--- a/Makefile
+++ b/Makefile
@@ -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
@@ -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)
@@ -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)
 
@@ -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
 
diff --git a/README.md b/README.md
index 1fae4b4..bf4499a 100644
--- a/README.md
+++ b/README.md
@@ -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
 
 ```
 
diff --git a/project_version.mk b/project_version.mk
index 9d903d0..79f83cc 100644
--- a/project_version.mk
+++ b/project_version.mk
@@ -1,4 +1,4 @@
-VERSION=0.20.0
+VERSION=0.20.1
 VERSION_MAJOR=0
 VERSION_MINOR=20
-VERSION_STEP=0
+VERSION_STEP=1