Merge branch 'dev' of http://10.6.6.2/zerotier/ZeroTierOne into edge

2017-06-27 11:31:39 -07:00
parent 355cce3938 c61440efea
commit ada2ea3a6b
2 changed files with 22 additions and 0 deletions
--- a/make-linux.mk
+++ b/make-linux.mk
@@ -46,6 +46,10 @@ ifeq ($(ZT_SYNOLOGY), 1)
 	DEFS+=-D__SYNOLOGY__
 endif

+ifeq ($(ZT_QNAP), 1)
+	DEFS+=-D__QNAP__
+endif
+
 ifeq ($(ZT_TRACE),1)
 	DEFS+=-DZT_TRACE
 endif