Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(126)

Side by Side Diff: talk/build/common.gypi

Issue 1588453005: Eliminate defines in talk/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Excluding iOS from converted OSX defines Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | talk/media/base/executablehelpers.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # 1 #
2 # libjingle 2 # libjingle
3 # Copyright 2012 Google Inc. 3 # Copyright 2012 Google Inc.
4 # 4 #
5 # Redistribution and use in source and binary forms, with or without 5 # Redistribution and use in source and binary forms, with or without
6 # modification, are permitted provided that the following conditions are met: 6 # modification, are permitted provided that the following conditions are met:
7 # 7 #
8 # 1. Redistributions of source code must retain the above copyright notice, 8 # 1. Redistributions of source code must retain the above copyright notice,
9 # this list of conditions and the following disclaimer. 9 # this list of conditions and the following disclaimer.
10 # 2. Redistributions in binary form must reproduce the above copyright notice, 10 # 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 }, 53 },
54 'target_defaults': { 54 'target_defaults': {
55 'include_dirs': [ 55 'include_dirs': [
56 '<(DEPTH)', 56 '<(DEPTH)',
57 '../..', 57 '../..',
58 '../../third_party', 58 '../../third_party',
59 '../../third_party/webrtc', 59 '../../third_party/webrtc',
60 '../../webrtc', 60 '../../webrtc',
61 ], 61 ],
62 'defines': [ 62 'defines': [
63 'EXPAT_RELATIVE_PATH',
64 'FEATURE_ENABLE_VOICEMAIL',
65 'GTEST_RELATIVE_PATH',
66 'JSONCPP_RELATIVE_PATH',
67 'LOGGING=1',
68 'SRTP_RELATIVE_PATH', 63 'SRTP_RELATIVE_PATH',
69 64
70 # Feature selection 65 # Feature selection
71 'FEATURE_ENABLE_SSL',
72 'FEATURE_ENABLE_VOICEMAIL',
73 'FEATURE_ENABLE_PSTN',
74 'HAVE_SCTP', 66 'HAVE_SCTP',
75 'HAVE_SRTP', 67 'HAVE_SRTP',
76 'HAVE_WEBRTC_VIDEO', 68 'HAVE_WEBRTC_VIDEO',
77 'HAVE_WEBRTC_VOICE', 69 'HAVE_WEBRTC_VOICE',
78 ], 70 ],
79 'conditions': [ 71 'conditions': [
80 ['OS=="linux"', { 72 ['OS=="linux"', {
81 'defines': [ 73 'defines': [
82 'LINUX',
83 'WEBRTC_LINUX', 74 'WEBRTC_LINUX',
84 ], 75 ],
85 # Remove Chromium's disabling of the -Wformat warning. 76 # Remove Chromium's disabling of the -Wformat warning.
86 'cflags!': [ 77 'cflags!': [
87 '-Wno-format', 78 '-Wno-format',
88 ], 79 ],
89 'conditions': [ 80 'conditions': [
90 ['clang==1', { 81 ['clang==1', {
91 'cflags': [ 82 'cflags': [
92 '-Wall', 83 '-Wall',
(...skipping 11 matching lines...) Expand all
104 '-Wthread-safety', 95 '-Wthread-safety',
105 ], 96 ],
106 'cflags_cc': [ 97 'cflags_cc': [
107 '-Wunused-private-field', 98 '-Wunused-private-field',
108 ], 99 ],
109 }], 100 }],
110 ], 101 ],
111 }], 102 }],
112 ['OS=="mac"', { 103 ['OS=="mac"', {
113 'defines': [ 104 'defines': [
114 'OSX',
115 'WEBRTC_MAC', 105 'WEBRTC_MAC',
116 ], 106 ],
117 }], 107 }],
118 ['OS=="win"', { 108 ['OS=="win"', {
119 'defines': [ 109 'defines': [
120 'WEBRTC_WIN', 110 'WEBRTC_WIN',
121 ], 111 ],
122 'msvs_disabled_warnings': [ 112 'msvs_disabled_warnings': [
123 # https://code.google.com/p/chromium/issues/detail?id=372451#c20 113 # https://code.google.com/p/chromium/issues/detail?id=372451#c20
124 # Warning 4702 ("Unreachable code") should be re-enabled once 114 # Warning 4702 ("Unreachable code") should be re-enabled once
125 # users are updated to VS2013 Update 2. 115 # users are updated to VS2013 Update 2.
126 4702, 116 4702,
127 ], 117 ],
128 }], 118 }],
129 ['OS=="ios"', { 119 ['OS=="ios"', {
130 'defines': [ 120 'defines': [
131 'IOS',
132 'WEBRTC_MAC', 121 'WEBRTC_MAC',
133 'WEBRTC_IOS', 122 'WEBRTC_IOS',
134 ], 123 ],
135 }], 124 }],
136 ['OS=="ios" or (OS=="mac" and target_arch!="ia32")', { 125 ['OS=="ios" or (OS=="mac" and target_arch!="ia32")', {
137 'defines': [ 126 'defines': [
138 'CARBON_DEPRECATED=YES', 127 'CARBON_DEPRECATED=YES',
139 ], 128 ],
140 }], 129 }],
141 ['os_posix==1', { 130 ['os_posix==1', {
(...skipping 11 matching lines...) Expand all
153 'HASH_NAMESPACE=__gnu_cxx', 142 'HASH_NAMESPACE=__gnu_cxx',
154 'WEBRTC_POSIX', 143 'WEBRTC_POSIX',
155 'DISABLE_DYNAMIC_CAST', 144 'DISABLE_DYNAMIC_CAST',
156 # The POSIX standard says we have to define this. 145 # The POSIX standard says we have to define this.
157 '_REENTRANT', 146 '_REENTRANT',
158 ], 147 ],
159 }], 148 }],
160 ], 149 ],
161 }, # target_defaults 150 }, # target_defaults
162 } 151 }
OLDNEW
« no previous file with comments | « no previous file | talk/media/base/executablehelpers.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698