mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

win: Fix Debug build

Browse source
This commit is contained in:
Cheng Zhao 2015-04-07 13:50:58 +08:00
parent 2f5090d667
commit 0f97bf03fa
3 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
atom.gyp
View file

@ -247,7 +247,6 @@
# include its dependencies here. # include its dependencies here.
'vendor/node/deps/cares/cares.gyp:cares', 'vendor/node/deps/cares/cares.gyp:cares',
'vendor/node/deps/http_parser/http_parser.gyp:http_parser', 'vendor/node/deps/http_parser/http_parser.gyp:http_parser',
'vendor/node/deps/openssl/openssl.gyp:openssl',
'vendor/node/deps/uv/uv.gyp:libuv', 'vendor/node/deps/uv/uv.gyp:libuv',
'vendor/node/deps/zlib/zlib.gyp:zlib', 'vendor/node/deps/zlib/zlib.gyp:zlib',
# Build with breakpad support. # Build with breakpad support.

7
common.gypi
View file

@ -43,6 +43,7 @@
'msvs_disabled_warnings': [ 'msvs_disabled_warnings': [
4703, # potentially uninitialized local pointer variable 'req' used 4703, # potentially uninitialized local pointer variable 'req' used
4013, # 'free' undefined; assuming extern returning int 4013, # 'free' undefined; assuming extern returning int
4018, # signed/unsigned mismatch
4054, # 4054, #
4057, # 'function' : 'volatile LONG *' differs in indirection to slightly different base types from 'unsigned long *' 4057, # 'function' : 'volatile LONG *' differs in indirection to slightly different base types from 'unsigned long *'
4189, # 4189, #
@ -146,6 +147,12 @@
'-Wno-empty-body', '-Wno-empty-body',
], ],
}], # OS=="linux" }], # OS=="linux"
['OS=="win"', {
'msvs_disabled_warnings': [
# unreferenced local function has been removed.
4505,
],
}], # OS=="win"
], ],
}], }],
['_type in ["executable", "shared_library"]', { ['_type in ["executable", "shared_library"]', {

2
vendor/brightray vendored

@ -1 +1 @@
Subproject commit d4c8ac2565a2e257c37215d9b65d6dd0267aad1b Subproject commit 71a4624adf2e95ee57138d6f5f1b5c469c20c4b4