diff --git a/brightray/brightray.gyp b/brightray/brightray.gyp index 925bf0fc5aa6..41db0f50443b 100644 --- a/brightray/brightray.gyp +++ b/brightray/brightray.gyp @@ -167,13 +167,18 @@ '<(libchromiumcontent_dir)/boringssl.dll', '<(libchromiumcontent_dir)/ffmpegsumo.lib', '<(libchromiumcontent_dir)/libyuv.lib', + # content_browser.gypi: + '-lsensorsapi.lib', + '-lportabledeviceguids.lib', # content_common.gypi: - '-ld3d11.lib', + '-ld3d9.lib', '-ldxva2.lib', '-lstrmiids.lib', '-lmf.lib', '-lmfplat.lib', '-lmfuuid.lib', + # media.gyp: + '-lmfreadwrite.lib', ], 'msvs_settings': { 'VCLinkerTool': { @@ -181,7 +186,6 @@ 'ffmpegsumo.dll', # content_common.gypi: 'd3d9.dll', - 'd3d11.dll', 'dxva2.dll', 'mf.dll', 'mfplat.dll', diff --git a/brightray/brightray.gypi b/brightray/brightray.gypi index 2f74e911639f..7d03a5efe7ea 100644 --- a/brightray/brightray.gypi +++ b/brightray/brightray.gypi @@ -22,9 +22,6 @@ # Build with clang under Linux. '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 'win_release_Optimization%': '2', # 2 = /Os 'win_debug_Optimization%': '0', # 0 = /Od @@ -94,8 +91,12 @@ 'dbghelp.lib', 'dwmapi.lib', 'gdi32.lib', + 'netapi32.lib', 'oleacc.lib', + 'powrprof.lib', 'user32.lib', + 'usp10.lib', + 'version.lib', 'winspool.lib', ], }, @@ -119,9 +120,6 @@ 'VCCLCompilerTool': { 'Optimization': '<(win_debug_Optimization)', 'BasicRuntimeChecks': '<(win_debug_RuntimeChecks)', - # We use Release to match the version of chromiumcontent.dll we - # link against. - 'RuntimeLibrary': '<(win_release_RuntimeLibrary)', 'conditions': [ # According to MSVS, InlineFunctionExpansion=0 means # "default inlining", not "/Ob0". @@ -158,7 +156,6 @@ 'msvs_settings': { 'VCCLCompilerTool': { 'Optimization': '<(win_release_Optimization)', - 'RuntimeLibrary': '<(win_release_RuntimeLibrary)', 'conditions': [ # According to MSVS, InlineFunctionExpansion=0 means # "default inlining", not "/Ob0".