diff options
| author |  Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2016-01-31 07:08:20 +0100 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2016-01-31 07:08:20 +0100 |
| commit | 78825caeeb61b048b32ee7076f61501b4dc01087 (patch) | |
| tree | 7fc9d41abbc69dfb8ea54ae31b0ce2f36be72249 /vsprojects | |
| parent | bf192eff5632213772ea3351f552722741d68e99 (diff) | |
| parent | 4fba286e4d013734aa3f1ddb7d0554e596b88a2c (diff) | |
Merge branch 'win32_subprocess' into make-ruby-installable
Conflicts:
BUILD
Makefile
binding.gyp
build.yaml
gRPC.podspec
grpc.gemspec
src/python/grpcio/grpc_core_dependencies.py
tools/run_tests/sources_and_headers.json
vsprojects/vcxproj/gpr/gpr.vcxproj
vsprojects/vcxproj/gpr/gpr.vcxproj.filters
Diffstat (limited to 'vsprojects')
4 files changed, 10 insertions, 0 deletions
diff --git a/vsprojects/vcxproj/grpc/grpc.vcxproj b/vsprojects/vcxproj/grpc/grpc.vcxproj index 8f6ed3b838..3acb1dfd3d 100644 --- a/vsprojects/vcxproj/grpc/grpc.vcxproj +++ b/vsprojects/vcxproj/grpc/grpc.vcxproj @@ -822,6 +822,8 @@ </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\support\subprocess_posix.c"> </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\support\subprocess_windows.c"> + </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\support\sync.c"> </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\support\sync_posix.c"> diff --git a/vsprojects/vcxproj/grpc/grpc.vcxproj.filters b/vsprojects/vcxproj/grpc/grpc.vcxproj.filters index 22b154aad5..d6bb2afde8 100644 --- a/vsprojects/vcxproj/grpc/grpc.vcxproj.filters +++ b/vsprojects/vcxproj/grpc/grpc.vcxproj.filters @@ -535,6 +535,9 @@ <ClCompile Include="$(SolutionDir)\..\src\core\support\subprocess_posix.c"> <Filter>src\core\support</Filter> </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\support\subprocess_windows.c"> + <Filter>src\core\support</Filter> + </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\support\sync.c"> <Filter>src\core\support</Filter> </ClCompile> diff --git a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj index 4c68db9ae3..343d35d211 100644 --- a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj +++ b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj @@ -504,6 +504,8 @@ </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\support\subprocess_posix.c"> </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\support\subprocess_windows.c"> + </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\support\sync.c"> </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\support\sync_posix.c"> diff --git a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters index 5f66f587c4..a065888576 100644 --- a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters +++ b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters @@ -94,6 +94,9 @@ <ClCompile Include="$(SolutionDir)\..\src\core\support\subprocess_posix.c"> <Filter>src\core\support</Filter> </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\support\subprocess_windows.c"> + <Filter>src\core\support</Filter> + </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\support\sync.c"> <Filter>src\core\support</Filter> </ClCompile> |