[OTS] Fix standalone tools build
- Assume zlib is placed in third_party/zlib on windows
- ot-sanitize did not use binary IO mode on windows
- Tweaks to ots-standalone.gyp
Reivew URL: https://codereview.chromium.org/13323005/
git-svn-id: http://ots.googlecode.com/svn/trunk@98 a4e77c2c-9104-11de-800e-5b313e0d2bf3
diff --git a/ots-standalone.gyp b/ots-standalone.gyp
index 481b75f..c1e2530 100644
--- a/ots-standalone.gyp
+++ b/ots-standalone.gyp
@@ -3,16 +3,6 @@
# found in the LICENSE file.
{
- 'conditions': [
- ['OS=="win"', {
- 'target_defaults': {
- 'defines': [
- 'NOMINMAX', # To suppress max/min macro definition.
- 'WIN32',
- ],
- },
- }],
- ],
'variables': {
'gcc_cflags': [
'-ggdb',
@@ -72,9 +62,17 @@
},
'msvs_settings': {
'VCLinkerTool': {
+ 'AdditionalLibraryDirectories': ['third_party/zlib'],
'DelayLoadDLLs': ['zlib1.dll'],
},
},
+ 'include_dirs': [
+ 'third_party/zlib'
+ ],
+ 'defines': [
+ 'NOMINMAX', # To suppress max/min macro definition.
+ 'WIN32',
+ ],
}],
],
},
@@ -106,9 +104,11 @@
'cflags': [
'<!(pkg-config freetype2 --cflags)',
],
- 'ldflags': [
- '<!(pkg-config freetype2 --libs)',
- ],
+ 'link_settings': {
+ 'libraries': [
+ '<!(pkg-config freetype2 --libs)',
+ ],
+ },
},
}],
],
@@ -124,12 +124,16 @@
],
'conditions': [
['OS=="linux"', {
- 'cflags': [
- '<!(pkg-config freetype2 --cflags)',
- ],
- 'ldflags': [
- '<!(pkg-config freetype2 --libs)',
- ],
+ 'dependencies': [
+ 'freetype2',
+ ]
+ }],
+ ['OS=="win"', {
+ 'link_settings': {
+ 'libraries': [
+ '-lgdi32.lib',
+ ],
+ },
}],
],
},