From 710b6a4ae229024749af341862269c59e776ba17 Mon Sep 17 00:00:00 2001 From: "Nicolas \"Pixel\" Noble" <pixel@nobis-crew.org> Date: Fri, 20 Mar 2015 00:54:10 +0100 Subject: [PATCH] Added a few more missing files and re-generated project files. --- Makefile | 2 ++ build.json | 3 +++ vsprojects/vs2013/gpr.vcxproj | 2 ++ vsprojects/vs2013/gpr.vcxproj.filters | 3 +++ vsprojects/vs2013/gpr_shared.vcxproj | 2 ++ vsprojects/vs2013/gpr_shared.vcxproj.filters | 3 +++ vsprojects/vs2013/grpc.vcxproj | 2 ++ vsprojects/vs2013/grpc.vcxproj.filters | 6 ++++++ vsprojects/vs2013/grpc_shared.vcxproj | 2 ++ vsprojects/vs2013/grpc_shared.vcxproj.filters | 6 ++++++ vsprojects/vs2013/grpc_unsecure.vcxproj | 1 + vsprojects/vs2013/grpc_unsecure.vcxproj.filters | 3 +++ 12 files changed, 35 insertions(+) diff --git a/Makefile b/Makefile index a78887da88..093c2fbe7c 100644 --- a/Makefile +++ b/Makefile @@ -2292,6 +2292,7 @@ LIBGPR_SRC = \ src/core/support/alloc.c \ src/core/support/cancellable.c \ src/core/support/cmdline.c \ + src/core/support/cpu_iphone.c \ src/core/support/cpu_linux.c \ src/core/support/cpu_posix.c \ src/core/support/cpu_windows.c \ @@ -2385,6 +2386,7 @@ endif $(OBJDIR)/$(CONFIG)/src/core/support/alloc.o: $(OBJDIR)/$(CONFIG)/src/core/support/cancellable.o: $(OBJDIR)/$(CONFIG)/src/core/support/cmdline.o: +$(OBJDIR)/$(CONFIG)/src/core/support/cpu_iphone.o: $(OBJDIR)/$(CONFIG)/src/core/support/cpu_linux.o: $(OBJDIR)/$(CONFIG)/src/core/support/cpu_posix.o: $(OBJDIR)/$(CONFIG)/src/core/support/cpu_windows.o: diff --git a/build.json b/build.json index af90cd0339..13057a22a2 100644 --- a/build.json +++ b/build.json @@ -145,6 +145,7 @@ "src/core/surface/init.h", "src/core/surface/server.h", "src/core/surface/surface_trace.h", + "src/core/transport/chttp2/alpn.h", "src/core/transport/chttp2/bin_encoder.h", "src/core/transport/chttp2/frame.h", "src/core/transport/chttp2/frame_data.h", @@ -308,6 +309,7 @@ "src/core/support/alloc.c", "src/core/support/cancellable.c", "src/core/support/cmdline.c", + "src/core/support/cpu_iphone.c", "src/core/support/cpu_linux.c", "src/core/support/cpu_posix.c", "src/core/support/cpu_windows.c", @@ -370,6 +372,7 @@ "src/core/security/base64.h", "src/core/security/credentials.h", "src/core/security/json_token.h", + "src/core/security/secure_endpoint.h", "src/core/security/secure_transport_setup.h", "src/core/security/security_context.h", "src/core/tsi/fake_transport_security.h", diff --git a/vsprojects/vs2013/gpr.vcxproj b/vsprojects/vs2013/gpr.vcxproj index 0905b7cfb5..4b44cc645f 100644 --- a/vsprojects/vs2013/gpr.vcxproj +++ b/vsprojects/vs2013/gpr.vcxproj @@ -116,6 +116,8 @@ </ClCompile> <ClCompile Include="..\..\src\core\support\cmdline.c"> </ClCompile> + <ClCompile Include="..\..\src\core\support\cpu_iphone.c"> + </ClCompile> <ClCompile Include="..\..\src\core\support\cpu_linux.c"> </ClCompile> <ClCompile Include="..\..\src\core\support\cpu_posix.c"> diff --git a/vsprojects/vs2013/gpr.vcxproj.filters b/vsprojects/vs2013/gpr.vcxproj.filters index f6e2b76677..dffaf1e62d 100644 --- a/vsprojects/vs2013/gpr.vcxproj.filters +++ b/vsprojects/vs2013/gpr.vcxproj.filters @@ -10,6 +10,9 @@ <ClCompile Include="..\..\src\core\support\cmdline.c"> <Filter>src\core\support</Filter> </ClCompile> + <ClCompile Include="..\..\src\core\support\cpu_iphone.c"> + <Filter>src\core\support</Filter> + </ClCompile> <ClCompile Include="..\..\src\core\support\cpu_linux.c"> <Filter>src\core\support</Filter> </ClCompile> diff --git a/vsprojects/vs2013/gpr_shared.vcxproj b/vsprojects/vs2013/gpr_shared.vcxproj index c528890ae1..85339652ed 100644 --- a/vsprojects/vs2013/gpr_shared.vcxproj +++ b/vsprojects/vs2013/gpr_shared.vcxproj @@ -116,6 +116,8 @@ </ClCompile> <ClCompile Include="..\..\src\core\support\cmdline.c"> </ClCompile> + <ClCompile Include="..\..\src\core\support\cpu_iphone.c"> + </ClCompile> <ClCompile Include="..\..\src\core\support\cpu_linux.c"> </ClCompile> <ClCompile Include="..\..\src\core\support\cpu_posix.c"> diff --git a/vsprojects/vs2013/gpr_shared.vcxproj.filters b/vsprojects/vs2013/gpr_shared.vcxproj.filters index f6e2b76677..dffaf1e62d 100644 --- a/vsprojects/vs2013/gpr_shared.vcxproj.filters +++ b/vsprojects/vs2013/gpr_shared.vcxproj.filters @@ -10,6 +10,9 @@ <ClCompile Include="..\..\src\core\support\cmdline.c"> <Filter>src\core\support</Filter> </ClCompile> + <ClCompile Include="..\..\src\core\support\cpu_iphone.c"> + <Filter>src\core\support</Filter> + </ClCompile> <ClCompile Include="..\..\src\core\support\cpu_linux.c"> <Filter>src\core\support</Filter> </ClCompile> diff --git a/vsprojects/vs2013/grpc.vcxproj b/vsprojects/vs2013/grpc.vcxproj index 51c26384c2..754c89985f 100644 --- a/vsprojects/vs2013/grpc.vcxproj +++ b/vsprojects/vs2013/grpc.vcxproj @@ -94,6 +94,7 @@ <ClInclude Include="..\..\src\core\security\base64.h" /> <ClInclude Include="..\..\src\core\security\credentials.h" /> <ClInclude Include="..\..\src\core\security\json_token.h" /> + <ClInclude Include="..\..\src\core\security\secure_endpoint.h" /> <ClInclude Include="..\..\src\core\security\secure_transport_setup.h" /> <ClInclude Include="..\..\src\core\security\security_context.h" /> <ClInclude Include="..\..\src\core\tsi\fake_transport_security.h" /> @@ -164,6 +165,7 @@ <ClInclude Include="..\..\src\core\surface\init.h" /> <ClInclude Include="..\..\src\core\surface\server.h" /> <ClInclude Include="..\..\src\core\surface\surface_trace.h" /> + <ClInclude Include="..\..\src\core\transport\chttp2\alpn.h" /> <ClInclude Include="..\..\src\core\transport\chttp2\bin_encoder.h" /> <ClInclude Include="..\..\src\core\transport\chttp2\frame.h" /> <ClInclude Include="..\..\src\core\transport\chttp2\frame_data.h" /> diff --git a/vsprojects/vs2013/grpc.vcxproj.filters b/vsprojects/vs2013/grpc.vcxproj.filters index 152e139dfe..463a770fb8 100644 --- a/vsprojects/vs2013/grpc.vcxproj.filters +++ b/vsprojects/vs2013/grpc.vcxproj.filters @@ -395,6 +395,9 @@ <ClInclude Include="..\..\src\core\security\json_token.h"> <Filter>src\core\security</Filter> </ClInclude> + <ClInclude Include="..\..\src\core\security\secure_endpoint.h"> + <Filter>src\core\security</Filter> + </ClInclude> <ClInclude Include="..\..\src\core\security\secure_transport_setup.h"> <Filter>src\core\security</Filter> </ClInclude> @@ -605,6 +608,9 @@ <ClInclude Include="..\..\src\core\surface\surface_trace.h"> <Filter>src\core\surface</Filter> </ClInclude> + <ClInclude Include="..\..\src\core\transport\chttp2\alpn.h"> + <Filter>src\core\transport\chttp2</Filter> + </ClInclude> <ClInclude Include="..\..\src\core\transport\chttp2\bin_encoder.h"> <Filter>src\core\transport\chttp2</Filter> </ClInclude> diff --git a/vsprojects/vs2013/grpc_shared.vcxproj b/vsprojects/vs2013/grpc_shared.vcxproj index 2d1df0cf4f..927d2051a2 100644 --- a/vsprojects/vs2013/grpc_shared.vcxproj +++ b/vsprojects/vs2013/grpc_shared.vcxproj @@ -98,6 +98,7 @@ <ClInclude Include="..\..\src\core\security\base64.h" /> <ClInclude Include="..\..\src\core\security\credentials.h" /> <ClInclude Include="..\..\src\core\security\json_token.h" /> + <ClInclude Include="..\..\src\core\security\secure_endpoint.h" /> <ClInclude Include="..\..\src\core\security\secure_transport_setup.h" /> <ClInclude Include="..\..\src\core\security\security_context.h" /> <ClInclude Include="..\..\src\core\tsi\fake_transport_security.h" /> @@ -168,6 +169,7 @@ <ClInclude Include="..\..\src\core\surface\init.h" /> <ClInclude Include="..\..\src\core\surface\server.h" /> <ClInclude Include="..\..\src\core\surface\surface_trace.h" /> + <ClInclude Include="..\..\src\core\transport\chttp2\alpn.h" /> <ClInclude Include="..\..\src\core\transport\chttp2\bin_encoder.h" /> <ClInclude Include="..\..\src\core\transport\chttp2\frame.h" /> <ClInclude Include="..\..\src\core\transport\chttp2\frame_data.h" /> diff --git a/vsprojects/vs2013/grpc_shared.vcxproj.filters b/vsprojects/vs2013/grpc_shared.vcxproj.filters index 152e139dfe..463a770fb8 100644 --- a/vsprojects/vs2013/grpc_shared.vcxproj.filters +++ b/vsprojects/vs2013/grpc_shared.vcxproj.filters @@ -395,6 +395,9 @@ <ClInclude Include="..\..\src\core\security\json_token.h"> <Filter>src\core\security</Filter> </ClInclude> + <ClInclude Include="..\..\src\core\security\secure_endpoint.h"> + <Filter>src\core\security</Filter> + </ClInclude> <ClInclude Include="..\..\src\core\security\secure_transport_setup.h"> <Filter>src\core\security</Filter> </ClInclude> @@ -605,6 +608,9 @@ <ClInclude Include="..\..\src\core\surface\surface_trace.h"> <Filter>src\core\surface</Filter> </ClInclude> + <ClInclude Include="..\..\src\core\transport\chttp2\alpn.h"> + <Filter>src\core\transport\chttp2</Filter> + </ClInclude> <ClInclude Include="..\..\src\core\transport\chttp2\bin_encoder.h"> <Filter>src\core\transport\chttp2</Filter> </ClInclude> diff --git a/vsprojects/vs2013/grpc_unsecure.vcxproj b/vsprojects/vs2013/grpc_unsecure.vcxproj index 7d8d0967af..e1c1bc890b 100644 --- a/vsprojects/vs2013/grpc_unsecure.vcxproj +++ b/vsprojects/vs2013/grpc_unsecure.vcxproj @@ -149,6 +149,7 @@ <ClInclude Include="..\..\src\core\surface\init.h" /> <ClInclude Include="..\..\src\core\surface\server.h" /> <ClInclude Include="..\..\src\core\surface\surface_trace.h" /> + <ClInclude Include="..\..\src\core\transport\chttp2\alpn.h" /> <ClInclude Include="..\..\src\core\transport\chttp2\bin_encoder.h" /> <ClInclude Include="..\..\src\core\transport\chttp2\frame.h" /> <ClInclude Include="..\..\src\core\transport\chttp2\frame_data.h" /> diff --git a/vsprojects/vs2013/grpc_unsecure.vcxproj.filters b/vsprojects/vs2013/grpc_unsecure.vcxproj.filters index b5abd6a2f3..fe966237cb 100644 --- a/vsprojects/vs2013/grpc_unsecure.vcxproj.filters +++ b/vsprojects/vs2013/grpc_unsecure.vcxproj.filters @@ -500,6 +500,9 @@ <ClInclude Include="..\..\src\core\surface\surface_trace.h"> <Filter>src\core\surface</Filter> </ClInclude> + <ClInclude Include="..\..\src\core\transport\chttp2\alpn.h"> + <Filter>src\core\transport\chttp2</Filter> + </ClInclude> <ClInclude Include="..\..\src\core\transport\chttp2\bin_encoder.h"> <Filter>src\core\transport\chttp2</Filter> </ClInclude> -- GitLab