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
This commit is contained in:
shannon.woods@transgaming.com 2013-01-25 21:56:47 +00:00
Родитель 14fcb33aee
Коммит 2001a0cc3a
3 изменённых файлов: 12 добавлений и 4 удалений

Просмотреть файл

@ -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'],

Просмотреть файл

@ -37,7 +37,6 @@
],
'msvs_settings': {
'VCLinkerTool': {
'AdditionalLibraryDirectories': ['$(DXSDK_DIR)/lib/x86'],
'AdditionalDependencies': ['d3d9.lib'],
}
}

Просмотреть файл

@ -340,7 +340,6 @@
'msvs_disabled_warnings': [ 4267 ],
'msvs_settings': {
'VCLinkerTool': {
'AdditionalLibraryDirectories': ['$(DXSDK_DIR)/lib/x86'],
'AdditionalDependencies': [
'd3d9.lib',
'dxguid.lib',
@ -355,7 +354,6 @@
'include_dirs': [
'.',
'../include',
'$(DXSDK_DIR)/include',
],
'sources': [
'common/angleutils.h',
@ -380,7 +378,6 @@
'msvs_disabled_warnings': [ 4267 ],
'msvs_settings': {
'VCLinkerTool': {
'AdditionalLibraryDirectories': ['$(DXSDK_DIR)/lib/x86'],
'AdditionalDependencies': [
'd3d9.lib',
'dwmapi.lib',