diff options
| author | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-05 00:56:41 +0000 |
|---|---|---|
| committer | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-05 00:56:41 +0000 |
| commit | 995925ba4447efcc0d1d81285504621d87e50662 (patch) | |
| tree | 9103a423e26ee97b8c7e2cd268a60b73c1721ccd /third_party/yasm/yasm.gyp | |
| parent | 92f181bdad8897a5891d6a67a7aa5de7caa8402c (diff) | |
| download | chromium_src-995925ba4447efcc0d1d81285504621d87e50662.zip chromium_src-995925ba4447efcc0d1d81285504621d87e50662.tar.gz chromium_src-995925ba4447efcc0d1d81285504621d87e50662.tar.bz2 | |
FFmpeg in-tree build for mac.
BUG=26509
TEST=none
Review URL: http://codereview.chromium.org/340072
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31050 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/yasm/yasm.gyp')
| -rw-r--r-- | third_party/yasm/yasm.gyp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/third_party/yasm/yasm.gyp b/third_party/yasm/yasm.gyp index 69b63ca..cfd67ec 100644 --- a/third_party/yasm/yasm.gyp +++ b/third_party/yasm/yasm.gyp @@ -32,7 +32,7 @@ { 'variables': { 'yasm_include_dirs': [ - 'source/config/linux', + 'source/config/<(OS)', 'source/patched-yasm', ], @@ -41,8 +41,8 @@ # it would probably be safe to use these flags there as well, the # ./configure based build does not use the same flags between the main # yasm executable, and its subprograms. - 'yasm_c_flags': [ - '-DHAVE_CONFIG_H', + 'yasm_defines': ['HAVE_CONFIG_H'], + 'yasm_cflags': [ '-std=gnu99', '-ansi', '-pedantic', @@ -61,6 +61,7 @@ 'target_name': 'yasm', 'type': 'executable', 'dependencies': [ + 'config_sources', 'genmacro', 'genmodule', 'genperf', @@ -153,9 +154,8 @@ '<(shared_generated_dir)', '<(generated_dir)', ], - 'cflags': [ - '<@(yasm_c_flags)', - ], + 'defines': [ '<@(yasm_defines)' ], + 'cflags': [ '<@(yasm_cflags)', ], 'rules': [ { 'rule_name': 'generate_gperf', @@ -313,7 +313,7 @@ { 'action_name': 'generate_module', 'variables': { - 'makefile': 'source/config/linux/Makefile', + 'makefile': 'source/config/<(OS)/Makefile', 'module_in': 'source/patched-yasm/libyasm/module.in', 'outfile': '<(generated_dir)/module.c', }, @@ -416,8 +416,9 @@ 'include_dirs': [ '<@(yasm_include_dirs)', ], + 'defines': [ '<@(yasm_defines)' ], 'cflags': [ - '<(yasm_c_flags)', + '<@(yasm_cflags)', ], }, { |