add wepoll target

common.h

@@ -38,7 +38,11 @@
 #include <libnet.h>
 #endif
 
+#if !defined(NO_LIBEV_EMBED)
 #include <my_ev.h>
+#else
+#include "ev.h"
+#endif
 
 #if defined(__MINGW32__)
 #include <winsock2.h>

main.cpp

@@ -49,7 +49,6 @@ int main(int argc, char *argv[])
 		ev_signal_init(&signal_watcher_sigpipe, sigpipe_cb, SIGPIPE);
 		ev_signal_start(loop, &signal_watcher_sigpipe);
 #endif
-
 		ev_signal signal_watcher_sigterm;
 		ev_signal_init(&signal_watcher_sigterm, sigterm_cb, SIGTERM);
 		ev_signal_start(loop, &signal_watcher_sigterm);

makefile

@@ -9,17 +9,19 @@ cc_arm= /toolchains/arm-2014.05/bin/arm-none-linux-gnueabi-g++
 #cc_arm=/toolchains/lede-sdk-17.01.2-brcm2708-bcm2708_gcc-5.4.0_musl-1.1.16_eabi.Linux-x86_64/staging_dir/toolchain-arm_arm1176jzf-s+vfp_gcc-5.4.0_musl-1.1.16_eabi/bin/arm-openwrt-linux-muslgnueabi-g++
 #cc_bcm2708=/home/wangyu/raspberry/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian/bin/arm-linux-gnueabihf-g++ 
 cc_tmp= /home/wangyu/OpenWrt-SDK-15.05-x86-64_gcc-4.8-linaro_uClibc-0.9.33.2.Linux-x86_64/staging_dir/toolchain-x86_64_gcc-4.8-linaro_uClibc-0.9.33.2/bin/x86_64-openwrt-linux-uclibc-g++
+cc_mingw_cross=i686-w64-mingw32-g++-posix
 
 FLAGS= -std=c++11 -Wall -Wextra -Wno-unused-variable -Wno-unused-parameter -Wno-missing-field-initializers ${OPT}
 
-COMMON=main.cpp lib/md5.cpp encrypt.cpp log.cpp network.cpp common.cpp  connection.cpp misc.cpp fd_manager.cpp client.cpp -lpthread my_ev.cpp -isystem libev
+COMMON=main.cpp lib/md5.cpp encrypt.cpp log.cpp network.cpp common.cpp  connection.cpp misc.cpp fd_manager.cpp client.cpp -lpthread
 
 PCAP="-lpcap"
 
 LIBNET=-D_DEFAULT_SOURCE `libnet-config --defines` `libnet-config --libs`
 
 
-SOURCES= $(COMMON) lib/aes_faster_c/aes.cpp lib/aes_faster_c/wrapper.cpp lib/pbkdf2-sha1.cpp lib/pbkdf2-sha256.cpp
+SOURCES0= $(COMMON) lib/aes_faster_c/aes.cpp lib/aes_faster_c/wrapper.cpp lib/pbkdf2-sha1.cpp lib/pbkdf2-sha256.cpp
+SOURCES=${SOURCES0} my_ev.cpp -isystem libev
 SOURCES_TINY_AES= $(COMMON) lib/aes.cpp
 SOURCES_AES_ACC=$(COMMON) $(wildcard lib/aes_acc/aes*.c)
 
@@ -40,6 +42,12 @@ mingw:git_version
 	rm -f ${OUTPUTS}
 	${cc_local}   -o ${NAME}_nolibnet          -I. ${SOURCES} pcap_wrapper.cpp ${FLAGS} -ggdb -static -O2 -lws2_32
 
+mingw_cross:git_version
+	${cc_mingw_cross}   -o ${NAME}_nolibnet.exe          -I. ${SOURCES} pcap_wrapper.cpp ${FLAGS} -ggdb -static -O2 -lws2_32
+
+mingw_cross_wepoll:git_version
+	${cc_mingw_cross}   -o ${NAME}_nolibnet_wepoll.exe          -I. ${SOURCES0} pcap_wrapper.cpp ${FLAGS} -ggdb -static -O2 -DNO_LIBEV_EMBED -D_WIN32 -lev -lws2_32
+
 linux:git_version
 	rm -f ${OUTPUTS}
 	${cc_local}   -o ${NAME}          -I. ${SOURCES} ${PCAP} ${LIBNET} ${FLAGS} -lrt -ggdb -static -O2
@@ -88,4 +96,3 @@ clean:
 
 git_version:
 	    echo "const char *gitversion = \"$(shell git rev-parse HEAD)\";" > git_version.h
-	

network.cpp

@@ -79,7 +79,7 @@ int use_pcap_mutex=1;
 
 ev_async async_watcher;
 
-ev_loop* g_default_loop;
+struct ev_loop* g_default_loop;
 
 pthread_t pcap_recv_thread;
 

network.h

@@ -34,7 +34,7 @@ extern int g_packet_buf_cnt;
 extern queue_t my_queue;
 
 extern ev_async async_watcher;
-extern ev_loop* g_default_loop;
+extern struct ev_loop* g_default_loop;
 
 extern pthread_mutex_t queue_mutex;
 extern int use_pcap_mutex;