Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1512)

Unified Diff: build/config/win/visual_studio_version.gni

Issue 809783002: Fix ui/gl and gpu target building with GN on Windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase and remove usage of system_include_dirs. Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/config/win/BUILD.gn ('k') | build/toolchain/win/midl.gni » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/win/visual_studio_version.gni
diff --git a/build/config/win/visual_studio_version.gni b/build/config/win/visual_studio_version.gni
index 24c00cd6d98a68e9e5a7faf3f8cd16b39c96fecb..6a2828c355319ec24bcf87aafe70499f599f07df 100644
--- a/build/config/win/visual_studio_version.gni
+++ b/build/config/win/visual_studio_version.gni
@@ -20,11 +20,6 @@ declare_args() {
# This value is the default location, override if you have a different
# installation location.
windows_sdk_path = "C:\Program Files (x86)\Windows Kits\8.1"
-
- # The list of include directories that are treated as "system" include
- # directories. TODO(scottmg): These are incorrectly put on the command line
- # in GN, they should really be stored into %INCLUDE%.
- system_include_dirs = []
}
if (visual_studio_path == "") {
@@ -42,14 +37,3 @@ if (visual_studio_path == "") {
"You must set the wdk_path if you set the visual studio path")
visual_studio_runtime_dirs = []
}
-
-# The Windows SDK include directories must be first. They both have a sal.h,
-# and the SDK one is newer and the SDK uses some newer features from it not
-# present in the Visual Studio one.
-system_include_dirs = [
- "$windows_sdk_path\Include\shared",
- "$windows_sdk_path\Include\um",
- "$windows_sdk_path\Include\winrt",
- "$visual_studio_path\VC\include",
- "$visual_studio_path\VC\atlmfc\include",
-]
« no previous file with comments | « build/config/win/BUILD.gn ('k') | build/toolchain/win/midl.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698