Windows compatibility (#57)

* Add Python and Redis submodules, and remove old third-party modules * Update VS projects (WARNING: references files that do not exist yet) * Update code & add shims for APIs except AF_UNIX/{send,recv}msg() * Minor style changes.
2026-09-11 12:43:20 +08:00 · 2016-11-22 17:04:24 -08:00
parent a93c6b7596
commit 7237ec4124
65 changed files with 2233 additions and 7126 deletions
@@ -1,19 +0,0 @@
-@SetLocal
-	@Echo Off
-	@PushD "%~dp0"
-		git                                                     submodule update --init --jobs="%NUMBER_OF_PROCESSORS%"
-		git -C "arrow"                                          submodule update --init --jobs="%NUMBER_OF_PROCESSORS%"
-		git -C "grpc"                                           submodule update --init --jobs="%NUMBER_OF_PROCESSORS%" -- "third_party/nanopb" "third_party/protobuf"
-		Call :GitApply "grpc"                                   "%CD%/patches/grpc-source.patch"
-		Call :GitApply "grpc"                                   "%CD%/patches/windows/grpc-projects.patch"
-		Call :GitApply "grpc/third_party/protobuf"              "%CD%/patches/windows/protobuf-projects.patch"
-		Call :GitApply "arrow/cpp/thirdparty/flatbuffers"       "%CD%/patches/windows/flatbuffers-projects.patch"
-		Call :GitApply "python"                                 "%CD%/patches/windows/python-pyconfig.patch"
-	@PopD
-@EndLocal
-@GoTo :EOF
-
-:GitApply <ChangeToFolder> <Patch>
-	@REM Check if patch already applied by attempting to apply it in reverse; if not, then force-reapply it
-	git -C "%~1" apply "%~2" -R --check 2> NUL || git -C "%~1" apply "%~2" --3way 2> NUL || git -C "%~1" reset --hard && git -C "%~1" apply "%~2" --3way
-@GoTo :EOF
@@ -1 +0,0 @@
-*.patch text eol=lf
@@ -1,17 +0,0 @@
-diff --git a/src/cpp/server/create_default_thread_pool.cc b/src/cpp/server/create_default_thread_pool.cc
-index f3b07ec..ede18cb
--- a/src/cpp/server/create_default_thread_pool.cc
-+++ b/src/cpp/server/create_default_thread_pool.cc
-@@ -40,8 +40,12 @@
- namespace grpc {
- 
- ThreadPoolInterface* CreateDefaultThreadPool() {
-+#ifdef NDEBUG
-   int cores = gpr_cpu_num_cores();
-   if (!cores) cores = 4;
-+#else
-+  int cores = 0;
-+#endif
-   return new DynamicThreadPool(cores);
- }
- 
@@ -1,265 +0,0 @@
-diff --git a/build_ide/VS2010/flatc.props b/build_ide/VS2010/flatc.props
-new file
-index e69de29..e8431c7
--- /dev/null
-+++ b/build_ide/VS2010/flatc.props
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="utf-8"?>
-+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-+  <ImportGroup Label="PropertySheets" />
-+  <PropertyGroup Label="UserMacros" />
-+  <PropertyGroup>
-+    <OutDir>$(SolutionDir)build\$(Platform)\$(Configuration)\</OutDir>
-+    <IntDir>$(SolutionDir)build\$(Platform)\$(Configuration)\$(MSBuildProjectName)\</IntDir>
-+  </PropertyGroup>
-+  <ItemDefinitionGroup>
-+    <ClCompile>
-+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-+    </ClCompile>
-+  </ItemDefinitionGroup>
-+  <ItemGroup />
-+</Project>
-\ No newline at end of file
-diff --git a/build_ide/VS2010/flatc.vcxproj b/build_ide/VS2010/flatc.vcxproj
-index 31cd013..a338685
--- a/build_ide/VS2010/flatc.vcxproj
-+++ b/build_ide/VS2010/flatc.vcxproj
-@@ -26,24 +26,16 @@
-   </PropertyGroup>
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-+    <PlatformToolset>v140_xp</PlatformToolset>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-+    <PlatformToolset>v140_xp</PlatformToolset>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-+    <PlatformToolset>v140_xp</PlatformToolset>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-+    <PlatformToolset>v140_xp</PlatformToolset>
-   </PropertyGroup>
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-   <ImportGroup Label="ExtensionSettings">
-@@ -51,33 +43,12 @@
-   <ImportGroup Label="PropertySheets">
-     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-   </ImportGroup>
-+  <ImportGroup Label="PropertySheets">
-+    <Import Project="flatc.props" />
-+  </ImportGroup>
-   <PropertyGroup Label="UserMacros" />
-   <PropertyGroup>
-     <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">flatc.dir\Debug\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">flatc.dir\Debug\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">flatc</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">flatc</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.exe</TargetExt>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.exe</TargetExt>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">flatc.dir\Release\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">flatc.dir\Release\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">flatc</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">flatc</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.exe</TargetExt>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.exe</TargetExt>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</GenerateManifest>
-   </PropertyGroup>
-   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-     <ClCompile>
-@@ -85,18 +56,13 @@
-       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-       <CompileAs>CompileAsCpp</CompileAs>
-       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>
-       <Optimization>Disabled</Optimization>
-       <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-       <WarningLevel>Level4</WarningLevel>
-       <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AssemblerListingLocation>Debug</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>../../Debug/flatc.pdb</ProgramDataBaseFileName>
-       <TreatWarningAsError>true</TreatWarningAsError>
-+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-     </ClCompile>
-     <ResourceCompile>
-       <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-@@ -104,26 +70,13 @@
-     </ResourceCompile>
-     <Midl>
-       <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(IntDir)</OutputDirectory>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-     </Midl>
-     <Link>
-      <AdditionalOptions> /machine:X86 /debug %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ImportLibrary>../../Debug/flatc.lib</ImportLibrary>
-      <ProgramDataBaseFile>../../Debug/flatc.pdb</ProgramDataBaseFile>
-       <SubSystem>Console</SubSystem>
-       <Version>
-       </Version>
-+      <GenerateDebugInformation>true</GenerateDebugInformation>
-     </Link>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-   </ItemDefinitionGroup>
-   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-     <ClCompile>
-@@ -131,18 +84,13 @@
-       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-       <CompileAs>CompileAsCpp</CompileAs>
-       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>
-       <Optimization>Disabled</Optimization>
-       <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-       <WarningLevel>Level4</WarningLevel>
-       <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AssemblerListingLocation>Debug</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>../../Debug/flatc.pdb</ProgramDataBaseFileName>
-       <TreatWarningAsError>true</TreatWarningAsError>
-+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-     </ClCompile>
-     <ResourceCompile>
-       <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-@@ -150,44 +98,26 @@
-     </ResourceCompile>
-     <Midl>
-       <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(IntDir)</OutputDirectory>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-     </Midl>
-     <Link>
-      <AdditionalOptions>/debug %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ImportLibrary>../../Debug/flatc.lib</ImportLibrary>
-      <ProgramDataBaseFile>../../Debug/flatc.pdb</ProgramDataBaseFile>
-       <SubSystem>Console</SubSystem>
-       <Version>
-       </Version>
-+      <GenerateDebugInformation>true</GenerateDebugInformation>
-     </Link>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-   </ItemDefinitionGroup>
-   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-     <ClCompile>
-       <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-       <CompileAs>CompileAsCpp</CompileAs>
-      <ExceptionHandling>Sync</ExceptionHandling>
-       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-       <Optimization>MaxSpeed</Optimization>
-       <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-       <WarningLevel>Level4</WarningLevel>
-       <DebugInformationFormat>
-       </DebugInformationFormat>
-       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;CMAKE_INTDIR="Release";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AssemblerListingLocation>Release</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>../../Release/flatc.pdb</ProgramDataBaseFileName>
-       <TreatWarningAsError>true</TreatWarningAsError>
-     </ClCompile>
-     <ResourceCompile>
-@@ -196,19 +126,9 @@
-     </ResourceCompile>
-     <Midl>
-       <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(IntDir)</OutputDirectory>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-     </Midl>
-     <Link>
-      <AdditionalOptions> /machine:X86 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-       <GenerateDebugInformation>false</GenerateDebugInformation>
-      <ImportLibrary>../../Release/flatc.lib</ImportLibrary>
-      <ProgramDataBaseFile>../../Release/flatc.pdb</ProgramDataBaseFile>
-       <SubSystem>Console</SubSystem>
-       <Version>
-       </Version>
-@@ -221,19 +141,14 @@
-     <ClCompile>
-       <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-       <CompileAs>CompileAsCpp</CompileAs>
-      <ExceptionHandling>Sync</ExceptionHandling>
-       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-       <Optimization>MaxSpeed</Optimization>
-       <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-       <WarningLevel>Level4</WarningLevel>
-       <DebugInformationFormat>
-       </DebugInformationFormat>
-       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;CMAKE_INTDIR="Release";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AssemblerListingLocation>Release</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>../../Release/flatc.pdb</ProgramDataBaseFileName>
-       <TreatWarningAsError>true</TreatWarningAsError>
-     </ClCompile>
-     <ResourceCompile>
-@@ -242,18 +157,9 @@
-     </ResourceCompile>
-     <Midl>
-       <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(IntDir)</OutputDirectory>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-     </Midl>
-     <Link>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-       <GenerateDebugInformation>false</GenerateDebugInformation>
-      <ImportLibrary>../../Release/flatc.lib</ImportLibrary>
-      <ProgramDataBaseFile>../../Release/flatc.pdb</ProgramDataBaseFile>
-       <SubSystem>Console</SubSystem>
-       <Version>
-       </Version>
@@ -1,384 +0,0 @@
-diff --git a/src/google/protobuf/compiler/js/js_generator.cc b/src/google/protobuf/compiler/js/js_generator.cc
-index 3de61e8..ea83c82
--- a/src/google/protobuf/compiler/js/js_generator.cc
-+++ b/src/google/protobuf/compiler/js/js_generator.cc
-@@ -488,6 +488,7 @@ string JSByteGetterSuffix(BytesMode bytes_mode) {
-       return "U8";
-     default:
-       assert(false);
-+      return NULL;
-   }
- }
- 
-diff --git a/vsprojects/libprotobuf.vcxproj b/vsprojects/libprotobuf.vcxproj
-new file
-index 0000000..73f9bea
--- /dev/null
-+++ b/vsprojects/libprotobuf.vcxproj
-@@ -0,0 +1,116 @@
-+<?xml version="1.0" encoding="utf-8"?>
-+<Project DefaultTargets="Build" ToolsVersion="14.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>
-+      <Platform>Win32</Platform>
-+    </ProjectConfiguration>
-+    <ProjectConfiguration Include="Debug|x64">
-+      <Configuration>Debug</Configuration>
-+      <Platform>x64</Platform>
-+    </ProjectConfiguration>
-+    <ProjectConfiguration Include="Release|x64">
-+      <Configuration>Release</Configuration>
-+      <Platform>x64</Platform>
-+    </ProjectConfiguration>
-+  </ItemGroup>
-+  <PropertyGroup Label="Globals">
-+    <ProjectGuid>{07ABD431-1515-4140-932E-E8C150FF7D1A}</ProjectGuid>
-+    <Keyword>Win32Proj</Keyword>
-+  </PropertyGroup>
-+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-+  <PropertyGroup>
-+    <ConfigurationType>StaticLibrary</ConfigurationType>
-+    <PlatformToolset>v140</PlatformToolset>
-+  </PropertyGroup>
-+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-+  <ImportGroup Label="PropertySheets">
-+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-+    <Import Project="..\..\..\vsprojects\protobuf.props" />
-+  </ImportGroup>
-+  <ItemGroup>
-+    <ClCompile Include="..\src\google\protobuf\arena.cc" />
-+    <ClCompile Include="..\src\google\protobuf\arenastring.cc" />
-+    <ClCompile Include="..\src\google\protobuf\extension_set.cc" />
-+    <ClCompile Include="..\src\google\protobuf\generated_message_util.cc" />
-+    <ClCompile Include="..\src\google\protobuf\io\coded_stream.cc" />
-+    <ClCompile Include="..\src\google\protobuf\io\zero_copy_stream.cc" />
-+    <ClCompile Include="..\src\google\protobuf\io\zero_copy_stream_impl_lite.cc" />
-+    <ClCompile Include="..\src\google\protobuf\message_lite.cc" />
-+    <ClCompile Include="..\src\google\protobuf\repeated_field.cc" />
-+    <ClCompile Include="..\src\google\protobuf\stubs\atomicops_internals_x86_msvc.cc" />
-+    <ClCompile Include="..\src\google\protobuf\stubs\bytestream.cc" />
-+    <ClCompile Include="..\src\google\protobuf\stubs\common.cc" />
-+    <ClCompile Include="..\src\google\protobuf\stubs\int128.cc" />
-+    <ClCompile Include="..\src\google\protobuf\stubs\once.cc" />
-+    <ClCompile Include="..\src\google\protobuf\stubs\status.cc" />
-+    <ClCompile Include="..\src\google\protobuf\stubs\statusor.cc" />
-+    <ClCompile Include="..\src\google\protobuf\stubs\stringpiece.cc" />
-+    <ClCompile Include="..\src\google\protobuf\stubs\stringprintf.cc" />
-+    <ClCompile Include="..\src\google\protobuf\stubs\structurally_valid.cc" />
-+    <ClCompile Include="..\src\google\protobuf\stubs\strutil.cc" />
-+    <ClCompile Include="..\src\google\protobuf\stubs\time.cc" />
-+    <ClCompile Include="..\src\google\protobuf\wire_format_lite.cc" />
-+    <ClCompile Include="..\src\google\protobuf\any.cc" />
-+    <ClCompile Include="..\src\google\protobuf\any.pb.cc" />
-+    <ClCompile Include="..\src\google\protobuf\api.pb.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\importer.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\parser.cc" />
-+    <ClCompile Include="..\src\google\protobuf\descriptor.cc" />
-+    <ClCompile Include="..\src\google\protobuf\descriptor.pb.cc" />
-+    <ClCompile Include="..\src\google\protobuf\descriptor_database.cc" />
-+    <ClCompile Include="..\src\google\protobuf\duration.pb.cc" />
-+    <ClCompile Include="..\src\google\protobuf\dynamic_message.cc" />
-+    <ClCompile Include="..\src\google\protobuf\empty.pb.cc" />
-+    <ClCompile Include="..\src\google\protobuf\extension_set_heavy.cc" />
-+    <ClCompile Include="..\src\google\protobuf\field_mask.pb.cc" />
-+    <ClCompile Include="..\src\google\protobuf\generated_message_reflection.cc" />
-+    <ClCompile Include="..\src\google\protobuf\io\gzip_stream.cc" />
-+    <ClCompile Include="..\src\google\protobuf\io\printer.cc" />
-+    <ClCompile Include="..\src\google\protobuf\io\strtod.cc" />
-+    <ClCompile Include="..\src\google\protobuf\io\tokenizer.cc" />
-+    <ClCompile Include="..\src\google\protobuf\io\zero_copy_stream_impl.cc" />
-+    <ClCompile Include="..\src\google\protobuf\map_field.cc" />
-+    <ClCompile Include="..\src\google\protobuf\message.cc" />
-+    <ClCompile Include="..\src\google\protobuf\reflection_ops.cc" />
-+    <ClCompile Include="..\src\google\protobuf\service.cc" />
-+    <ClCompile Include="..\src\google\protobuf\source_context.pb.cc" />
-+    <ClCompile Include="..\src\google\protobuf\struct.pb.cc" />
-+    <ClCompile Include="..\src\google\protobuf\stubs\mathlimits.cc" />
-+    <ClCompile Include="..\src\google\protobuf\stubs\substitute.cc" />
-+    <ClCompile Include="..\src\google\protobuf\text_format.cc" />
-+    <ClCompile Include="..\src\google\protobuf\timestamp.pb.cc" />
-+    <ClCompile Include="..\src\google\protobuf\type.pb.cc" />
-+    <ClCompile Include="..\src\google\protobuf\unknown_field_set.cc" />
-+    <ClCompile Include="..\src\google\protobuf\util\field_comparator.cc" />
-+    <ClCompile Include="..\src\google\protobuf\util\field_mask_util.cc" />
-+    <ClCompile Include="..\src\google\protobuf\util\internal\datapiece.cc" />
-+    <ClCompile Include="..\src\google\protobuf\util\internal\default_value_objectwriter.cc" />
-+    <ClCompile Include="..\src\google\protobuf\util\internal\field_mask_utility.cc" />
-+    <ClCompile Include="..\src\google\protobuf\util\internal\json_escaping.cc" />
-+    <ClCompile Include="..\src\google\protobuf\util\internal\json_objectwriter.cc" />
-+    <ClCompile Include="..\src\google\protobuf\util\internal\json_stream_parser.cc" />
-+    <ClCompile Include="..\src\google\protobuf\util\internal\object_writer.cc" />
-+    <ClCompile Include="..\src\google\protobuf\util\internal\proto_writer.cc" />
-+    <ClCompile Include="..\src\google\protobuf\util\internal\protostream_objectsource.cc" />
-+    <ClCompile Include="..\src\google\protobuf\util\internal\protostream_objectwriter.cc" />
-+    <ClCompile Include="..\src\google\protobuf\util\internal\type_info.cc" />
-+    <ClCompile Include="..\src\google\protobuf\util\internal\type_info_test_helper.cc" />
-+    <ClCompile Include="..\src\google\protobuf\util\internal\utility.cc" />
-+    <ClCompile Include="..\src\google\protobuf\util\json_util.cc" />
-+    <ClCompile Include="..\src\google\protobuf\util\message_differencer.cc" />
-+    <ClCompile Include="..\src\google\protobuf\util\time_util.cc" />
-+    <ClCompile Include="..\src\google\protobuf\util\type_resolver_util.cc" />
-+    <ClCompile Include="..\src\google\protobuf\wire_format.cc" />
-+    <ClCompile Include="..\src\google\protobuf\wrappers.pb.cc" />
-+  </ItemGroup>
-+  <ItemGroup>
-+    <ClInclude Include="..\src\google\protobuf\stubs\common.h" />
-+    <ClInclude Include="..\src\google\protobuf\stubs\logging.h" />
-+  </ItemGroup>
-+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-+</Project>
-\ No newline at end of file
-diff --git a/vsprojects/libprotoc.vcxproj b/vsprojects/libprotoc.vcxproj
-new file
-index 0000000..ee5aeee
--- /dev/null
-+++ b/vsprojects/libprotoc.vcxproj
-@@ -0,0 +1,134 @@
-+<?xml version="1.0" encoding="utf-8"?>
-+<Project DefaultTargets="Build" ToolsVersion="14.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>
-+      <Platform>Win32</Platform>
-+    </ProjectConfiguration>
-+    <ProjectConfiguration Include="Debug|x64">
-+      <Configuration>Debug</Configuration>
-+      <Platform>x64</Platform>
-+    </ProjectConfiguration>
-+    <ProjectConfiguration Include="Release|x64">
-+      <Configuration>Release</Configuration>
-+      <Platform>x64</Platform>
-+    </ProjectConfiguration>
-+  </ItemGroup>
-+  <PropertyGroup Label="Globals">
-+    <ProjectGuid>{2B4F3BB4-ADDE-4CB7-B832-C964DE4E0087}</ProjectGuid>
-+    <Keyword>Win32Proj</Keyword>
-+  </PropertyGroup>
-+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-+  <PropertyGroup>
-+    <ConfigurationType>StaticLibrary</ConfigurationType>
-+    <PlatformToolset>v140</PlatformToolset>
-+  </PropertyGroup>
-+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-+  <ImportGroup Label="PropertySheets">
-+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-+    <Import Project="..\..\..\vsprojects\protobuf.props" />
-+  </ImportGroup>
-+  <ItemGroup>
-+    <ClCompile Include="..\src\google\protobuf\compiler\code_generator.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\command_line_interface.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\cpp\cpp_enum.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\cpp\cpp_enum_field.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\cpp\cpp_extension.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\cpp\cpp_field.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\cpp\cpp_file.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\cpp\cpp_generator.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\cpp\cpp_helpers.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\cpp\cpp_map_field.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\cpp\cpp_message.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\cpp\cpp_message_field.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\cpp\cpp_primitive_field.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\cpp\cpp_service.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\cpp\cpp_string_field.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\csharp\csharp_doc_comment.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\csharp\csharp_enum.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\csharp\csharp_enum_field.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\csharp\csharp_field_base.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\csharp\csharp_generator.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\csharp\csharp_helpers.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\csharp\csharp_map_field.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\csharp\csharp_message.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\csharp\csharp_message_field.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\csharp\csharp_primitive_field.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\csharp\csharp_reflection_class.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\csharp\csharp_repeated_enum_field.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\csharp\csharp_repeated_message_field.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\csharp\csharp_repeated_primitive_field.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\csharp\csharp_source_generator_base.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\csharp\csharp_wrapper_field.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\java\java_context.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\java\java_doc_comment.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\java\java_enum.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\java\java_enum_field.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\java\java_enum_field_lite.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\java\java_enum_lite.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\java\java_extension.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\java\java_extension_lite.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\java\java_field.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\java\java_file.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\java\java_generator.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\java\java_generator_factory.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\java\java_helpers.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\java\java_lazy_message_field.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\java\java_lazy_message_field_lite.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\java\java_map_field.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\java\java_map_field_lite.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\java\java_message.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\java\java_message_builder.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\java\java_message_builder_lite.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\java\java_message_field.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\java\java_message_field_lite.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\java\java_message_lite.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\java\java_name_resolver.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\java\java_primitive_field.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\java\java_primitive_field_lite.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\java\java_service.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\java\java_shared_code_generator.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\java\java_string_field.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\java\java_string_field_lite.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\javanano\javanano_enum.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\javanano\javanano_enum_field.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\javanano\javanano_extension.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\javanano\javanano_field.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\javanano\javanano_file.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\javanano\javanano_generator.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\javanano\javanano_helpers.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\javanano\javanano_map_field.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\javanano\javanano_message.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\javanano\javanano_message_field.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\javanano\javanano_primitive_field.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\js\js_generator.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\objectivec\objectivec_enum.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\objectivec\objectivec_enum_field.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\objectivec\objectivec_extension.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\objectivec\objectivec_field.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\objectivec\objectivec_file.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\objectivec\objectivec_generator.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\objectivec\objectivec_helpers.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\objectivec\objectivec_map_field.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\objectivec\objectivec_message.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\objectivec\objectivec_message_field.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\objectivec\objectivec_oneof.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\objectivec\objectivec_primitive_field.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\plugin.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\plugin.pb.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\python\python_generator.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\ruby\ruby_generator.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\subprocess.cc" />
-+    <ClCompile Include="..\src\google\protobuf\compiler\zip_writer.cc" />
-+  </ItemGroup>
-+  <ItemGroup>
-+    <ProjectReference Include="libprotobuf.vcxproj">
-+      <Project>{07abd431-1515-4140-932e-e8c150ff7d1a}</Project>
-+    </ProjectReference>
-+  </ItemGroup>
-+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-+</Project>
-\ No newline at end of file
-diff --git a/vsprojects/protobuf.sln b/vsprojects/protobuf.sln
-new file
-index 0000000..27d6b04
--- /dev/null
-+++ b/vsprojects/protobuf.sln
-@@ -0,0 +1,48 @@
-+
-+Microsoft Visual Studio Solution File, Format Version 12.00
-+# Visual Studio 14
-+VisualStudioVersion = 14.0.25123.0
-+MinimumVisualStudioVersion = 10.0.40219.1
-+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libprotobuf", "libprotobuf.vcxproj", "{07ABD431-1515-4140-932E-E8C150FF7D1A}"
-+EndProject
-+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "protoc", "protoc.vcxproj", "{DB653289-E887-4B13-AC08-EE3EAC1F34C9}"
-+EndProject
-+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libprotoc", "libprotoc.vcxproj", "{2B4F3BB4-ADDE-4CB7-B832-C964DE4E0087}"
-+EndProject
-+Global
-+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-+		Debug|Win32 = Debug|Win32
-+		Debug|x64 = Debug|x64
-+		Release|Win32 = Release|Win32
-+		Release|x64 = Release|x64
-+	EndGlobalSection
-+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-+		{07ABD431-1515-4140-932E-E8C150FF7D1A}.Debug|Win32.ActiveCfg = Debug|Win32
-+		{07ABD431-1515-4140-932E-E8C150FF7D1A}.Debug|Win32.Build.0 = Debug|Win32
-+		{07ABD431-1515-4140-932E-E8C150FF7D1A}.Debug|x64.ActiveCfg = Debug|x64
-+		{07ABD431-1515-4140-932E-E8C150FF7D1A}.Debug|x64.Build.0 = Debug|x64
-+		{07ABD431-1515-4140-932E-E8C150FF7D1A}.Release|Win32.ActiveCfg = Release|Win32
-+		{07ABD431-1515-4140-932E-E8C150FF7D1A}.Release|Win32.Build.0 = Release|Win32
-+		{07ABD431-1515-4140-932E-E8C150FF7D1A}.Release|x64.ActiveCfg = Release|x64
-+		{07ABD431-1515-4140-932E-E8C150FF7D1A}.Release|x64.Build.0 = Release|x64
-+		{DB653289-E887-4B13-AC08-EE3EAC1F34C9}.Debug|Win32.ActiveCfg = Debug|Win32
-+		{DB653289-E887-4B13-AC08-EE3EAC1F34C9}.Debug|Win32.Build.0 = Debug|Win32
-+		{DB653289-E887-4B13-AC08-EE3EAC1F34C9}.Debug|x64.ActiveCfg = Debug|x64
-+		{DB653289-E887-4B13-AC08-EE3EAC1F34C9}.Debug|x64.Build.0 = Debug|x64
-+		{DB653289-E887-4B13-AC08-EE3EAC1F34C9}.Release|Win32.ActiveCfg = Release|Win32
-+		{DB653289-E887-4B13-AC08-EE3EAC1F34C9}.Release|Win32.Build.0 = Release|Win32
-+		{DB653289-E887-4B13-AC08-EE3EAC1F34C9}.Release|x64.ActiveCfg = Release|x64
-+		{DB653289-E887-4B13-AC08-EE3EAC1F34C9}.Release|x64.Build.0 = Release|x64
-+		{2B4F3BB4-ADDE-4CB7-B832-C964DE4E0087}.Debug|Win32.ActiveCfg = Debug|Win32
-+		{2B4F3BB4-ADDE-4CB7-B832-C964DE4E0087}.Debug|Win32.Build.0 = Debug|Win32
-+		{2B4F3BB4-ADDE-4CB7-B832-C964DE4E0087}.Debug|x64.ActiveCfg = Debug|x64
-+		{2B4F3BB4-ADDE-4CB7-B832-C964DE4E0087}.Debug|x64.Build.0 = Debug|x64
-+		{2B4F3BB4-ADDE-4CB7-B832-C964DE4E0087}.Release|Win32.ActiveCfg = Release|Win32
-+		{2B4F3BB4-ADDE-4CB7-B832-C964DE4E0087}.Release|Win32.Build.0 = Release|Win32
-+		{2B4F3BB4-ADDE-4CB7-B832-C964DE4E0087}.Release|x64.ActiveCfg = Release|x64
-+		{2B4F3BB4-ADDE-4CB7-B832-C964DE4E0087}.Release|x64.Build.0 = Release|x64
-+	EndGlobalSection
-+	GlobalSection(SolutionProperties) = preSolution
-+		HideSolutionNode = FALSE
-+	EndGlobalSection
-+EndGlobal
-diff --git a/vsprojects/protoc.vcxproj b/vsprojects/protoc.vcxproj
-new file
-index 0000000..5b0afa9
--- /dev/null
-+++ b/vsprojects/protoc.vcxproj
-@@ -0,0 +1,47 @@
-+<?xml version="1.0" encoding="utf-8"?>
-+<Project DefaultTargets="Build" ToolsVersion="14.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>
-+      <Platform>Win32</Platform>
-+    </ProjectConfiguration>
-+    <ProjectConfiguration Include="Debug|x64">
-+      <Configuration>Debug</Configuration>
-+      <Platform>x64</Platform>
-+    </ProjectConfiguration>
-+    <ProjectConfiguration Include="Release|x64">
-+      <Configuration>Release</Configuration>
-+      <Platform>x64</Platform>
-+    </ProjectConfiguration>
-+  </ItemGroup>
-+  <PropertyGroup Label="Globals">
-+    <ProjectGuid>{DB653289-E887-4B13-AC08-EE3EAC1F34C9}</ProjectGuid>
-+    <Keyword>Win32Proj</Keyword>
-+  </PropertyGroup>
-+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-+  <PropertyGroup>
-+    <ConfigurationType>Application</ConfigurationType>
-+    <PlatformToolset>v140</PlatformToolset>
-+  </PropertyGroup>
-+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-+  <ImportGroup Label="PropertySheets">
-+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-+    <Import Project="..\..\..\vsprojects\protobuf.props" />
-+  </ImportGroup>
-+  <ItemGroup>
-+    <ClCompile Include="..\src\google\protobuf\compiler\main.cc" />
-+  </ItemGroup>
-+  <ItemGroup>
-+    <ClInclude Include="..\src\google\protobuf\compiler\command_line_interface.h" />
-+  </ItemGroup>
-+  <ItemGroup>
-+    <ProjectReference Include="libprotoc.vcxproj">
-+      <Project>{2b4f3bb4-adde-4cb7-b832-c964de4e0087}</Project>
-+    </ProjectReference>
-+  </ItemGroup>
-+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-+</Project>
-\ No newline at end of file
@@ -1,25 +0,0 @@
-diff --git a/inc/Windows/pyconfig.h b/inc/Windows/pyconfig.h
-index 1cfc59b..d4861cb
--- a/inc/Windows/pyconfig.h
-+++ b/inc/Windows/pyconfig.h
-@@ -1,6 +1,11 @@
- #ifndef Py_CONFIG_H
- #define Py_CONFIG_H
- 
-+#ifdef _MSC_VER
-+#pragma push_macro("_DEBUG")
-+#undef _DEBUG
-+#endif
-+
- /* pyconfig.h.  NOT Generated automatically by configure.
- 
- This is a manually maintained version used for the Watcom,
-@@ -756,4 +761,8 @@ Py_NO_ENABLE_SHARED to find out.  Also support MS_NO_COREDLL for b/w compat */
-    least significant byte first */
- #define DOUBLE_IS_LITTLE_ENDIAN_IEEE754 1
- 
-+#ifdef _MSC_VER
-+#pragma pop_macro("_DEBUG")
-+#endif
-+
- #endif /* !Py_CONFIG_H */