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

Unified Diff: gyp/libjpeg-turbo.gyp

Issue 1229303002: Fix msvs builds (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 5 months 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gyp/libjpeg-turbo.gyp
diff --git a/gyp/libjpeg-turbo.gyp b/gyp/libjpeg-turbo.gyp
index eafd6cb10494fccd0f97e47d3d616c80ff4f201c..18d70ed2eb57f9af7d5f9a398c86d3607378c5f4 100644
--- a/gyp/libjpeg-turbo.gyp
+++ b/gyp/libjpeg-turbo.gyp
@@ -18,6 +18,17 @@
},
'targets': [
{
+ 'target_name': 'yasm-win',
+ 'type': 'executable',
+ 'sources': [
+ '../third_party/externals/yasm/binaries/win/yasm.exe',
+ ],
+ 'copies' : [{
+ 'destination': '<(PRODUCT_DIR)',
+ 'files': [ '../third_party/externals/yasm/binaries/win/yasm.exe' ],
+ }],
+ },
+ {
'target_name': 'libjpeg-turbo',
'type': 'static_library',
'include_dirs': [
@@ -33,9 +44,7 @@
],
'msvs_settings': {
'VCCLCompilerTool': {
- 'AdditionalOptions': [
- '/w',
- ],
+ 'WarningLevel': '0',
},
},
'xcode_settings': {
@@ -219,11 +228,14 @@
# Build rules for an asm file.
# On Windows, we use the precompiled yasm binary.
- # On Linux, we build our patched yasm and use it except when use_system_yasm is 1.
+ # On Linux, we build our patched yasm and use it.
# On Mac, we always build our patched yasm and use it.
[ 'skia_os == "win"', {
+ 'dependencies': [
+ 'yasm-win',
+ ],
'variables': {
- 'yasm_path': '../third_party/externals/yasm/binaries/win/yasm.exe',
+ 'yasm_path': '<(PRODUCT_DIR)/yasm.exe',
'conditions': [
[ 'skia_arch_type == "x86"', {
'yasm_format': '-fwin32',
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698