summaryrefslogtreecommitdiff
path: root/windows
diff options
context:
space:
mode:
authorAdam Ierymenko <adam.ierymenko@gmail.com>2016-11-03 14:44:49 -0700
committerAdam Ierymenko <adam.ierymenko@gmail.com>2016-11-03 14:44:49 -0700
commitab2ccb094aa2b122876668cccb13f755d56c208b (patch)
tree9b21c910236348c7506c21fbf998ac1b98f5a4a3 /windows
parent3c00cd0f88026ef1964ba6d36019b716d0bb6df6 (diff)
parenta7718bae398c8e910142568d7116c8adedce9d71 (diff)
downloadinfinitytier-ab2ccb094aa2b122876668cccb13f755d56c208b.tar.gz
infinitytier-ab2ccb094aa2b122876668cccb13f755d56c208b.zip
Merge branch 'dev' of http://10.6.6.2/zerotier/ZeroTierOne into dev
Diffstat (limited to 'windows')
-rw-r--r--windows/ZeroTierOne/ZeroTierOne.vcxproj1
1 files changed, 1 insertions, 0 deletions
diff --git a/windows/ZeroTierOne/ZeroTierOne.vcxproj b/windows/ZeroTierOne/ZeroTierOne.vcxproj
index b4bf308c..e5ea25bf 100644
--- a/windows/ZeroTierOne/ZeroTierOne.vcxproj
+++ b/windows/ZeroTierOne/ZeroTierOne.vcxproj
@@ -277,6 +277,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>wsock32.lib;ws2_32.lib;Iphlpapi.lib;Rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+ <AdditionalOptions>"notelemetry.obj" %(AdditionalOptions)</AdditionalOptions>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">