diff options
| author | Alex Zolotarev <alex@mapswithme.com> | 2013-08-30 01:43:14 +0400 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 02:00:38 +0300 |
| commit | c404de86ac966bc575b6c0000952876243bfde18 (patch) | |
| tree | ff4b5488904eff4e1153f9c5c01ebf5dbf444c23 /3party/protobuf | |
| parent | a052f0d6674443fb7ece10bbf8b67877d02edcc9 (diff) | |
- Load only binary styles in every configuration
- Removed world file without search index from repo
Diffstat (limited to '3party/protobuf')
| -rw-r--r-- | 3party/protobuf/protobuf.pro | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/3party/protobuf/protobuf.pro b/3party/protobuf/protobuf.pro index 6718a6fb6d..908ba63122 100644 --- a/3party/protobuf/protobuf.pro +++ b/3party/protobuf/protobuf.pro @@ -11,7 +11,7 @@ include($$ROOT_DIR/common.pri) !win32:DEFINES += HAVE_PTHREAD -win32-msvc2008 { +win32-msvc* { # Signed/unsigned comparison warning. Conversion from double to float. QMAKE_CXXFLAGS *= -wd4018 -wd4244 -wd4355 } @@ -20,8 +20,8 @@ unix|win32-g++ { QMAKE_CXXFLAGS_WARN_ON += -Wno-unused -Wno-extra } -CONFIG(production) { +# Lite runtime files are included in all platforms and devices SOURCES += \ src/google/protobuf/stubs/common.cc \ src/google/protobuf/stubs/once.cc \ @@ -34,32 +34,23 @@ SOURCES += \ src/google/protobuf/io/zero_copy_stream.cc \ src/google/protobuf/io/zero_copy_stream_impl_lite.cc \ -} else { +# Full runtime files are included only in desktop configs +linux-*|win32-*|macx-* { SOURCES += \ src/google/protobuf/descriptor.cc \ src/google/protobuf/descriptor.pb.cc \ src/google/protobuf/descriptor_database.cc \ src/google/protobuf/dynamic_message.cc \ - src/google/protobuf/extension_set.cc \ src/google/protobuf/extension_set_heavy.cc \ - src/google/protobuf/generated_message_util.cc \ src/google/protobuf/generated_message_reflection.cc \ src/google/protobuf/message.cc \ - src/google/protobuf/message_lite.cc \ src/google/protobuf/reflection_ops.cc \ - src/google/protobuf/repeated_field.cc \ src/google/protobuf/text_format.cc \ src/google/protobuf/unknown_field_set.cc \ src/google/protobuf/wire_format.cc \ - src/google/protobuf/wire_format_lite.cc \ - src/google/protobuf/io/coded_stream.cc \ src/google/protobuf/io/tokenizer.cc \ - src/google/protobuf/io/zero_copy_stream.cc \ src/google/protobuf/io/zero_copy_stream_impl.cc \ - src/google/protobuf/io/zero_copy_stream_impl_lite.cc \ - src/google/protobuf/stubs/common.cc \ - src/google/protobuf/stubs/once.cc \ src/google/protobuf/stubs/stringprintf.cc \ src/google/protobuf/stubs/structurally_valid.cc \ src/google/protobuf/stubs/strutil.cc \ |