Updated build script, minor shuffling of code to prevent naming conflicts

This commit is contained in:
Joseph Henry
2019-03-04 18:04:37 -08:00
parent 9ccb05698f
commit 3b967c1a12
18 changed files with 1129 additions and 785 deletions

View File

@@ -66,7 +66,7 @@
#include "Debug.hpp"
#include "concurrentqueue.h"
#include "libzt.h"
#include "ZeroTier.h"
#include "lwipDriver.hpp"
#ifdef __WINDOWS__
@@ -86,7 +86,6 @@
#include <ifaddrs.h>
#endif
#include "libzt.h"
#include "Controls.hpp"
// Use the virtual netcon endpoint instead of a tun/tap port driver