mirrors
/
Modest
mirror of https://github.com/lexborisov/Modest
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes for https://github.com/lexborisov/Modest/issues/20

This commit is contained in:
lexborisov 2017-03-12 21:22:47 +03:00
parent b44c5d340a
commit 0ccabbd8b6
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -77,11 +77,13 @@ clean: $(MODEST_BUILD_MODULES_TARGET_CLEAN)
rm -f $(call MODEST_LIBRARY_WITH_VERSION) && rm -f $(call MODEST_LIBRARY_STATIC)
$(call MODEST_BUILD_CLEAN_AFTER)
clone: $(MODEST_BUILD_MODULES_TARGET_CLONE)
rm -rf $(INCLUDE_TMP)
clone: clean_api $(MODEST_BUILD_MODULES_TARGET_CLONE)
find $(INCLUDE_DIR_API) -name "*.h" -exec sed -i '.bak' -E 's/^[ \t]*#[ \t]*include[ \t]*"([^"]+)"/#include <\1>/g' {} \;
find $(INCLUDE_DIR_API) -name "*.h.bak" -exec rm -f {} \;
clean_api:
rm -rf $(INCLUDE_DIR_API)
create:
mkdir -p $(BINARY_DIR_BASE) $(LIB_DIR_BASE)

2
examples/Makefile
View File

@ -60,7 +60,7 @@ override LDLIBS += $(BINARY_LIBRARIES)
#***************
BINARY_BUILD_EXECUTE ?= $(foreach dir,$(BINARY_BUILD_MODULES_TARGET),$($(dir)_objs))
BINARY_BUILD_EXECUTE_CLEAN := $(foreach path,$(BINARY_BUILD_EXECUTE),$(subst ./,,$(path)))
BINARY_BUILD_EXECUTE_TO_CLEAN := $(foreach path,$(BINARY_BUILD_EXECUTE_CLEAN),rm -f $(BINARY_TO_DIR)/$(path) $(BYNARY_UTILS_NEW_LINE))
BINARY_BUILD_EXECUTE_TO_CLEAN := $(foreach path,$(BINARY_BUILD_EXECUTE_CLEAN),rm -rf $(BINARY_TO_DIR)/$(path) $(BYNARY_UTILS_NEW_LINE))
BINARY_BUILD_DIRS_TO_CLEAN := $(foreach path,$(BINARY_BUILD_MODULES_LIST),rm -rf $(BINARY_TO_DIR)/$(path) $(BYNARY_UTILS_NEW_LINE))
BINARY_BUILD_EXECUTE_COPY := $(foreach path,$(BINARY_BUILD_EXECUTE_CLEAN),cp $(path) $(BINARY_TO_DIR)/$(dir $(path)) $(BYNARY_UTILS_NEW_LINE))
BINARY_BUILD_EXECUTE_COPY_ALL := $(BINARY_UTILS_CREATE_DIRS) $(BINARY_BUILD_EXECUTE_COPY)

4
include/mycore/myosi.h
View File

@ -29,8 +29,8 @@
#include <stdint.h>
#include <inttypes.h>
#define MyCORE_VERSION_MAJOR 1
#define MyCORE_VERSION_MINOR 0
#define MyCORE_VERSION_MAJOR 0
#define MyCORE_VERSION_MINOR 1
#define MyCORE_VERSION_PATCH 0
//#define MyCORE_BUILD_WITHOUT_THREADS