From ef1af5c3183fe154fa51ff89f71f0977b72ac3b4 Mon Sep 17 00:00:00 2001 From: "petewil@chromium.org" Date: Thu, 9 Jan 2014 18:48:05 +0000 Subject: Allow Win64 build of base library even in a Win32 build. Some components of a 32 bit build of chrome for Windows need to be built as Win64 Dlls. To allow those components to use base, we make a Win64 build of the base library even when building chrome 32 bit. This is needed by the Chrome Desk Band code. crbug.com/327435. https://codereview.chromium.org/79173004/ BUG=327435 Review URL: https://codereview.chromium.org/103333004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@243936 0039d316-1c4b-4281-b951-d872f2087c98 --- ppapi/ppapi_internal.gyp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'ppapi/ppapi_internal.gyp') diff --git a/ppapi/ppapi_internal.gyp b/ppapi/ppapi_internal.gyp index 26bd9c4..989a591 100644 --- a/ppapi/ppapi_internal.gyp +++ b/ppapi/ppapi_internal.gyp @@ -224,7 +224,7 @@ }, 'dependencies': [ 'ppapi.gyp:ppapi_c', - '../base/base.gyp:base_nacl_win64', + '../base/base.gyp:base_win64', '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations_win64', '../ipc/ipc.gyp:ipc_win64', ], @@ -232,7 +232,7 @@ '<@(nacl_win64_defines)', ], 'export_dependent_settings': [ - '../base/base.gyp:base_nacl_win64', + '../base/base.gyp:base_win64', ], 'configurations': { 'Common_Base': { @@ -248,7 +248,7 @@ 'ppapi_ipc_target': 1, }, 'dependencies': [ - '../base/base.gyp:base_nacl_win64', + '../base/base.gyp:base_win64', '../ipc/ipc.gyp:ipc_win64', '../gpu/gpu.gyp:gpu_ipc_win64', 'ppapi.gyp:ppapi_c', -- cgit v1.1