More Windows service work... it builds! Now to do a new installer and test. Also fix a Windows compile warning in Switch.cpp.

This commit is contained in:
Adam Ierymenko 2014-02-06 23:12:12 -08:00
commit 5b97bb247e
6 changed files with 54 additions and 141 deletions

View file

@ -12,8 +12,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TapDriver Package", "TapDri
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZeroTierOne", "ZeroTierOne\ZeroTierOne.vcxproj", "{B00A4957-5977-4AC1-9EF4-571DC27EADA2}"
EndProject
Project("{6141683F-8A12-4E36-9623-2EB02B2C2303}") = "ZeroTierOneInstaller", "ZeroTierOneInstaller\ZeroTierOneInstaller.isproj", "{C4424647-0581-47D1-918B-575BFF735CAA}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
CD_ROM|Any CPU = CD_ROM|Any CPU
@ -418,94 +416,6 @@ Global
{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Win8 Release|Win32.Build.0 = Release|Win32
{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Win8 Release|Win32.Deploy.0 = Release|Win32
{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Win8 Release|x64.ActiveCfg = Release|Win32
{C4424647-0581-47D1-918B-575BFF735CAA}.CD_ROM|Any CPU.ActiveCfg = CD_ROM
{C4424647-0581-47D1-918B-575BFF735CAA}.CD_ROM|Any CPU.Build.0 = CD_ROM
{C4424647-0581-47D1-918B-575BFF735CAA}.CD_ROM|Mixed Platforms.ActiveCfg = CD_ROM
{C4424647-0581-47D1-918B-575BFF735CAA}.CD_ROM|Mixed Platforms.Build.0 = CD_ROM
{C4424647-0581-47D1-918B-575BFF735CAA}.CD_ROM|Win32.ActiveCfg = CD_ROM
{C4424647-0581-47D1-918B-575BFF735CAA}.CD_ROM|Win32.Build.0 = CD_ROM
{C4424647-0581-47D1-918B-575BFF735CAA}.CD_ROM|x64.ActiveCfg = CD_ROM
{C4424647-0581-47D1-918B-575BFF735CAA}.CD_ROM|x64.Build.0 = CD_ROM
{C4424647-0581-47D1-918B-575BFF735CAA}.Debug|Any CPU.ActiveCfg = DVD-5
{C4424647-0581-47D1-918B-575BFF735CAA}.Debug|Any CPU.Build.0 = DVD-5
{C4424647-0581-47D1-918B-575BFF735CAA}.Debug|Mixed Platforms.ActiveCfg = DVD-5
{C4424647-0581-47D1-918B-575BFF735CAA}.Debug|Mixed Platforms.Build.0 = DVD-5
{C4424647-0581-47D1-918B-575BFF735CAA}.Debug|Win32.ActiveCfg = DVD-5
{C4424647-0581-47D1-918B-575BFF735CAA}.Debug|Win32.Build.0 = DVD-5
{C4424647-0581-47D1-918B-575BFF735CAA}.Debug|x64.ActiveCfg = DVD-5
{C4424647-0581-47D1-918B-575BFF735CAA}.Debug|x64.Build.0 = DVD-5
{C4424647-0581-47D1-918B-575BFF735CAA}.DVD-5|Any CPU.ActiveCfg = DVD-5
{C4424647-0581-47D1-918B-575BFF735CAA}.DVD-5|Any CPU.Build.0 = DVD-5
{C4424647-0581-47D1-918B-575BFF735CAA}.DVD-5|Mixed Platforms.ActiveCfg = DVD-5
{C4424647-0581-47D1-918B-575BFF735CAA}.DVD-5|Mixed Platforms.Build.0 = DVD-5
{C4424647-0581-47D1-918B-575BFF735CAA}.DVD-5|Win32.ActiveCfg = DVD-5
{C4424647-0581-47D1-918B-575BFF735CAA}.DVD-5|Win32.Build.0 = DVD-5
{C4424647-0581-47D1-918B-575BFF735CAA}.DVD-5|x64.ActiveCfg = DVD-5
{C4424647-0581-47D1-918B-575BFF735CAA}.DVD-5|x64.Build.0 = DVD-5
{C4424647-0581-47D1-918B-575BFF735CAA}.Release|Any CPU.ActiveCfg = SingleImage
{C4424647-0581-47D1-918B-575BFF735CAA}.Release|Any CPU.Build.0 = SingleImage
{C4424647-0581-47D1-918B-575BFF735CAA}.Release|Mixed Platforms.ActiveCfg = SingleImage
{C4424647-0581-47D1-918B-575BFF735CAA}.Release|Mixed Platforms.Build.0 = SingleImage
{C4424647-0581-47D1-918B-575BFF735CAA}.Release|Win32.ActiveCfg = SingleImage
{C4424647-0581-47D1-918B-575BFF735CAA}.Release|Win32.Build.0 = SingleImage
{C4424647-0581-47D1-918B-575BFF735CAA}.Release|x64.ActiveCfg = SingleImage
{C4424647-0581-47D1-918B-575BFF735CAA}.Release|x64.Build.0 = SingleImage
{C4424647-0581-47D1-918B-575BFF735CAA}.SingleImage|Any CPU.ActiveCfg = SingleImage
{C4424647-0581-47D1-918B-575BFF735CAA}.SingleImage|Any CPU.Build.0 = SingleImage
{C4424647-0581-47D1-918B-575BFF735CAA}.SingleImage|Mixed Platforms.ActiveCfg = SingleImage
{C4424647-0581-47D1-918B-575BFF735CAA}.SingleImage|Mixed Platforms.Build.0 = SingleImage
{C4424647-0581-47D1-918B-575BFF735CAA}.SingleImage|Win32.ActiveCfg = SingleImage
{C4424647-0581-47D1-918B-575BFF735CAA}.SingleImage|Win32.Build.0 = SingleImage
{C4424647-0581-47D1-918B-575BFF735CAA}.SingleImage|x64.ActiveCfg = SingleImage
{C4424647-0581-47D1-918B-575BFF735CAA}.SingleImage|x64.Build.0 = SingleImage
{C4424647-0581-47D1-918B-575BFF735CAA}.Vista Debug|Any CPU.ActiveCfg = SingleImage
{C4424647-0581-47D1-918B-575BFF735CAA}.Vista Debug|Any CPU.Build.0 = SingleImage
{C4424647-0581-47D1-918B-575BFF735CAA}.Vista Debug|Mixed Platforms.ActiveCfg = SingleImage
{C4424647-0581-47D1-918B-575BFF735CAA}.Vista Debug|Mixed Platforms.Build.0 = SingleImage
{C4424647-0581-47D1-918B-575BFF735CAA}.Vista Debug|Win32.ActiveCfg = SingleImage
{C4424647-0581-47D1-918B-575BFF735CAA}.Vista Debug|Win32.Build.0 = SingleImage
{C4424647-0581-47D1-918B-575BFF735CAA}.Vista Debug|x64.ActiveCfg = SingleImage
{C4424647-0581-47D1-918B-575BFF735CAA}.Vista Debug|x64.Build.0 = SingleImage
{C4424647-0581-47D1-918B-575BFF735CAA}.Vista Release|Any CPU.ActiveCfg = SingleImage
{C4424647-0581-47D1-918B-575BFF735CAA}.Vista Release|Any CPU.Build.0 = SingleImage
{C4424647-0581-47D1-918B-575BFF735CAA}.Vista Release|Mixed Platforms.ActiveCfg = SingleImage
{C4424647-0581-47D1-918B-575BFF735CAA}.Vista Release|Mixed Platforms.Build.0 = SingleImage
{C4424647-0581-47D1-918B-575BFF735CAA}.Vista Release|Win32.ActiveCfg = SingleImage
{C4424647-0581-47D1-918B-575BFF735CAA}.Vista Release|Win32.Build.0 = SingleImage
{C4424647-0581-47D1-918B-575BFF735CAA}.Vista Release|x64.ActiveCfg = SingleImage
{C4424647-0581-47D1-918B-575BFF735CAA}.Vista Release|x64.Build.0 = SingleImage
{C4424647-0581-47D1-918B-575BFF735CAA}.Win7 Debug|Any CPU.ActiveCfg = SingleImage
{C4424647-0581-47D1-918B-575BFF735CAA}.Win7 Debug|Any CPU.Build.0 = SingleImage
{C4424647-0581-47D1-918B-575BFF735CAA}.Win7 Debug|Mixed Platforms.ActiveCfg = SingleImage
{C4424647-0581-47D1-918B-575BFF735CAA}.Win7 Debug|Mixed Platforms.Build.0 = SingleImage
{C4424647-0581-47D1-918B-575BFF735CAA}.Win7 Debug|Win32.ActiveCfg = SingleImage
{C4424647-0581-47D1-918B-575BFF735CAA}.Win7 Debug|Win32.Build.0 = SingleImage
{C4424647-0581-47D1-918B-575BFF735CAA}.Win7 Debug|x64.ActiveCfg = SingleImage
{C4424647-0581-47D1-918B-575BFF735CAA}.Win7 Debug|x64.Build.0 = SingleImage
{C4424647-0581-47D1-918B-575BFF735CAA}.Win7 Release|Any CPU.ActiveCfg = SingleImage
{C4424647-0581-47D1-918B-575BFF735CAA}.Win7 Release|Any CPU.Build.0 = SingleImage
{C4424647-0581-47D1-918B-575BFF735CAA}.Win7 Release|Mixed Platforms.ActiveCfg = SingleImage
{C4424647-0581-47D1-918B-575BFF735CAA}.Win7 Release|Mixed Platforms.Build.0 = SingleImage
{C4424647-0581-47D1-918B-575BFF735CAA}.Win7 Release|Win32.ActiveCfg = SingleImage
{C4424647-0581-47D1-918B-575BFF735CAA}.Win7 Release|Win32.Build.0 = SingleImage
{C4424647-0581-47D1-918B-575BFF735CAA}.Win7 Release|x64.ActiveCfg = SingleImage
{C4424647-0581-47D1-918B-575BFF735CAA}.Win7 Release|x64.Build.0 = SingleImage
{C4424647-0581-47D1-918B-575BFF735CAA}.Win8 Debug|Any CPU.ActiveCfg = SingleImage
{C4424647-0581-47D1-918B-575BFF735CAA}.Win8 Debug|Any CPU.Build.0 = SingleImage
{C4424647-0581-47D1-918B-575BFF735CAA}.Win8 Debug|Mixed Platforms.ActiveCfg = SingleImage
{C4424647-0581-47D1-918B-575BFF735CAA}.Win8 Debug|Mixed Platforms.Build.0 = SingleImage
{C4424647-0581-47D1-918B-575BFF735CAA}.Win8 Debug|Win32.ActiveCfg = SingleImage
{C4424647-0581-47D1-918B-575BFF735CAA}.Win8 Debug|Win32.Build.0 = SingleImage
{C4424647-0581-47D1-918B-575BFF735CAA}.Win8 Debug|x64.ActiveCfg = SingleImage
{C4424647-0581-47D1-918B-575BFF735CAA}.Win8 Debug|x64.Build.0 = SingleImage
{C4424647-0581-47D1-918B-575BFF735CAA}.Win8 Release|Any CPU.ActiveCfg = SingleImage
{C4424647-0581-47D1-918B-575BFF735CAA}.Win8 Release|Any CPU.Build.0 = SingleImage
{C4424647-0581-47D1-918B-575BFF735CAA}.Win8 Release|Mixed Platforms.ActiveCfg = SingleImage
{C4424647-0581-47D1-918B-575BFF735CAA}.Win8 Release|Mixed Platforms.Build.0 = SingleImage
{C4424647-0581-47D1-918B-575BFF735CAA}.Win8 Release|Win32.ActiveCfg = SingleImage
{C4424647-0581-47D1-918B-575BFF735CAA}.Win8 Release|Win32.Build.0 = SingleImage
{C4424647-0581-47D1-918B-575BFF735CAA}.Win8 Release|x64.ActiveCfg = SingleImage
{C4424647-0581-47D1-918B-575BFF735CAA}.Win8 Release|x64.Build.0 = SingleImage
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE