diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-06-25 07:00:18 -0700 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-06-25 07:00:18 -0700 |
| commit | fe8592ee994343821c8c4e906ee3bef3b4444e34 (patch) | |
| tree | a0f1fa88e0ddeb4092567adc51184ac88f0ab78b /vsprojects | |
| parent | f75fc12e3a1a614ee2d5d565742764e47d9aef96 (diff) | |
| parent | 0bf7e48ade52eec336f50dee4c7d22eeb887bb8e (diff) | |
Merge github.com:grpc/grpc into are-includes-sane
Conflicts:
tools/doxygen/Doxyfile.c++.internal
Diffstat (limited to 'vsprojects')
| -rw-r--r-- | vsprojects/Grpc.mak | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vsprojects/Grpc.mak b/vsprojects/Grpc.mak index 27f0b3aec3..b3be4fcf24 100644 --- a/vsprojects/Grpc.mak +++ b/vsprojects/Grpc.mak @@ -135,8 +135,8 @@ fling_server: fling_server.exe $(OUT_DIR)\fling_server.exe gen_hpack_tables.exe: build_libs $(OUT_DIR) echo Building gen_hpack_tables - $(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\src\core\transport\chttp2\gen_hpack_tables.c - $(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\gen_hpack_tables.exe" Debug\grpc_test_util.lib Debug\gpr.lib Debug\grpc.lib $(LIBS) $(OUT_DIR)\gen_hpack_tables.obj + $(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\tools\codegen\core\gen_hpack_tables.c + $(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\gen_hpack_tables.exe" Debug\gpr.lib Debug\grpc.lib $(LIBS) $(OUT_DIR)\gen_hpack_tables.obj gen_hpack_tables: gen_hpack_tables.exe echo Running gen_hpack_tables $(OUT_DIR)\gen_hpack_tables.exe |