diff options
| author | piman@google.com <piman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-28 06:46:54 +0000 |
|---|---|---|
| committer | piman@google.com <piman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-28 06:46:54 +0000 |
| commit | 9af5ddab146aafa629a3c9dabab4586185fcdf9a (patch) | |
| tree | eda3ad582677f29677f84405f0f862626f8c0fd3 /o3d | |
| parent | 5ef47ec0d8278b6ff2c663299a41fa28e474a896 (diff) | |
| download | chromium_src-9af5ddab146aafa629a3c9dabab4586185fcdf9a.zip chromium_src-9af5ddab146aafa629a3c9dabab4586185fcdf9a.tar.gz chromium_src-9af5ddab146aafa629a3c9dabab4586185fcdf9a.tar.bz2 | |
win: fix DXSDK include path, needs to be after platform sdk include path
Review URL: http://codereview.chromium.org/554110
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37384 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d')
| -rw-r--r-- | o3d/build/libs.gyp | 2 | ||||
| -rw-r--r-- | o3d/core/core.gyp | 2 | ||||
| -rw-r--r-- | o3d/import/import.gyp | 2 | ||||
| -rw-r--r-- | o3d/installer/win/installer.gyp | 2 | ||||
| -rw-r--r-- | o3d/standalone/standalone.gyp | 2 | ||||
| -rw-r--r-- | o3d/tests/tests.gyp | 2 |
6 files changed, 7 insertions, 5 deletions
diff --git a/o3d/build/libs.gyp b/o3d/build/libs.gyp index 315ce7c..1a61c59 100644 --- a/o3d/build/libs.gyp +++ b/o3d/build/libs.gyp @@ -257,7 +257,7 @@ 'target_name': 'dx_dll', 'type': 'none', 'all_dependent_settings': { - 'include_dirs': [ + 'msvs_system_include_dirs': [ '$(DXSDK_DIR)/Include', ], 'libraries': [ diff --git a/o3d/core/core.gyp b/o3d/core/core.gyp index 46c5d4b..f324884 100644 --- a/o3d/core/core.gyp +++ b/o3d/core/core.gyp @@ -32,7 +32,7 @@ ], ['renderer == "d3d9" and OS == "win"', { - 'include_dirs': [ + 'msvs_system_include_dirs': [ '$(DXSDK_DIR)/Include', ], } diff --git a/o3d/import/import.gyp b/o3d/import/import.gyp index 8dea0a5..d07fd1c 100644 --- a/o3d/import/import.gyp +++ b/o3d/import/import.gyp @@ -53,7 +53,7 @@ 'conditions' : [ ['OS == "win"', { - 'include_dirs': [ + 'msvs_system_include_dirs': [ '$(DXSDK_DIR)/Include', ], 'sources': [ diff --git a/o3d/installer/win/installer.gyp b/o3d/installer/win/installer.gyp index d13232f..fa7bca1 100644 --- a/o3d/installer/win/installer.gyp +++ b/o3d/installer/win/installer.gyp @@ -57,6 +57,8 @@ '../../<(glewdir)/include', '../../<(cgdir)/include', '<(INTERMEDIATE_DIR)', + ], + 'msvs_system_include_dirs': [ '$(DXSDK_DIR)/Include', ], 'defines': [ diff --git a/o3d/standalone/standalone.gyp b/o3d/standalone/standalone.gyp index c5a5d5b..2199fa9 100644 --- a/o3d/standalone/standalone.gyp +++ b/o3d/standalone/standalone.gyp @@ -102,7 +102,7 @@ ], ['OS == "win" and renderer == "d3d9"', { - 'include_dirs': [ + 'msvs_system_include_dirs': [ '"$(DXSDK_DIR)/Include"', ], 'link_settings': { diff --git a/o3d/tests/tests.gyp b/o3d/tests/tests.gyp index 67118a2..48f4b46 100644 --- a/o3d/tests/tests.gyp +++ b/o3d/tests/tests.gyp @@ -198,7 +198,7 @@ 'sources': [ 'common/win/dxcapture.cc', ], - 'include_dirs': [ + 'msvs_system_include_dirs': [ '"$(DXSDK_DIR)/Include"', ], 'link_settings': { |