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

Remove DXSDK_DIR from search paths.
b4f67f74 · apatrick@chromium.org · 9d8f9be0 · b4f67f74 · b4f67f74 · b4f67f74
Commit b4f67f74 authored Jan 23, 2013 by apatrick@chromium.org
Hide whitespace changes
Inline Side-by-side

Showing with 13 additions and 6 deletions

common.gypi build/common.gypi +12 -0

build_samples.gyp samples/build_samples.gyp +0 -1

build_angle.gypi src/build_angle.gypi +0 -4

version.h src/common/version.h +1 -1

No files found.
--- 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'],

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

--- a/src/build_angle.gypi
+++ b/src/build_angle.gypi
@@ -221,7 +221,6 @@
          'include_dirs': [
            '.',
            '../include',
-            '$(DXSDK_DIR)/include',
          ],
          'sources': [
            'common/angleutils.h',
@@ -279,7 +278,6 @@
          'msvs_disabled_warnings': [ 4267 ],
          'msvs_settings': {
            'VCLinkerTool': {
-              'AdditionalLibraryDirectories': ['$(DXSDK_DIR)/lib/x86'],
              'AdditionalDependencies': [
                'd3d9.lib',
              ],
@@ -293,7 +291,6 @@
          'include_dirs': [
            '.',
            '../include',
-            '$(DXSDK_DIR)/include',
          ],
          'sources': [
            'common/angleutils.h',
@@ -318,7 +315,6 @@
          'msvs_disabled_warnings': [ 4267 ],
          'msvs_settings': {
            'VCLinkerTool': {
-              'AdditionalLibraryDirectories': ['$(DXSDK_DIR)/lib/x86'],
              'AdditionalDependencies': [
                'd3d9.lib',
                'dxguid.lib',

--- a/src/common/version.h
+++ b/src/common/version.h
 #define MAJOR_VERSION 1
 #define MINOR_VERSION 0
 #define BUILD_VERSION 0
-#define BUILD_REVISION 1726
+#define BUILD_REVISION 1728
 #define STRINGIFY(x) #x
 #define MACRO_STRINGIFY(x) STRINGIFY(x)