A few more visual studio file changes, forgot to save all. Will be switching to dev branch now.

This commit is contained in:
Adam Ierymenko 2013-08-12 14:47:02 -04:00
parent 2fbe1e200b
commit 2ad80063ec
3 changed files with 13 additions and 149 deletions

View File

@ -9,10 +9,10 @@ Global
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{0D4AE49A-FCE5-404F-8041-7FFC4DAF83F4}.Debug|Win32.ActiveCfg = Debug|Win32
{0D4AE49A-FCE5-404F-8041-7FFC4DAF83F4}.Debug|Win32.Build.0 = Debug|Win32
{0D4AE49A-FCE5-404F-8041-7FFC4DAF83F4}.Release|Win32.ActiveCfg = Release|Win32
{0D4AE49A-FCE5-404F-8041-7FFC4DAF83F4}.Release|Win32.Build.0 = Release|Win32
{0D4AE49A-FCE5-404F-8041-7FFC4DAF83F4}.Debug|Win32.ActiveCfg = Debug_32|Win32
{0D4AE49A-FCE5-404F-8041-7FFC4DAF83F4}.Debug|Win32.Build.0 = Debug_32|Win32
{0D4AE49A-FCE5-404F-8041-7FFC4DAF83F4}.Release|Win32.ActiveCfg = Debug_32|Win32
{0D4AE49A-FCE5-404F-8041-7FFC4DAF83F4}.Release|Win32.Build.0 = Debug_32|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

View File

@ -1,12 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<ProjectConfiguration Include="Debug_32|Win32">
<Configuration>Debug_32</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
@ -15,39 +11,30 @@
<Keyword>Win32Proj</Keyword>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_32|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug_32|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_32|Win32'">
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_32|Win32'">
<ClCompile>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;ZEROTIERONE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;_DEBUG;__WINDOWS__;_WINDOWS;_USRDLL;ZEROTIERONE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<Optimization>Disabled</Optimization>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<RuntimeTypeInfo>false</RuntimeTypeInfo>
</ClCompile>
<Link>
<TargetMachine>MachineX86</TargetMachine>
@ -55,46 +42,13 @@
<SubSystem>Windows</SubSystem>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;ZEROTIERONE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
<TargetMachine>MachineX86</TargetMachine>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="cli.cpp" />
<ClCompile Include="ext\kissdb\kissdb.c" />
<ClCompile Include="ext\lz4\bench.c" />
<ClCompile Include="ext\lz4\fuzzer.c" />
<ClCompile Include="ext\lz4\lz4.c" />
<ClCompile Include="ext\lz4\lz4demo.c" />
<ClCompile Include="ext\lz4\lz4hc.c" />
<ClCompile Include="idtool.cpp" />
<ClCompile Include="launcher-fakebin.c" />
<ClCompile Include="launcher.c" />
<ClCompile Include="mac-tap\tuntap\src\lock.cc" />
<ClCompile Include="mac-tap\tuntap\src\mem.cc" />
<ClCompile Include="mac-tap\tuntap\src\tap\kmod.cc" />
<ClCompile Include="mac-tap\tuntap\src\tap\tap.cc" />
<ClCompile Include="mac-tap\tuntap\src\tuntap.cc" />
<ClCompile Include="mac-tap\tuntap\src\tuntap_mgr.cc" />
<ClCompile Include="mac-tap\tuntap\src\tun\kmod.cc" />
<ClCompile Include="mac-tap\tuntap\src\tun\tun.cc" />
<ClCompile Include="mac-tap\tuntap\src\tun\tun_inet6_proto.c" />
<ClCompile Include="mac-tap\tuntap\src\tun\tun_inet_proto.c" />
<ClCompile Include="main.cpp" />
<ClCompile Include="makekeypair.cpp" />
<ClCompile Include="netconf-service\netconf-test.cpp" />
<ClCompile Include="netconf-service\netconf.cpp" />
<ClCompile Include="node\Defaults.cpp" />
<ClCompile Include="node\Demarc.cpp" />
<ClCompile Include="node\EllipticCurveKeyPair.cpp" />
@ -117,7 +71,6 @@
<ClCompile Include="node\Topology.cpp" />
<ClCompile Include="node\UdpSocket.cpp" />
<ClCompile Include="node\Utils.cpp" />
<ClCompile Include="selftest.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="ext\bin\libcrypto\include\openssl\aes.h" />
@ -199,14 +152,6 @@
<ClInclude Include="ext\lz4\bench.h" />
<ClInclude Include="ext\lz4\lz4.h" />
<ClInclude Include="ext\lz4\lz4hc.h" />
<ClInclude Include="launcher.h" />
<ClInclude Include="mac-tap\tuntap\src\lock.h" />
<ClInclude Include="mac-tap\tuntap\src\mem.h" />
<ClInclude Include="mac-tap\tuntap\src\tap\tap.h" />
<ClInclude Include="mac-tap\tuntap\src\tuntap.h" />
<ClInclude Include="mac-tap\tuntap\src\tun\tun.h" />
<ClInclude Include="mac-tap\tuntap\src\tun\tun_ioctls.h" />
<ClInclude Include="mac-tap\tuntap\src\util.h" />
<ClInclude Include="node\Address.hpp" />
<ClInclude Include="node\Array.hpp" />
<ClInclude Include="node\AtomicCounter.hpp" />

View File

@ -15,27 +15,6 @@
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="cli.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="idtool.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="main.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="makekeypair.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="selftest.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="launcher-fakebin.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="launcher.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="ext\kissdb\kissdb.c">
<Filter>Source Files</Filter>
</ClCompile>
@ -54,42 +33,6 @@
<ClCompile Include="ext\lz4\lz4hc.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mac-tap\tuntap\src\lock.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mac-tap\tuntap\src\mem.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mac-tap\tuntap\src\tuntap.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mac-tap\tuntap\src\tuntap_mgr.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mac-tap\tuntap\src\tap\kmod.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mac-tap\tuntap\src\tap\tap.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mac-tap\tuntap\src\tun\kmod.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mac-tap\tuntap\src\tun\tun.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mac-tap\tuntap\src\tun\tun_inet6_proto.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mac-tap\tuntap\src\tun\tun_inet_proto.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="netconf-service\netconf-test.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="netconf-service\netconf.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="node\Defaults.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@ -158,9 +101,6 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="launcher.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="version.h">
<Filter>Header Files</Filter>
</ClInclude>
@ -401,27 +341,6 @@
<ClInclude Include="ext\lz4\lz4hc.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="mac-tap\tuntap\src\lock.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="mac-tap\tuntap\src\mem.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="mac-tap\tuntap\src\tuntap.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="mac-tap\tuntap\src\util.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="mac-tap\tuntap\src\tap\tap.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="mac-tap\tuntap\src\tun\tun.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="mac-tap\tuntap\src\tun\tun_ioctls.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="node\Address.hpp">
<Filter>Header Files</Filter>
</ClInclude>