diff options
| author | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-09 21:31:37 +0000 |
|---|---|---|
| committer | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-09 21:31:37 +0000 |
| commit | a78da50e623dd2ff6573f41febd91dac43c21bc7 (patch) | |
| tree | 8307ceabc8a635acd0045d642c31c7ae466d6f63 /build | |
| parent | 51e18a108cb9556644975c9e980bb6cd824c9f93 (diff) | |
| download | chromium_src-a78da50e623dd2ff6573f41febd91dac43c21bc7.zip chromium_src-a78da50e623dd2ff6573f41febd91dac43c21bc7.tar.gz chromium_src-a78da50e623dd2ff6573f41febd91dac43c21bc7.tar.bz2 | |
Added ANGLE to Windows build.
Also added paths to DirectX SDK to common.gypi because ANGLE requires headers and libraries not part of the Windows Platform SDK.
TEST=trybots
BUG=none
Review URL: http://codereview.chromium.org/2685002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49323 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/all.gyp | 1 | ||||
| -rw-r--r-- | build/common.gypi | 13 |
2 files changed, 10 insertions, 4 deletions
diff --git a/build/all.gyp b/build/all.gyp index d6b331fa..5386c3c 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -261,6 +261,7 @@ '../chrome_frame/chrome_frame.gyp:npchrome_frame', # Only build OSMesa on buildbots. It builds a software GL renderer # that can be used where native GL is not available. + '../third_party/angle/src/build_angle.gyp:*', '../third_party/mesa/mesa.gyp:osmesa', ], }, diff --git a/build/common.gypi b/build/common.gypi index a46ff74..496db7e 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -1221,6 +1221,7 @@ ], 'msvs_system_include_dirs': [ '<(DEPTH)/third_party/platformsdk_win7/files/Include', + '<(DEPTH)/third_party/directxsdk/files/Include', '$(VSInstallDir)/VC/atlmfc/include', ], 'msvs_cygwin_dirs': ['<(DEPTH)/third_party/cygwin'], @@ -1243,8 +1244,10 @@ }, 'VCLibrarianTool': { 'AdditionalOptions': ['/ignore:4221'], - 'AdditionalLibraryDirectories': - ['<(DEPTH)/third_party/platformsdk_win7/files/Lib'], + 'AdditionalLibraryDirectories': [ + '<(DEPTH)/third_party/platformsdk_win7/files/Lib', + '<(DEPTH)/third_party/directxsdk/files/Lib/x86', + ], }, 'VCLinkerTool': { 'AdditionalDependencies': [ @@ -1256,8 +1259,10 @@ 'psapi.lib', 'dbghelp.lib', ], - 'AdditionalLibraryDirectories': - ['<(DEPTH)/third_party/platformsdk_win7/files/Lib'], + 'AdditionalLibraryDirectories': [ + '<(DEPTH)/third_party/platformsdk_win7/files/Lib', + '<(DEPTH)/third_party/directxsdk/files/Lib/x86', + ], 'GenerateDebugInformation': 'true', 'MapFileName': '$(OutDir)\\$(TargetName).map', 'ImportLibrary': '$(OutDir)\\lib\\$(TargetName).lib', |