[DEL]

1.删除openssl锁初始化函数 [Modify] 1.重构并修改redis异步回调函数代码 2.修改Makefiel，对moodycamel_field_stat2.cpp文件使用g++编译 [Add] 1.添加屏幕信息统计库libMESA_field_stat2.a 2.添加对C++静态库C调用的内部封装接口文件
2018-07-05 14:05:28 +08:00
parent fb554743df
commit d02f57e5ee
14 changed files with 385 additions and 141 deletions
--- a/src/Makefile
+++ b/src/Makefile
@@ -40,8 +40,12 @@ dir := ./rt
 include $(dir)/rt.mk
 OBJS += $(OBJS_$(dir))

+dir := ./inc
+include $(dir)/inc.mk
+OBJS += $(OBJS_$(dir)) 
+
 LDFLAGS_GLOBAL += -L ./lib -lapps -lcrypto -lssl -levent -lhiredis -lMESA_htable
-LDFLAGS_GLOBAL += -L ./lib -lMESA_htable -lMESA_handle_logger -lMESA_prof_load
+LDFLAGS_GLOBAL += -L ./lib -lMESA_htable -lMESA_field_stat2 -lMESA_handle_logger -lMESA_prof_load
 LDFLAGS_GLOBAL += \
                  -lpthread -lcrypt -lm -lz -ldl -lstdc++