Commit b4f67f74 by apatrick@chromium.org

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 git-svn-id: https://angleproject.googlecode.com/svn/trunk@1728 736b8ea6-26fd-11df-bfd4-992fa37f6226
parent 9d8f9be0
...@@ -79,11 +79,23 @@ ...@@ -79,11 +79,23 @@
# Most of the executables we'll ever create are tests # Most of the executables we'll ever create are tests
# and utilities with console output. # and utilities with console output.
'SubSystem': '1', # /SUBSYSTEM:CONSOLE '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': { 'VCResourceCompilerTool': {
'Culture': '1033', 'Culture': '1033',
}, },
}, },
'msvs_system_include_dirs': [
'$(ProgramFiles)/Windows Kits/8.0/Include/shared',
'$(ProgramFiles)/Windows Kits/8.0/Include/um',
],
}, # Common }, # Common
'Debug': { 'Debug': {
'inherit_from': ['Common'], 'inherit_from': ['Common'],
......
...@@ -37,7 +37,6 @@ ...@@ -37,7 +37,6 @@
], ],
'msvs_settings': { 'msvs_settings': {
'VCLinkerTool': { 'VCLinkerTool': {
'AdditionalLibraryDirectories': ['$(DXSDK_DIR)/lib/x86'],
'AdditionalDependencies': ['d3d9.lib'], 'AdditionalDependencies': ['d3d9.lib'],
} }
} }
......
...@@ -221,7 +221,6 @@ ...@@ -221,7 +221,6 @@
'include_dirs': [ 'include_dirs': [
'.', '.',
'../include', '../include',
'$(DXSDK_DIR)/include',
], ],
'sources': [ 'sources': [
'common/angleutils.h', 'common/angleutils.h',
...@@ -279,7 +278,6 @@ ...@@ -279,7 +278,6 @@
'msvs_disabled_warnings': [ 4267 ], 'msvs_disabled_warnings': [ 4267 ],
'msvs_settings': { 'msvs_settings': {
'VCLinkerTool': { 'VCLinkerTool': {
'AdditionalLibraryDirectories': ['$(DXSDK_DIR)/lib/x86'],
'AdditionalDependencies': [ 'AdditionalDependencies': [
'd3d9.lib', 'd3d9.lib',
], ],
...@@ -293,7 +291,6 @@ ...@@ -293,7 +291,6 @@
'include_dirs': [ 'include_dirs': [
'.', '.',
'../include', '../include',
'$(DXSDK_DIR)/include',
], ],
'sources': [ 'sources': [
'common/angleutils.h', 'common/angleutils.h',
...@@ -318,7 +315,6 @@ ...@@ -318,7 +315,6 @@
'msvs_disabled_warnings': [ 4267 ], 'msvs_disabled_warnings': [ 4267 ],
'msvs_settings': { 'msvs_settings': {
'VCLinkerTool': { 'VCLinkerTool': {
'AdditionalLibraryDirectories': ['$(DXSDK_DIR)/lib/x86'],
'AdditionalDependencies': [ 'AdditionalDependencies': [
'd3d9.lib', 'd3d9.lib',
'dxguid.lib', 'dxguid.lib',
......
#define MAJOR_VERSION 1 #define MAJOR_VERSION 1
#define MINOR_VERSION 0 #define MINOR_VERSION 0
#define BUILD_VERSION 0 #define BUILD_VERSION 0
#define BUILD_REVISION 1726 #define BUILD_REVISION 1728
#define STRINGIFY(x) #x #define STRINGIFY(x) #x
#define MACRO_STRINGIFY(x) STRINGIFY(x) #define MACRO_STRINGIFY(x) STRINGIFY(x)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment