mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 940708 - Part 5: Exclude more files from unified builds because of name clashes on RCSSTRING; r=gps
--HG-- extra : rebase_source : c5df6642d1bca37ba49e5cdb82f5d48b21e2fa87
This commit is contained in:
parent
7936c55391
commit
6cce839186
48
media/mtransport/third_party/moz.build
vendored
48
media/mtransport/third_party/moz.build
vendored
@ -11,10 +11,58 @@ GYP_DIRS += [
|
||||
'nrappkit',
|
||||
]
|
||||
|
||||
# These files cannot be built in unified mode because of name clashes on RCSSTRING
|
||||
nICEr_non_unified_sources = [
|
||||
'nICEr/src/crypto/nr_crypto.c',
|
||||
'nICEr/src/ice/ice_candidate.c',
|
||||
'nICEr/src/ice/ice_candidate_pair.c',
|
||||
'nICEr/src/ice/ice_component.c',
|
||||
'nICEr/src/ice/ice_ctx.c',
|
||||
'nICEr/src/ice/ice_media_stream.c',
|
||||
'nICEr/src/ice/ice_parser.c',
|
||||
'nICEr/src/ice/ice_peer_ctx.c',
|
||||
'nICEr/src/ice/ice_socket.c',
|
||||
'nICEr/src/net/nr_socket.c',
|
||||
'nICEr/src/net/transport_addr.c',
|
||||
'nICEr/src/net/transport_addr_reg.c',
|
||||
'nICEr/src/stun/addrs.c',
|
||||
'nICEr/src/stun/nr_socket_turn.c',
|
||||
'nICEr/src/stun/stun_build.c',
|
||||
'nICEr/src/stun/stun_client_ctx.c',
|
||||
'nICEr/src/stun/stun_codec.c',
|
||||
'nICEr/src/stun/stun_hint.c',
|
||||
'nICEr/src/stun/stun_msg.c',
|
||||
'nICEr/src/stun/stun_proc.c',
|
||||
'nICEr/src/stun/stun_server_ctx.c',
|
||||
'nICEr/src/stun/stun_util.c',
|
||||
'nICEr/src/stun/turn_client_ctx.c',
|
||||
'nICEr/src/util/cb_args.c',
|
||||
'nICEr/src/util/ice_util.c',
|
||||
]
|
||||
nrappkit_non_unified_sources = [
|
||||
'nrappkit/src/log/r_log.c',
|
||||
'nrappkit/src/util/byteorder.c',
|
||||
'nrappkit/src/util/hex.c',
|
||||
'nrappkit/src/util/libekr/debug.c',
|
||||
'nrappkit/src/util/libekr/r_assoc.c',
|
||||
'nrappkit/src/util/libekr/r_bitfield.c',
|
||||
'nrappkit/src/util/libekr/r_crc32.c',
|
||||
'nrappkit/src/util/libekr/r_data.c',
|
||||
'nrappkit/src/util/libekr/r_errors.c',
|
||||
'nrappkit/src/util/libekr/r_list.c',
|
||||
'nrappkit/src/util/libekr/r_memory.c',
|
||||
'nrappkit/src/util/libekr/r_replace.c',
|
||||
'nrappkit/src/util/libekr/r_time.c',
|
||||
'nrappkit/src/util/p_buf.c',
|
||||
'nrappkit/src/util/util.c',
|
||||
]
|
||||
|
||||
GYP_DIRS['nICEr'].input = 'nICEr/nicer.gyp'
|
||||
GYP_DIRS['nICEr'].variables = gyp_vars
|
||||
GYP_DIRS['nICEr'].sandbox_vars['FINAL_LIBRARY'] = 'webrtc'
|
||||
GYP_DIRS['nICEr'].non_unified_sources += nICEr_non_unified_sources
|
||||
|
||||
GYP_DIRS['nrappkit'].input = 'nrappkit/nrappkit.gyp'
|
||||
GYP_DIRS['nrappkit'].variables = gyp_vars
|
||||
GYP_DIRS['nrappkit'].sandbox_vars['FINAL_LIBRARY'] = 'webrtc'
|
||||
GYP_DIRS['nrappkit'].non_unified_sources += nrappkit_non_unified_sources
|
||||
|
Loading…
Reference in New Issue
Block a user