Merge branch 'adamierymenko-dev' of shub-niggurath.zerotier.com:/git/ZeroTierOne into adamierymenko-dev

make-mac.mk

@@ -6,9 +6,12 @@ DEFS=
 LIBS=
 
 ifeq ($(ZT_AUTO_UPDATE),1)
-	DEFS+=-DZT_AUTO_UPDATE
+	DEFS+=-DZT_AUTO_UPDATE 
 endif
 
+# Uncomment to dump trace and log info to stdout (useful for debug/test)
+#DEFS+=-DZT_TRACE -DZT_LOG_STDOUT 
+
 # Uncomment for a release optimized universal binary build
 CFLAGS=-arch i386 -arch x86_64 -Wall -O4 -fstack-protector -pthread -mmacosx-version-min=10.6 -DNDEBUG -Wno-unused-private-field $(INCLUDES) $(DEFS)
 STRIP=strip