gfwleak/zhangyang-libzt
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed protocol version build flags, defaults to IPV4 && IPV6

Browse Source
This commit is contained in:
Joseph Henry
2017-10-18 17:57:51 -07:00
parent 5ec8e1f004
commit 1020386fa7
9 changed files with 108 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Makefile
View File

@@ -227,19 +227,6 @@ ifeq ($(STACK_LWIP),1)
ifeq ($(NS_DEBUG),1)
STACK_DEFS+=LWIP_DEBUG=1
endif
ifeq ($(LIBZT_IPV4)$(LIBZT_IPV6),1)
ifeq ($(LIBZT_IPV4),1)
STACK_DRIVER_DEFS+=-DLIBZT_IPV4 -DLWIP_IPV4=1
STACK_DEFS+=LIBZT_IPV4=1 IPV4=1
endif
ifeq ($(LIBZT_IPV6),1)
STACK_DRIVER_DEFS+=-DLIBZT_IPV6 -DLWIP_IPV6=1
STACK_DEFS+=LIBZT_IPV6=1 IPV6=1
endif
else
STACK_DRIVER_DEFS+=-DLIBZT_IPV4 -DLWIP_IPV4=1
STACK_DEFS+=LIBZT_IPV4=1
endif
STACK_DRIVER_DEFS+=-DLWIP_DONT_PROVIDE_BYTEORDER_FUNCTIONS
STACK_DRIVER_DEFS+=-DSTACK_LWIP
STACK_DRIVER_FILES:=src/lwIP.cpp
@@ -256,6 +243,9 @@ ifeq ($(NO_STACK),1)
STACK_DRIVER_DEFS+=-DNO_STACK
endif
STACK_DRIVER_DEFS+=-DLIBZT_IPV4 -DLWIP_IPV4=1 -DLIBZT_IPV6 -DLWIP_IPV6=1
STACK_DEFS+=LIBZT_IPV6=1 IPV6=1 LIBZT_IPV4=1 IPV4=1
##############################################################################
## Targets ##
##############################################################################