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

Side by Side Diff: build/common.gypi

Issue 11364077: Linux: fix build with system ffmpeg (Chromium side). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | media/base/media_posix.cc » ('j') | media/filters/ffmpeg_glue.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 # IMPORTANT: 5 # IMPORTANT:
6 # Please don't directly include this file if you are building via gyp_chromium, 6 # Please don't directly include this file if you are building via gyp_chromium,
7 # since gyp_chromium is automatically forcing its inclusion. 7 # since gyp_chromium is automatically forcing its inclusion.
8 { 8 {
9 # Variables expected to be overriden on the GYP command line (-D) or by 9 # Variables expected to be overriden on the GYP command line (-D) or by
10 # ~/.gyp/include.gypi. 10 # ~/.gyp/include.gypi.
(...skipping 1882 matching lines...) Expand 10 before | Expand all | Expand 10 after
1893 'GCC_TREAT_WARNINGS_AS_ERRORS': 'NO', 1893 'GCC_TREAT_WARNINGS_AS_ERRORS': 'NO',
1894 'RUN_CLANG_STATIC_ANALYZER': 'NO', 1894 'RUN_CLANG_STATIC_ANALYZER': 'NO',
1895 }, 1895 },
1896 }], 1896 }],
1897 ], 1897 ],
1898 }, { 1898 }, {
1899 'includes': [ 1899 'includes': [
1900 # Rules for excluding e.g. foo_win.cc from the build on non-Windows. 1900 # Rules for excluding e.g. foo_win.cc from the build on non-Windows.
1901 'filename_rules.gypi', 1901 'filename_rules.gypi',
1902 ], 1902 ],
1903 # In Chromium code, we define __STDC_FORMAT_MACROS in order to get the 1903 # In Chromium code, we define __STDC_foo_MACROS in order to get the
1904 # C99 macros on Mac and Linux. 1904 # C99 macros on Mac and Linux.
1905 'defines': [ 1905 'defines': [
1906 '__STDC_CONSTANT_MACROS',
1906 '__STDC_FORMAT_MACROS', 1907 '__STDC_FORMAT_MACROS',
1907 ], 1908 ],
1908 'conditions': [ 1909 'conditions': [
1909 ['OS=="win"', { 1910 ['OS=="win"', {
1910 # turn on warnings for signed/unsigned mismatch on chromium code. 1911 # turn on warnings for signed/unsigned mismatch on chromium code.
1911 'msvs_settings': { 1912 'msvs_settings': {
1912 'VCCLCompilerTool': { 1913 'VCCLCompilerTool': {
1913 'AdditionalOptions': ['/we4389'], 1914 'AdditionalOptions': ['/we4389'],
1914 }, 1915 },
1915 }, 1916 },
(...skipping 1751 matching lines...) Expand 10 before | Expand all | Expand 10 after
3667 # settings in target dicts. SYMROOT is a special case, because many other 3668 # settings in target dicts. SYMROOT is a special case, because many other
3668 # Xcode variables depend on it, including variables such as 3669 # Xcode variables depend on it, including variables such as
3669 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 3670 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
3670 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 3671 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
3671 # files to appear (when present) in the UI as actual files and not red 3672 # files to appear (when present) in the UI as actual files and not red
3672 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 3673 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
3673 # and therefore SYMROOT, needs to be set at the project level. 3674 # and therefore SYMROOT, needs to be set at the project level.
3674 'SYMROOT': '<(DEPTH)/xcodebuild', 3675 'SYMROOT': '<(DEPTH)/xcodebuild',
3675 }, 3676 },
3676 } 3677 }
OLDNEW
« no previous file with comments | « no previous file | media/base/media_posix.cc » ('j') | media/filters/ffmpeg_glue.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698