diff options
| author | shannon.woods@transgaming.com <shannon.woods@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> | 2013-01-25 21:56:47 +0000 |
|---|---|---|
| committer | shannon.woods@transgaming.com <shannon.woods@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> | 2013-01-25 21:56:47 +0000 |
| commit | 2001a0cc3a7c6cbd9e7b1ddcd07140ee45ad6a9c (patch) | |
| tree | 32a83d56a74d30382ef58d77a10ff4fe8eb827b1 /build | |
| parent | 14fcb33aee8aa0371677a094e8eb1829fefda4a5 (diff) | |
| download | angle-2001a0cc3a7c6cbd9e7b1ddcd07140ee45ad6a9c.tar.gz | |
Remove DXSDK_DIR from search paths.
Chrome now builds ANGLE against the Windows 8 Platform SDK.
Move the include and lib search paths to common.gypi so that downstream projects can specify the location of the Platform SDK or alternatively use the DirectX SDK instead.
Review URL: https://codereview.appspot.com/7193052
Conflicts:
src/common/version.h
git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1793 736b8ea6-26fd-11df-bfd4-992fa37f6226
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/build/common.gypi b/build/common.gypi index ec53bdc9..3ae185ed 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -79,11 +79,23 @@ # Most of the executables we'll ever create are tests # and utilities with console output. 'SubSystem': '1', # /SUBSYSTEM:CONSOLE + 'AdditionalLibraryDirectories': [ + '$(ProgramFiles)/Windows Kits/8.0/Lib/win8/um/x86', + ], + }, + 'VCLibrarianTool': { + 'AdditionalLibraryDirectories': [ + '$(ProgramFiles)/Windows Kits/8.0/Lib/win8/um/x86', + ], }, 'VCResourceCompilerTool': { 'Culture': '1033', }, }, + 'msvs_system_include_dirs': [ + '$(ProgramFiles)/Windows Kits/8.0/Include/shared', + '$(ProgramFiles)/Windows Kits/8.0/Include/um', + ], }, # Common 'Debug': { 'inherit_from': ['Common'], |