This commit is contained in:
lexborisov 2017-03-09 23:59:56 +03:00
parent 4a54eecead
commit acf97b3871
3 changed files with 8 additions and 5 deletions

View File

@ -99,12 +99,15 @@ MODEST_BUILD_OBJECT_MODULES := $(foreach dir,$(MODEST_BUILD_MODULES_TARGET),$($(
#******************** #********************
# Target options # Target options
#*************** #***************
all: $(MODEST_BUILD_MODULES_TARGET_ALL) all: create $(MODEST_BUILD_MODULES_TARGET_ALL)
$(call MODEST_BUILD_OBJECT_SHARED,$(MODEST_BUILD_OBJECT_MODULES),$(MODEST_LIBRARY)) $(call MODEST_BUILD_OBJECT_SHARED,$(MODEST_BUILD_OBJECT_MODULES),$(MODEST_LIBRARY))
clean: $(MODEST_BUILD_MODULES_TARGET_CLEAN) clean: $(MODEST_BUILD_MODULES_TARGET_CLEAN)
clone: $(MODEST_BUILD_MODULES_TARGET_CLONE) clone: $(MODEST_BUILD_MODULES_TARGET_CLONE)
create:
mkdir -p lib bin
.PHONY: all clean clone $(MODEST_BUILD_MODULES_TARGET_ALL) .PHONY: all clean clone $(MODEST_BUILD_MODULES_TARGET_ALL)
# SRCS := # SRCS :=

View File

@ -31,7 +31,7 @@ endif
#******************* #*******************
ifeq ($(OS),Darwin) ifeq ($(OS),Darwin)
MODEST_CFLAGS += -fPIC MODEST_CFLAGS += -fPIC
MODEST_CFLAGS += $(MODEST_OPTIMIZATION_LEVEL) -Wno-unused-variable --std=c99 MODEST_CFLAGS += $(MODEST_OPTIMIZATION_LEVEL) -Wno-unused-variable -Wno-unused-function --std=c99
LIB_NAME_SUFFIX := .dylib LIB_NAME_SUFFIX := .dylib
@ -55,7 +55,7 @@ endif
ifeq ($(MODEST_BUILD_OS),UNDEF) ifeq ($(MODEST_BUILD_OS),UNDEF)
MODEST_CFLAGS += -fPIC MODEST_CFLAGS += -fPIC
MODEST_CFLAGS += -D_POSIX_C_SOURCE=199309L MODEST_CFLAGS += -D_POSIX_C_SOURCE=199309L
MODEST_CFLAGS += $(MODEST_OPTIMIZATION_LEVEL) -Wno-unused-variable --std=c99 MODEST_CFLAGS += $(MODEST_OPTIMIZATION_LEVEL) -Wno-unused-variable -Wno-unused-function --std=c99
# build without threads # build without threads
ifeq ($(MODEST_BUILD_WITHOUT_THREADS),YES) ifeq ($(MODEST_BUILD_WITHOUT_THREADS),YES)

View File

@ -85,7 +85,7 @@ mcsync_status_t mcsync_lock(mcsync_t* mcsync)
#ifndef MyCORE_BUILD_WITHOUT_THREADS #ifndef MyCORE_BUILD_WITHOUT_THREADS
return mcsync_spin_lock(mcsync->spinlock); return mcsync_spin_lock(mcsync->spinlock);
#else #else
return MyCORE_STATUS_OK; return MCSYNC_STATUS_OK;
#endif #endif
} }
@ -94,6 +94,6 @@ mcsync_status_t mcsync_unlock(mcsync_t* mcsync)
#ifndef MyCORE_BUILD_WITHOUT_THREADS #ifndef MyCORE_BUILD_WITHOUT_THREADS
return mcsync_spin_unlock(mcsync->spinlock); return mcsync_spin_unlock(mcsync->spinlock);
#else #else
return MyCORE_STATUS_OK; return MCSYNC_STATUS_OK;
#endif #endif
} }