pdxx
/
fastdfs
mirror of https://github.com/happyfish100/fastdfs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

compile passed in mac OS Darwin

pull/48/head
Yu Qing 2014-11-30 15:47:13 +08:00
parent 9a47139321
commit 308bc053a2
5 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
HISTORY
View File

@ -1,4 +1,7 @@
Version 5.06 2014-11-30
* compile passed in mac OS Darwin
Version 5.05 2014-11-22 Version 5.05 2014-11-22
* tracker_mem.c log more info * tracker_mem.c log more info
* remove useless global variable: g_network_tv * remove useless global variable: g_network_tv

2
common/fdfs_global.c
View File

@ -23,7 +23,7 @@
int g_fdfs_connect_timeout = DEFAULT_CONNECT_TIMEOUT; int g_fdfs_connect_timeout = DEFAULT_CONNECT_TIMEOUT;
int g_fdfs_network_timeout = DEFAULT_NETWORK_TIMEOUT; int g_fdfs_network_timeout = DEFAULT_NETWORK_TIMEOUT;
char g_fdfs_base_path[MAX_PATH_SIZE] = {'/', 't', 'm', 'p', '\0'}; char g_fdfs_base_path[MAX_PATH_SIZE] = {'/', 't', 'm', 'p', '\0'};
Version g_fdfs_version = {5, 5}; Version g_fdfs_version = {5, 6};
bool g_use_connection_pool = false; bool g_use_connection_pool = false;
ConnectionPool g_connection_pool; ConnectionPool g_connection_pool;
int g_connection_pool_max_idle_time = 3600; int g_connection_pool_max_idle_time = 3600;

6
make.sh
View File

@ -74,6 +74,12 @@ else
fi fi
LIBS='' LIBS=''
if [ $OS_BITS -eq 64 ]; then
LIBS='-L/usr/lib64'
else
LIBS='-L/usr/lib'
fi
uname=$(uname) uname=$(uname)
if [ "$uname" = "Linux" ]; then if [ "$uname" = "Linux" ]; then
CFLAGS="$CFLAGS -DOS_LINUX -DIOEVENT_USE_EPOLL" CFLAGS="$CFLAGS -DOS_LINUX -DIOEVENT_USE_EPOLL"

2
storage/Makefile.in
View File

@ -2,7 +2,7 @@
COMPILE = $(CC) $(CFLAGS) COMPILE = $(CC) $(CFLAGS)
INC_PATH = -I. -Itrunk_mgr -I../common -I../tracker -I../client -Ifdht_client -I/usr/include/fastcommon INC_PATH = -I. -Itrunk_mgr -I../common -I../tracker -I../client -Ifdht_client -I/usr/include/fastcommon
LIB_PATH = -L/usr/local/lib $(LIBS) -lfastcommon LIB_PATH = $(LIBS) -lfastcommon
TARGET_PATH = $(TARGET_PREFIX)/bin TARGET_PATH = $(TARGET_PREFIX)/bin
CONFIG_PATH = $(TARGET_CONF_PATH) CONFIG_PATH = $(TARGET_CONF_PATH)

2
tracker/Makefile.in
View File

@ -2,7 +2,7 @@
COMPILE = $(CC) $(CFLAGS) COMPILE = $(CC) $(CFLAGS)
INC_PATH = -I../common -I/usr/include/fastcommon INC_PATH = -I../common -I/usr/include/fastcommon
LIB_PATH = -L/usr/local/lib $(LIBS) -lfastcommon LIB_PATH = $(LIBS) -lfastcommon
TARGET_PATH = $(TARGET_PREFIX)/bin TARGET_PATH = $(TARGET_PREFIX)/bin
CONFIG_PATH = $(TARGET_CONF_PATH) CONFIG_PATH = $(TARGET_CONF_PATH)