aboutsummaryrefslogtreecommitdiffhomepage
path: root/templates
diff options
context:
space:
mode:
authorGravatar yihuaz <yihuaz@google.com>2018-03-08 13:21:07 -0800
committerGravatar GitHub <noreply@github.com>2018-03-08 13:21:07 -0800
commit3287ceb06773ff3d7463a06c5f2dac742527135c (patch)
tree463f1da9a21eab60b9baeed7de5317fbd5a81fc0 /templates
parent44dac6050a4ec30cbc794bcd031fb6c0627f7923 (diff)
parent04fb58efbd62e11466b79dbdf4f1433cc2c75a89 (diff)
Merge pull request #14638 from yihuazhang/hook_alts_again
Add ALTS code to grpc/core
Diffstat (limited to 'templates')
-rw-r--r--templates/CMakeLists.txt.template2
-rw-r--r--templates/Makefile.template2
-rw-r--r--templates/gRPC-Core.podspec.template2
-rw-r--r--templates/grpc.gyp.template6
4 files changed, 8 insertions, 4 deletions
diff --git a/templates/CMakeLists.txt.template b/templates/CMakeLists.txt.template
index 0f088436d1..ef4d7d710c 100644
--- a/templates/CMakeLists.txt.template
+++ b/templates/CMakeLists.txt.template
@@ -138,6 +138,8 @@
## Some libraries are shared even with BUILD_SHARED_LIBRARIES=OFF
set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)
+
+ add_definitions(-DPB_FIELD_16BIT)
if (MSVC)
include(cmake/msvc_static_runtime.cmake)
diff --git a/templates/Makefile.template b/templates/Makefile.template
index 390847b4f2..196d12f678 100644
--- a/templates/Makefile.template
+++ b/templates/Makefile.template
@@ -221,6 +221,8 @@
% endif
% endfor
+ DEFINES += PB_FIELD_16BIT
+
CPPFLAGS += $(CPPFLAGS_$(CONFIG))
CFLAGS += $(CFLAGS_$(CONFIG))
CXXFLAGS += $(CXXFLAGS_$(CONFIG))
diff --git a/templates/gRPC-Core.podspec.template b/templates/gRPC-Core.podspec.template
index c28b78dbdf..3e80d602e1 100644
--- a/templates/gRPC-Core.podspec.template
+++ b/templates/gRPC-Core.podspec.template
@@ -144,7 +144,7 @@
}
s.default_subspecs = 'Interface', 'Implementation'
- s.compiler_flags = '-DGRPC_ARES=0'
+ s.compiler_flags = '-DGRPC_ARES=0', '-DPB_FIELD_16BIT'
s.libraries = 'c++'
# Like many other C libraries, gRPC-Core has its public headers under `include/<libname>/` and its
diff --git a/templates/grpc.gyp.template b/templates/grpc.gyp.template
index 3363082a83..2ea0d06ebd 100644
--- a/templates/grpc.gyp.template
+++ b/templates/grpc.gyp.template
@@ -60,11 +60,11 @@
% endfor
'cflags_c': [
'-Werror',
- '-std=c99'
+ '-std=c99',
],
'cflags_cc': [
'-Werror',
- '-std=c++11'
+ '-std=c++11',
],
'include_dirs': [
'.',
@@ -127,7 +127,7 @@
% endfor
'-stdlib=libc++',
'-std=c++11',
- '-Wno-error=deprecated-declarations'
+ '-Wno-error=deprecated-declarations',
],
% endif
},