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

Unified Diff: third_party/yasm/yasm.gyp

Issue 340072: FFmpeg in-tree build for mac. (Closed)
Patch Set: work around link-settings bug. Created 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/yasm/source/config/mac/libyasm-stdint.h ('k') | webkit/tools/test_shell/test_shell.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/yasm/yasm.gyp
diff --git a/third_party/yasm/yasm.gyp b/third_party/yasm/yasm.gyp
index 69b63cae5bd5e0ada821884ab582dc7824c62745..cfd67ecbf5575a21a6413c6232553932c945ce24 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)',
],
},
{
« no previous file with comments | « third_party/yasm/source/config/mac/libyasm-stdint.h ('k') | webkit/tools/test_shell/test_shell.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698