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

Added default network stack (picoTCP) and default protocol versions to makefile

Browse Source
This commit is contained in:
Joseph Henry
2017-07-26 16:55:59 -07:00
parent 79402c6bde
commit 7293c94e43
2 changed files with 56 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
make-linux.mk
View File

@@ -110,19 +110,38 @@ endif
## Stack Configuration ##
##############################################################################
PROTOCOL_VERSION_DEFINED=0
# Stack config flags
# default stack (picoTCP)
STACK_PICO=1
ifeq ($(NO_STACK)$(STACK_LWIP),1)
STACK_PICO=0
endif
# picoTCP default protocol versions
ifeq ($(STACK_PICO),1)
ifeq ($(LIBZT_IPV4)$(LIBZT_IPV6),1)
ifeq ($(LIBZT_IPV4),1)
CXXFLAGS+=-DLIBZT_IPV4
PROTOCOL_VERSION_DEFINED=1
CXXFLAGS+=-DLIBZT_IPV4
endif
ifeq ($(LIBZT_IPV6),1)
CXXFLAGS+=-DLIBZT_IPV6
PROTOCOL_VERSION_DEFINED=1
CXXFLAGS+=-DLIBZT_IPV6
endif
else
CXXFLAGS+=-DLIBZT_IPV4 -DLIBZT_IPV6
endif
endif
# lwIP default protocol versions
ifeq ($(STACK_LWIP),1)
ifeq ($(LIBZT_IPV4)$(LIBZT_IPV6),1)
ifeq ($(LIBZT_IPV4),1)
CXXFLAGS+=-DLIBZT_IPV4
endif
ifeq ($(LIBZT_IPV6),1)
CXXFLAGS+=-DLIBZT_IPV6
endif
else
CXXFLAGS+=-DLIBZT_IPV4
endif
# if no proto version, define both
ifeq ($(PROTOCOL_VERSION_DEFINED),0)
CXXFLAGS+=-DLIBZT_IPV4 -DLIBZT_IPV6
endif
LIBZT_FILES:=src/SocketTap.cpp src/libzt.cpp src/Utilities.cpp

37
make-mac.mk
View File

@@ -108,19 +108,38 @@ endif
## Stack Configuration ##
##############################################################################
PROTOCOL_VERSION_DEFINED=0
# Stack config flags
# default stack (picoTCP)
STACK_PICO=1
ifeq ($(NO_STACK)$(STACK_LWIP),1)
STACK_PICO=0
endif
# picoTCP default protocol versions
ifeq ($(STACK_PICO),1)
ifeq ($(LIBZT_IPV4)$(LIBZT_IPV6),1)
ifeq ($(LIBZT_IPV4),1)
CXXFLAGS+=-DLIBZT_IPV4
PROTOCOL_VERSION_DEFINED=1
CXXFLAGS+=-DLIBZT_IPV4
endif
ifeq ($(LIBZT_IPV6),1)
CXXFLAGS+=-DLIBZT_IPV6
PROTOCOL_VERSION_DEFINED=1
CXXFLAGS+=-DLIBZT_IPV6
endif
else
CXXFLAGS+=-DLIBZT_IPV4 -DLIBZT_IPV6
endif
endif
# lwIP default protocol versions
ifeq ($(STACK_LWIP),1)
ifeq ($(LIBZT_IPV4)$(LIBZT_IPV6),1)
ifeq ($(LIBZT_IPV4),1)
CXXFLAGS+=-DLIBZT_IPV4
endif
ifeq ($(LIBZT_IPV6),1)
CXXFLAGS+=-DLIBZT_IPV6
endif
else
CXXFLAGS+=-DLIBZT_IPV4
endif
# if no proto version, define both
ifeq ($(PROTOCOL_VERSION_DEFINED),0)
CXXFLAGS+=-DLIBZT_IPV4 -DLIBZT_IPV6
endif
LIBZT_FILES:=src/SocketTap.cpp src/libzt.cpp src/Utilities.cpp