summaryrefslogtreecommitdiffstats
path: root/third_party/yasm
diff options
context:
space:
mode:
authorhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-13 19:30:25 +0000
committerhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-13 19:30:25 +0000
commitdc9711fe5e00639471fd0edf195a4ada4f7d994d (patch)
treedba32da9b4a33e5d22c3299c75c511198532f396 /third_party/yasm
parentb9f9383602610ef1f94e9bee2d91d7c044e16051 (diff)
downloadchromium_src-dc9711fe5e00639471fd0edf195a4ada4f7d994d.zip
chromium_src-dc9711fe5e00639471fd0edf195a4ada4f7d994d.tar.gz
chromium_src-dc9711fe5e00639471fd0edf195a4ada4f7d994d.tar.bz2
Building FFmpeg in tree for arm
Changes yasm to be built for host instead of target. Also don't need to depend on yasm if build ing for arm. Review URL: http://codereview.chromium.org/387023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31929 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/yasm')
-rw-r--r--third_party/yasm/yasm.gyp10
1 files changed, 10 insertions, 0 deletions
diff --git a/third_party/yasm/yasm.gyp b/third_party/yasm/yasm.gyp
index cfd67ec..f53d1f6 100644
--- a/third_party/yasm/yasm.gyp
+++ b/third_party/yasm/yasm.gyp
@@ -60,6 +60,7 @@
{
'target_name': 'yasm',
'type': 'executable',
+ 'toolsets': ['host'],
'dependencies': [
'config_sources',
'genmacro',
@@ -337,6 +338,7 @@
{
'target_name': 'config_sources',
'type': 'none',
+ 'toolsets': ['host'],
'sources': [
'source/config/<(OS)/Makefile',
'source/config/<(OS)/config.h',
@@ -346,6 +348,7 @@
{
'target_name': 'generate_files',
'type': 'none',
+ 'toolsets': ['host'],
'dependencies': [
'genperf',
'genversion',
@@ -407,6 +410,7 @@
{
'target_name': 'genperf_libs',
'type': 'static_library',
+ 'toolsets': ['host'],
'dependencies': [ 'config_sources', ],
'sources': [
'source/patched-yasm/libyasm/phash.c',
@@ -424,6 +428,7 @@
{
'target_name': 'genstring',
'type': 'executable',
+ 'toolsets': ['host'],
'dependencies': [ 'config_sources', ],
'sources': [
'source/patched-yasm/genstring.c',
@@ -438,6 +443,7 @@
{
'target_name': 'genperf',
'type': 'executable',
+ 'toolsets': ['host'],
'dependencies': [
'genperf_libs',
],
@@ -455,6 +461,7 @@
{
'target_name': 'genmacro',
'type': 'executable',
+ 'toolsets': ['host'],
'dependencies': [ 'config_sources', ],
'sources': [
'source/patched-yasm/tools/genmacro/genmacro.c',
@@ -469,6 +476,7 @@
{
'target_name': 'genversion',
'type': 'executable',
+ 'toolsets': ['host'],
'dependencies': [ 'config_sources', ],
'sources': [
'source/patched-yasm/modules/preprocs/nasm/genversion.c',
@@ -483,6 +491,7 @@
{
'target_name': 're2c',
'type': 'executable',
+ 'toolsets': ['host'],
'dependencies': [ 'config_sources', ],
'sources': [
'source/patched-yasm/tools/re2c/main.c',
@@ -505,6 +514,7 @@
{
'target_name': 'genmodule',
'type': 'executable',
+ 'toolsets': ['host'],
'dependencies': [
'config_sources',
],