diff options
| author |  Craig Tiller <ctiller@google.com> | 2015-07-13 08:42:22 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2015-07-13 08:42:22 -0700 |
| commit | 75cfb044f3c5582a50582c375b443ee4ab029c33 (patch) | |
| tree | 1e327d171b85a57d5bcea9488fc79ce83b971a84 /vsprojects | |
| parent | 143e7bf0cfcbfd60422f4e8f15e6b5c18259c8cd (diff) | |
| parent | 4d0b7427faecfdbb1635c2ab158c922d7511b865 (diff) | |
Merge github.com:grpc/grpc into no-worries-i-can-wait
Diffstat (limited to 'vsprojects')
| -rw-r--r-- | vsprojects/Grpc.mak | 6 | ||||
| -rw-r--r-- | vsprojects/README.md | 2 | ||||
| -rw-r--r-- | vsprojects/grpc/grpc.vcxproj | 2 | ||||
| -rw-r--r-- | vsprojects/grpc/grpc.vcxproj.filters | 3 | ||||
| -rw-r--r-- | vsprojects/grpc_unsecure/grpc_unsecure.vcxproj | 2 | ||||
| -rw-r--r-- | vsprojects/grpc_unsecure/grpc_unsecure.vcxproj.filters | 3 |
6 files changed, 17 insertions, 1 deletions
diff --git a/vsprojects/Grpc.mak b/vsprojects/Grpc.mak index f07cdec315..9fa015cbd1 100644 --- a/vsprojects/Grpc.mak +++ b/vsprojects/Grpc.mak @@ -51,6 +51,12 @@ LIBS=$(OPENSSL_LIBS) $(ZLIB_LIBS) $(GENERAL_LIBS) $(WINSOCK_LIBS) all: buildtests +tools: + +tools_c: + +tools_cxx: + $(OUT_DIR): mkdir $(OUT_DIR) diff --git a/vsprojects/README.md b/vsprojects/README.md index 14178daaa7..dade9e500e 100644 --- a/vsprojects/README.md +++ b/vsprojects/README.md @@ -12,7 +12,7 @@ download nuget.exe from the web and manually restore the NuGet packages. ``` > REM Run from this directory. > REM No need to do this if you have NuGet visual studio extension. -> nuget restore +> nuget restore grpc.sln ``` After that, you can build the solution using one of these options: diff --git a/vsprojects/grpc/grpc.vcxproj b/vsprojects/grpc/grpc.vcxproj index 865e76ef10..16744b181b 100644 --- a/vsprojects/grpc/grpc.vcxproj +++ b/vsprojects/grpc/grpc.vcxproj @@ -481,6 +481,8 @@ </ClCompile> <ClCompile Include="..\..\src\core\surface\surface_trace.c"> </ClCompile> + <ClCompile Include="..\..\src\core\surface\version.c"> + </ClCompile> <ClCompile Include="..\..\src\core\transport\chttp2\alpn.c"> </ClCompile> <ClCompile Include="..\..\src\core\transport\chttp2\bin_encoder.c"> diff --git a/vsprojects/grpc/grpc.vcxproj.filters b/vsprojects/grpc/grpc.vcxproj.filters index f560fef9ed..de9f20521c 100644 --- a/vsprojects/grpc/grpc.vcxproj.filters +++ b/vsprojects/grpc/grpc.vcxproj.filters @@ -316,6 +316,9 @@ <ClCompile Include="..\..\src\core\surface\surface_trace.c"> <Filter>src\core\surface</Filter> </ClCompile> + <ClCompile Include="..\..\src\core\surface\version.c"> + <Filter>src\core\surface</Filter> + </ClCompile> <ClCompile Include="..\..\src\core\transport\chttp2\alpn.c"> <Filter>src\core\transport\chttp2</Filter> </ClCompile> diff --git a/vsprojects/grpc_unsecure/grpc_unsecure.vcxproj b/vsprojects/grpc_unsecure/grpc_unsecure.vcxproj index 4ead6f8d98..02c791f995 100644 --- a/vsprojects/grpc_unsecure/grpc_unsecure.vcxproj +++ b/vsprojects/grpc_unsecure/grpc_unsecure.vcxproj @@ -416,6 +416,8 @@ </ClCompile> <ClCompile Include="..\..\src\core\surface\surface_trace.c"> </ClCompile> + <ClCompile Include="..\..\src\core\surface\version.c"> + </ClCompile> <ClCompile Include="..\..\src\core\transport\chttp2\alpn.c"> </ClCompile> <ClCompile Include="..\..\src\core\transport\chttp2\bin_encoder.c"> diff --git a/vsprojects/grpc_unsecure/grpc_unsecure.vcxproj.filters b/vsprojects/grpc_unsecure/grpc_unsecure.vcxproj.filters index 45ca1f7c33..333a71f564 100644 --- a/vsprojects/grpc_unsecure/grpc_unsecure.vcxproj.filters +++ b/vsprojects/grpc_unsecure/grpc_unsecure.vcxproj.filters @@ -247,6 +247,9 @@ <ClCompile Include="..\..\src\core\surface\surface_trace.c"> <Filter>src\core\surface</Filter> </ClCompile> + <ClCompile Include="..\..\src\core\surface\version.c"> + <Filter>src\core\surface</Filter> + </ClCompile> <ClCompile Include="..\..\src\core\transport\chttp2\alpn.c"> <Filter>src\core\transport\chttp2</Filter> </ClCompile> |