summaryrefslogtreecommitdiffstats
path: root/third_party/yasm
diff options
context:
space:
mode:
authorwolenetz@chromium.org <wolenetz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-23 23:44:28 +0000
committerwolenetz@chromium.org <wolenetz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-23 23:44:28 +0000
commit3af83cfa1ea38d4b4f7c1084c24de17b62ee856e (patch)
tree27a743ffa3db964c1deb7471b774b67cde9a8341 /third_party/yasm
parent0140eee9c038ea3b4aff456ef2d38fa6e7f821f3 (diff)
downloadchromium_src-3af83cfa1ea38d4b4f7c1084c24de17b62ee856e.zip
chromium_src-3af83cfa1ea38d4b4f7c1084c24de17b62ee856e.tar.gz
chromium_src-3af83cfa1ea38d4b4f7c1084c24de17b62ee856e.tar.bz2
Remove -DPREFIX from win64 yasm_compile.gypi to fix ffmpeg linking
BUG=171542,171721,166496 TEST=ffmpegsumo target builds on win64 with private fix to disable ffmpeg compiler warning 4267 on win64 Review URL: https://chromiumcodereview.appspot.com/12059002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@178429 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/yasm')
-rw-r--r--third_party/yasm/yasm_compile.gypi1
1 files changed, 0 insertions, 1 deletions
diff --git a/third_party/yasm/yasm_compile.gypi b/third_party/yasm/yasm_compile.gypi
index 504abc2..31ce6cf 100644
--- a/third_party/yasm/yasm_compile.gypi
+++ b/third_party/yasm/yasm_compile.gypi
@@ -70,7 +70,6 @@
}],
[ 'OS=="win" and target_arch=="x64"', {
'yasm_flags': [
- '-DPREFIX',
'-fx64',
'-m', 'amd64',
],