Chromium Code Reviews| Index: src/trusted/manifest_name_service_proxy/manifest_name_service_proxy.gyp |
| =================================================================== |
| --- src/trusted/manifest_name_service_proxy/manifest_name_service_proxy.gyp (revision 0) |
| +++ src/trusted/manifest_name_service_proxy/manifest_name_service_proxy.gyp (revision 0) |
| @@ -0,0 +1,87 @@ |
| +# -*- python -*- |
| +# Copyright 2011 (c) The Native Client Authors. All rights reserved. Use |
| +# of this source code is governed by a BSD-style license that can be |
| +# found in the LICENSE file. |
| +{ |
| + 'includes': [ |
| + '../../../build/common.gypi', |
| + ], |
| + 'target_defaults': { |
| + 'variables':{ |
| + 'target_base': 'none', |
| + }, |
| + 'target_conditions': [ |
| + ['target_base=="manifest_proxy"', { |
| + 'sources': [ |
| + 'manifest_proxy.h', |
| + 'manifest_proxy.c', |
| + ], |
| + 'xcode_settings': { |
| + 'WARNING_CFLAGS': [ |
| + '-Wno-missing-field-initializers' |
| + ] |
| + }, |
| + }, |
| + ]], |
| + }, |
| + 'conditions': [ |
| + ['OS=="linux"', { |
|
noelallen_use_chromium
2011/06/14 22:08:14
You should be able to ditch all these conditional
bsy
2011/06/15 00:21:03
Done.
|
| + 'defines': [ |
| + 'XP_UNIX', |
| + ], |
| + }], |
| + ['OS=="mac"', { |
| + 'defines': [ |
| + 'XP_MACOSX', |
| + 'XP_UNIX', |
| + 'TARGET_API_MAC_CARBON=1', |
| + 'NO_X11', |
| + 'USE_SYSTEM_CONSOLE', |
| + ], |
| + }], |
| + ['OS=="win"', { |
| + 'defines': [ |
| + 'XP_WIN', |
|
noelallen_use_chromium
2011/06/14 02:25:45
Did you copy these, or are you defining them on pu
bsy
2011/06/14 20:30:03
cut-n-pasted cargo-cult code.
noelallen_use_chromium
2011/06/14 22:08:14
_WIN32 is what we should be checking, and it shoul
bsy
2011/06/15 00:21:03
removed defines section
|
| + 'WIN32', |
| + '_WINDOWS' |
| + ], |
| + 'targets': [ |
| + { |
| + 'target_name': 'manifest_proxy64', |
| + 'type': 'static_library', |
| + 'variables': { |
| + 'target_base': 'manifest_proxy', |
| + }, |
| + 'configurations': { |
|
noelallen_use_chromium
2011/06/14 02:25:45
This seems inconsistent with how we support x64.
bsy
2011/06/14 20:30:03
src/trusted/desc/desc.gyp was probably the source
|
| + 'Common_Base': { |
| + 'msvs_target_platform': 'x64', |
| + }, |
| + }, |
| + 'dependencies': [ |
| + '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform64', |
| + '<(DEPTH)/native_client/src/shared/srpc/srpc.gyp:nonnacl_srpc64', |
| + '<(DEPTH)/native_client/src/trusted/threading/threading.gyp:thread_interface64', |
| + '<(DEPTH)/native_client/src/trusted/desc/desc.gyp:nrd_xfer64', |
| + '<(DEPTH)/native_client/src/trusted/nacl_base/nacl_base.gyp:nacl_base64', |
| + ], |
| + }, |
| + ], |
| + }], |
| + ], |
| + 'targets': [ |
| + { |
| + 'target_name': 'manifest_proxy', |
| + 'type': 'static_library', # 'dynamic_library', ?!? |
|
noelallen_use_chromium
2011/06/14 02:25:45
Did you mean to leave in this comment? I assume i
bsy
2011/06/14 20:30:03
Done.
|
| + 'variables': { |
| + 'target_base': 'manifest_proxy', |
| + }, |
| + 'dependencies': [ |
| + '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform', |
| + '<(DEPTH)/native_client/src/shared/srpc/srpc.gyp:nonnacl_srpc', |
| + '<(DEPTH)/native_client/src/trusted/threading/threading.gyp:thread_interface', |
| + '<(DEPTH)/native_client/src/trusted/desc/desc.gyp:nrd_xfer', |
| + '<(DEPTH)/native_client/src/trusted/nacl_base/nacl_base.gyp:nacl_base', |
| + ], |
| + }, |
| + ], |
| +} |