OLD | NEW |
---|---|
(Empty) | |
1 # -*- python -*- | |
2 # Copyright 2011 (c) The Native Client Authors. All rights reserved. Use | |
3 # of this source code is governed by a BSD-style license that can be | |
4 # found in the LICENSE file. | |
5 { | |
6 'includes': [ | |
7 '../../../build/common.gypi', | |
8 ], | |
9 'target_defaults': { | |
10 'variables':{ | |
11 'target_base': 'none', | |
12 }, | |
13 'target_conditions': [ | |
14 ['target_base=="manifest_proxy"', { | |
15 'sources': [ | |
16 'manifest_proxy.h', | |
17 'manifest_proxy.c', | |
18 ], | |
19 'xcode_settings': { | |
20 'WARNING_CFLAGS': [ | |
21 '-Wno-missing-field-initializers' | |
22 ] | |
23 }, | |
24 }, | |
25 ]], | |
26 }, | |
27 'conditions': [ | |
28 ['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.
| |
29 'defines': [ | |
30 'XP_UNIX', | |
31 ], | |
32 }], | |
33 ['OS=="mac"', { | |
34 'defines': [ | |
35 'XP_MACOSX', | |
36 'XP_UNIX', | |
37 'TARGET_API_MAC_CARBON=1', | |
38 'NO_X11', | |
39 'USE_SYSTEM_CONSOLE', | |
40 ], | |
41 }], | |
42 ['OS=="win"', { | |
43 'defines': [ | |
44 '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
| |
45 'WIN32', | |
46 '_WINDOWS' | |
47 ], | |
48 'targets': [ | |
49 { | |
50 'target_name': 'manifest_proxy64', | |
51 'type': 'static_library', | |
52 'variables': { | |
53 'target_base': 'manifest_proxy', | |
54 }, | |
55 '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
| |
56 'Common_Base': { | |
57 'msvs_target_platform': 'x64', | |
58 }, | |
59 }, | |
60 'dependencies': [ | |
61 '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform64' , | |
62 '<(DEPTH)/native_client/src/shared/srpc/srpc.gyp:nonnacl_srpc64', | |
63 '<(DEPTH)/native_client/src/trusted/threading/threading.gyp:thread_i nterface64', | |
64 '<(DEPTH)/native_client/src/trusted/desc/desc.gyp:nrd_xfer64', | |
65 '<(DEPTH)/native_client/src/trusted/nacl_base/nacl_base.gyp:nacl_bas e64', | |
66 ], | |
67 }, | |
68 ], | |
69 }], | |
70 ], | |
71 'targets': [ | |
72 { | |
73 'target_name': 'manifest_proxy', | |
74 '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.
| |
75 'variables': { | |
76 'target_base': 'manifest_proxy', | |
77 }, | |
78 'dependencies': [ | |
79 '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform', | |
80 '<(DEPTH)/native_client/src/shared/srpc/srpc.gyp:nonnacl_srpc', | |
81 '<(DEPTH)/native_client/src/trusted/threading/threading.gyp:thread_inter face', | |
82 '<(DEPTH)/native_client/src/trusted/desc/desc.gyp:nrd_xfer', | |
83 '<(DEPTH)/native_client/src/trusted/nacl_base/nacl_base.gyp:nacl_base', | |
84 ], | |
85 }, | |
86 ], | |
87 } | |
OLD | NEW |