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

Side by Side Diff: base/allocator/allocator.gyp

Issue 10413034: fix warning compiling allocator/tcmalloc on win32 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 7 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'jemalloc_dir': '../../third_party/jemalloc/chromium', 7 'jemalloc_dir': '../../third_party/jemalloc/chromium',
8 'tcmalloc_dir': '../../third_party/tcmalloc/chromium', 8 'tcmalloc_dir': '../../third_party/tcmalloc/chromium',
9 }, 9 },
10 'targets': [ 10 'targets': [
(...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after
297 'RuntimeLibrary': '0', 297 'RuntimeLibrary': '0',
298 }, 298 },
299 }, 299 },
300 }, 300 },
301 }, 301 },
302 'conditions': [ 302 'conditions': [
303 ['OS=="win"', { 303 ['OS=="win"', {
304 'defines': [ 304 'defines': [
305 'PERFTOOLS_DLL_DECL=', 305 'PERFTOOLS_DLL_DECL=',
306 ], 306 ],
307 'defines!': [
308 # tcmalloc source files unconditionally define this, remove it from
309 # the list of defines that common.gypi defines globally.
310 'NOMINMAX',
311 ],
307 'dependencies': [ 312 'dependencies': [
308 'libcmt', 313 'libcmt',
309 ], 314 ],
310 'include_dirs': [ 315 'include_dirs': [
311 '<(tcmalloc_dir)/src/windows', 316 '<(tcmalloc_dir)/src/windows',
312 ], 317 ],
313 'sources!': [ 318 'sources!': [
314 '<(tcmalloc_dir)/src/base/elf_mem_image.cc', 319 '<(tcmalloc_dir)/src/base/elf_mem_image.cc',
315 '<(tcmalloc_dir)/src/base/elf_mem_image.h', 320 '<(tcmalloc_dir)/src/base/elf_mem_image.h',
316 '<(tcmalloc_dir)/src/base/linuxthreads.cc', 321 '<(tcmalloc_dir)/src/base/linuxthreads.cc',
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
500 'configurations': { 505 'configurations': {
501 'Common_Base': { 506 'Common_Base': {
502 'msvs_target_platform': 'x64', 507 'msvs_target_platform': 'x64',
503 }, 508 },
504 }, 509 },
505 }, 510 },
506 ], 511 ],
507 }], 512 }],
508 ], 513 ],
509 } 514 }
OLDNEW
« 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