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

include/ZeroTierOne.h

@@ -51,6 +51,7 @@
 #define ZT_SDK_API __declspec(dllexport)
 #else
 #define ZT_SDK_API __declspec(dllimport)
+#if !defined(ZT_SDK)
 #ifdef _DEBUG
 #ifdef _WIN64
 #pragma comment(lib, "ZeroTierOne_x64d.lib")
@@ -65,6 +66,7 @@
 #endif
 #endif
 #endif
+#endif
 #else
 #define ZT_SDK_API
 #endif