diff options
| author | gregoryd@google.com <gregoryd@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-25 23:17:09 +0000 |
|---|---|---|
| committer | gregoryd@google.com <gregoryd@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-25 23:17:09 +0000 |
| commit | 3b32fa66e6260cc1cacd1c6c5f95b5bae6237f87 (patch) | |
| tree | df6034fc71d3b11cb2ad95a490fc03d809ace175 /chrome/nacl.gypi | |
| parent | 6e77aee61f940b1732823bf586a759bbf72ff9d2 (diff) | |
| download | chromium_src-3b32fa66e6260cc1cacd1c6c5f95b5bae6237f87.zip chromium_src-3b32fa66e6260cc1cacd1c6c5f95b5bae6237f87.tar.gz chromium_src-3b32fa66e6260cc1cacd1c6c5f95b5bae6237f87.tar.bz2 | |
64-bit Windows support for NaCl: update NaCl revision in Chrome, enable the 64-bit loader code and fix some build issues.
Review URL: http://codereview.chromium.org/651065
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40062 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/nacl.gypi')
| -rw-r--r-- | chrome/nacl.gypi | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/chrome/nacl.gypi b/chrome/nacl.gypi index 1858f97..ff926b3 100644 --- a/chrome/nacl.gypi +++ b/chrome/nacl.gypi @@ -35,11 +35,17 @@ '__STD_C', '_CRT_SECURE_NO_DEPRECATE', '_SCL_SECURE_NO_DEPRECATE', + '__STDC_LIMIT_MACROS=1', ], 'include_dirs': [ 'third_party/wtl/include', ], },], + ['OS=="linux"', { + 'defines': [ + '__STDC_LIMIT_MACROS=1', + ], + },], ], }], ], @@ -69,6 +75,13 @@ '../native_client/src/trusted/validator_x86/validator_x86.gyp:ncvalidate', '../native_client/src/trusted/platform_qualify/platform_qualify.gyp:platform_qual_lib', ], + 'direct_dependent_settings': { + 'defines': [ + 'NACL_BLOCK_SHIFT=5', + 'NACL_BLOCK_SIZE=32', + '<@(nacl_defines)', + ], + }, }, ], 'conditions': [ @@ -88,6 +101,9 @@ 'chrome_resources', 'chrome_strings', 'common_nacl_win64', + '../native_client/src/trusted/plugin/plugin.gyp:npGoogleNaClPluginChrome64', + '../native_client/src/trusted/service_runtime/service_runtime.gyp:sel64', + '../native_client/src/trusted/platform_qualify/platform_qualify.gyp:platform_qual_lib64', ], 'sources': [ 'nacl/broker_thread.cc', @@ -101,6 +117,13 @@ 'msvs_target_platform': 'x64', }, }, + 'direct_dependent_settings': { + 'defines': [ + 'NACL_BLOCK_SHIFT=5', + 'NACL_BLOCK_SIZE=32', + '<@(nacl_defines)', + ], + }, }, ], }], |