Skip to content

Commit

Permalink
changes for ZT 1.0.3 relesae
Browse files Browse the repository at this point in the history
  • Loading branch information
mwarning committed Jun 4, 2015
1 parent 0a34fab commit d065f70
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 11 deletions.
4 changes: 2 additions & 2 deletions zerotier/Config.in
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ config ZEROTIER_ENABLE_DEBUG
depends on PACKAGE_zerotier
default n

config ZEROTIER_ENABLE_UPDATER
bool "Build with Updater"
config ZEROTIER_ENABLE_NETWORK_CONTROLLER
bool "Build with network controller"
depends on PACKAGE_zerotier
default n

Expand Down
17 changes: 8 additions & 9 deletions zerotier/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=zerotier
PKG_VERSION:=1.0.3-dev
PKG_REV:=99a104b9bc34acab361e4b5f3c5d7db9bda6ccb1
PKG_RELEASE:=8
PKG_VERSION:=1.0.3
PKG_REV:=da592c23d477547b15a9bec2b39f476a81b28d45
PKG_RELEASE:=1

PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=git://github.com/mwarning/ZeroTierOne.git
Expand Down Expand Up @@ -45,16 +45,15 @@ define Package/zerotier/config
source "$(SOURCE)/Config.in"
endef

ifeq ($(CONFIG_ZEROTIER_ENABLE_DEBUG),y)
MAKE_FLAGS += " ZT_DEBUG=1 "
TARGET_CFLAGS += -ggdb3
ifeq ($(CONFIG_ZEROTIER_ENABLE_NETWORK_CONTROLLER),y)
MAKE_FLAGS += ZT_ENABLE_NETWORK_CONTROLLER=1
DEPENDS+=+sqlite
endif

ifeq ($(CONFIG_ZEROTIER_ENABLE_UPDATER),y)
MAKE_FLAGS += " ZT_AUTO_UPDATE=1 "
ifeq ($(CONFIG_ZEROTIER_ENABLE_DEBUG),y)
TARGET_CFLAGS += -DZT_TRACE -ggdb3
endif


#libstdc++
#MAKE_FLAGS += LDFLAGS="-static-libgcc -static-libstdc++ -lgcc_s"
MAKE_FLAGS += \
Expand Down

0 comments on commit d065f70

Please sign in to comment.