Updating gflags to build on Windows.

This commit is contained in:
Ben Vanik 2013-01-30 02:02:18 -08:00
parent 9e05d44723
commit f86f3fd8b9
2 changed files with 30 additions and 8 deletions

2
third_party/gflags vendored

@ -1 +1 @@
Subproject commit 56e77c6a2f10020f775cb68022f92fbb38e61804 Subproject commit f126a3a9467c6147a6f22c317d45682d59665bd0

View File

@ -6,15 +6,24 @@
'type': 'static_library', 'type': 'static_library',
'direct_dependent_settings': { 'direct_dependent_settings': {
'conditions': [
['OS != "win"', {
'include_dirs': [ 'include_dirs': [
'gflags/src/', 'gflags/src/',
], ],
}],
['OS == "win"', {
'include_dirs': [
'gflags/src/windows/',
],
'defines': [
'GFLAGS_DLL_DECL=',
'GFLAGS_DLL_DEFINE_FLAG=',
],
}],
],
}, },
'include_dirs': [
'gflags/src/',
],
'sources': [ 'sources': [
'gflags/src/gflags.cc', 'gflags/src/gflags.cc',
'gflags/src/gflags_completions.cc', 'gflags/src/gflags_completions.cc',
@ -23,10 +32,23 @@
], ],
'conditions': [ 'conditions': [
['OS != "win"', {
'include_dirs': [
'gflags/src/',
],
}],
['OS == "win"', { ['OS == "win"', {
'sources!': [ 'include_dirs': [
'gflags/src/windows/',
'gflags/src/',
],
'sources+': [
'gflags/src/windows/port.cc', 'gflags/src/windows/port.cc',
], ],
'defines': [
'GFLAGS_DLL_DECL=',
'GFLAGS_DLL_DEFINE_FLAG=',
],
}], }],
], ],
} }