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

win: Link with libraries from other places

Browse source
This commit is contained in:
Cheng Zhao 2015-04-06 16:01:31 +08:00
parent d522443c75
commit 9934985974
2 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
brightray/brightray.gyp
View file

@ -167,13 +167,18 @@
'<(libchromiumcontent_dir)/boringssl.dll', '<(libchromiumcontent_dir)/boringssl.dll',
'<(libchromiumcontent_dir)/ffmpegsumo.lib', '<(libchromiumcontent_dir)/ffmpegsumo.lib',
'<(libchromiumcontent_dir)/libyuv.lib', '<(libchromiumcontent_dir)/libyuv.lib',
# content_browser.gypi:
'-lsensorsapi.lib',
'-lportabledeviceguids.lib',
# content_common.gypi: # content_common.gypi:
'-ld3d11.lib', '-ld3d9.lib',
'-ldxva2.lib', '-ldxva2.lib',
'-lstrmiids.lib', '-lstrmiids.lib',
'-lmf.lib', '-lmf.lib',
'-lmfplat.lib', '-lmfplat.lib',
'-lmfuuid.lib', '-lmfuuid.lib',
# media.gyp:
'-lmfreadwrite.lib',
], ],
'msvs_settings': { 'msvs_settings': {
'VCLinkerTool': { 'VCLinkerTool': {
@ -181,7 +186,6 @@
'ffmpegsumo.dll', 'ffmpegsumo.dll',
# content_common.gypi: # content_common.gypi:
'd3d9.dll', 'd3d9.dll',
'd3d11.dll',
'dxva2.dll', 'dxva2.dll',
'mf.dll', 'mf.dll',
'mfplat.dll', 'mfplat.dll',

11
brightray/brightray.gypi
View file

@ -22,9 +22,6 @@
# Build with clang under Linux. # Build with clang under Linux.
'linux_clang%': 1, 'linux_clang%': 1,
'win_release_RuntimeLibrary%': '2', # /MD (nondebug DLL)
'win_debug_RuntimeLibrary%': '3', # /MTd (debug DLL)
# See http://msdn.microsoft.com/en-us/library/aa652360(VS.71).aspx # See http://msdn.microsoft.com/en-us/library/aa652360(VS.71).aspx
'win_release_Optimization%': '2', # 2 = /Os 'win_release_Optimization%': '2', # 2 = /Os
'win_debug_Optimization%': '0', # 0 = /Od 'win_debug_Optimization%': '0', # 0 = /Od
@ -94,8 +91,12 @@
'dbghelp.lib', 'dbghelp.lib',
'dwmapi.lib', 'dwmapi.lib',
'gdi32.lib', 'gdi32.lib',
'netapi32.lib',
'oleacc.lib', 'oleacc.lib',
'powrprof.lib',
'user32.lib', 'user32.lib',
'usp10.lib',
'version.lib',
'winspool.lib', 'winspool.lib',
], ],
}, },
@ -119,9 +120,6 @@
'VCCLCompilerTool': { 'VCCLCompilerTool': {
'Optimization': '<(win_debug_Optimization)', 'Optimization': '<(win_debug_Optimization)',
'BasicRuntimeChecks': '<(win_debug_RuntimeChecks)', 'BasicRuntimeChecks': '<(win_debug_RuntimeChecks)',
# We use Release to match the version of chromiumcontent.dll we
# link against.
'RuntimeLibrary': '<(win_release_RuntimeLibrary)',
'conditions': [ 'conditions': [
# According to MSVS, InlineFunctionExpansion=0 means # According to MSVS, InlineFunctionExpansion=0 means
# "default inlining", not "/Ob0". # "default inlining", not "/Ob0".
@ -158,7 +156,6 @@
'msvs_settings': { 'msvs_settings': {
'VCCLCompilerTool': { 'VCCLCompilerTool': {
'Optimization': '<(win_release_Optimization)', 'Optimization': '<(win_release_Optimization)',
'RuntimeLibrary': '<(win_release_RuntimeLibrary)',
'conditions': [ 'conditions': [
# According to MSVS, InlineFunctionExpansion=0 means # According to MSVS, InlineFunctionExpansion=0 means
# "default inlining", not "/Ob0". # "default inlining", not "/Ob0".