1.删除openssl锁初始化函数
[Modify]
1.重构并修改redis异步回调函数代码
2.修改Makefiel,对moodycamel_field_stat2.cpp文件使用g++编译
[Add]
1.添加屏幕信息统计库libMESA_field_stat2.a
2.添加对C++静态库C调用的内部封装接口文件
This commit is contained in:
fengweihao
2018-07-05 14:05:28 +08:00
parent fb554743df
commit d02f57e5ee
14 changed files with 385 additions and 141 deletions

View File

@@ -2,7 +2,7 @@
$(OBJ_DIR):
mkdir $(OBJ_DIR)
#mkdir $(OBJ_DIR_CPP)
mkdir $(OBJ_DIR_CPP)
# applications object suffix rule
@@ -12,21 +12,21 @@ $(OBJ_DIR)/%.o: %.c
$(OBJ_DIR)/%.o: %.S
$(ASSEMBLE)
#$(OBJ_DIR_CPP)/%.o: %.cpp
# $(CPPCOMPILE)
$(OBJ_DIR_CPP)/%.o: %.cpp
$(CPPCOMPILE)
# application config check and rules
-include $(OBJS:.o=.d)
#-include $(OBJS_CPP:.o=.d)
-include $(OBJS_CPP:.o=.d)
application-target: $(TARGET)
#$(TARGET): $(OBJ_DIR) $(OBJS) $(LIBS_LIST) $(OBJ_DIR_CPP) $(OBJS_CPP)
# $(CC) -o $@ $(OBJS) $(OBJS_CPP) $(LDFLAGS_PATH) $(LIBS_LIST) $(LDFLAGS_GLOBAL)
$(TARGET): $(OBJ_DIR) $(OBJS) $(LIBS_LIST) $(OBJ_DIR_CPP) $(OBJS_CPP)
$(CC) -o $@ $(OBJS) $(OBJS_CPP) $(LDFLAGS_PATH) $(LIBS_LIST) $(LDFLAGS_GLOBAL)
$(TARGET): $(OBJ_DIR) $(OBJS) $(LIBS_LIST)
$(CC) -o $@ $(OBJS) $(LDFLAGS_PATH) $(LIBS_LIST) $(LDFLAGS_GLOBAL)
#$(TARGET): $(OBJ_DIR) $(OBJS) $(LIBS_LIST)
# $(CC) -o $@ $(OBJS) $(LDFLAGS_PATH) $(LIBS_LIST) $(LDFLAGS_GLOBAL)
$(TARGET).stp: $(TARGET)
$(STRIP) -o $(TARGET).stp $(TARGET)

View File

@@ -32,13 +32,13 @@ STRIP = strip
OBJDUMP = objdump
NM = nm
#CPP = g++
CPP = g++
# build object directory
OBJ_DIR = obj$(PREFIX)
#OBJ_DIR_CPP = obj$(PREFIX)/cpp
OBJ_DIR_CPP = obj$(PREFIX)/cpp
# standard compile line
@@ -48,4 +48,4 @@ ASSEMBLE = $(CC) $(ASFLAGS_GLOBAL) $(ASFLAGS_LOCAL) -MD -c -o $@ $<
MYARCHIVE = $(AR) -cr $@ $<
#CPPCOMPILE = $(CPP) $(CFLAGS_GLOBAL) $(CFLAGS_LOCAL) -MD -c -o $@ $<
CPPCOMPILE = $(CPP) $(CFLAGS_GLOBAL) $(CFLAGS_LOCAL) -MD -c -o $@ $<