Commit 620d48df authored by Max Lv's avatar Max Lv

fix compile issues

parent 5c58ed98
......@@ -11,9 +11,7 @@ tests/bin
tests/gen
tests/local.properties
NUL
libs/armeabi/polipo
libs/armeabi/pdnsd
libs/armeabi/shadowsocks
libs/armeabi/*
#Intellij IDEA
*.iml
......
No preview for this file type
......@@ -61,12 +61,16 @@ OBFSPROXY_SOURCES := container.c crypt.c external.c \
main.c managed.c network.c \
obfs_main.c protocol.c sha256.c \
socks.c status.c util.c \
protocols/dummy.c protocols/obfs2.c
LOCAL_STATIC_LIBRARIES := libevent libcrypto
LOCAL_MODULE := obfsproxy
LOCAL_SRC_FILES := $(addprefix obfsproxy/, $(OBFSPROXY_SOURCES))
LOCAL_CFLAGS := -O2 -g -I$(LOCAL_PATH)/obfsproxy
LOCAL_CFLAGS := -O2 -g -I$(LOCAL_PATH)/obfsproxy \
-I$(LOCAL_PATH)/libevent/include \
-I$(LOCAL_PATH)/libevent \
-I$(LOCAL_PATH)/openssl/include
include $(BUILD_EXECUTABLE)
......
......@@ -90,6 +90,7 @@
#include "evthread-internal.h"
#include "evbuffer-internal.h"
#include "bufferevent-internal.h"
#include "event-internal.h"
/* some systems do not have MAP_FAILED */
#ifndef MAP_FAILED
......
......@@ -273,7 +273,7 @@
#define HAVE_SYS_PARAM_H 1
/* Define to 1 if you have the <sys/queue.h> header file. */
/* #undef HAVE_SYS_QUEUE_H */
#define HAVE_SYS_QUEUE_H 1
/* Define to 1 if you have the <sys/select.h> header file. */
#define HAVE_SYS_SELECT_H 1
......@@ -303,7 +303,7 @@
#define HAVE_SYS_WAIT_H 1
/* Define if TAILQ_FOREACH is defined in <sys/queue.h> */
#define TAILQ_FOREACH 1
/* #undef TAILQ_FOREACH */
/* Define if timeradd is defined in <sys/time.h> */
#define HAVE_TIMERADD 1
......
# include/Makefile.am for libevent
# Copyright 2000-2007 Niels Provos
# Copyright 2007-2012 Niels Provos and Nick Mathewson
#
# See LICENSE for copying information.
AUTOMAKE_OPTIONS = foreign
EVENT2_EXPORT = \
event2/buffer.h \
event2/buffer_compat.h \
event2/bufferevent.h \
event2/bufferevent_compat.h \
event2/bufferevent_ssl.h \
event2/bufferevent_struct.h \
event2/dns.h \
event2/dns_compat.h \
event2/dns_struct.h \
event2/event.h \
event2/event_compat.h \
event2/event_struct.h \
event2/http.h \
event2/http_compat.h \
event2/http_struct.h \
event2/keyvalq_struct.h \
event2/listener.h \
event2/rpc.h \
event2/rpc_compat.h \
event2/rpc_struct.h \
event2/tag.h \
event2/tag_compat.h \
event2/thread.h \
event2/util.h
EXTRA_SRC = $(EVENT2_EXPORT)
## Without the nobase_ prefixing, Automake would strip "event2/" from
## the source header filename to derive the installed header filename.
## With nobase_ the installed path is $(includedir)/event2/ev*.h.
if INSTALL_LIBEVENT
nobase_include_HEADERS = $(EVENT2_EXPORT)
nobase_nodist_include_HEADERS = ./event2/event-config.h
else
noinst_HEADERS = $(EVENT2_EXPORT)
nodist_noinst_HEADERS = ./event2/event-config.h
endif
This diff is collapsed.
......@@ -316,7 +316,7 @@
#define _EVENT_HAVE_SYS_WAIT_H 1
/* Define if TAILQ_FOREACH is defined in <sys/queue.h> */
#define _EVENT_HAVE_TAILQFOREACH 1
/* #undef _EVENT_HAVE_TAILQFOREACH */
/* Define if timeradd is defined in <sys/time.h> */
#define _EVENT_HAVE_TIMERADD 1
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment