diff options
| author | mark@chromium.org <mark@chromium.org@78cadc50-ecff-11dd-a971-7dbc132099af> | 2009-02-24 00:43:19 +0000 |
|---|---|---|
| committer | mark@chromium.org <mark@chromium.org@78cadc50-ecff-11dd-a971-7dbc132099af> | 2009-02-24 00:43:19 +0000 |
| commit | 81e253111508ffaa96ca86b0c6fc6a09d46ab883 (patch) | |
| tree | 21796d5fba4632ab729d5fa73fbd966128986632 /samples | |
| parent | ab773da890e47ba36f26964b86b18cddb9475508 (diff) | |
| download | gyp-81e253111508ffaa96ca86b0c6fc6a09d46ab883.tar.gz | |
Build minizip portion of zlib on non-Windows.
git-svn-id: http://gyp.googlecode.com/svn/trunk@281 78cadc50-ecff-11dd-a971-7dbc132099af
Diffstat (limited to 'samples')
| -rw-r--r-- | samples/zlib.gyp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/samples/zlib.gyp b/samples/zlib.gyp index 4e8e5cce..1a668815 100644 --- a/samples/zlib.gyp +++ b/samples/zlib.gyp @@ -43,6 +43,8 @@ ], 'include_dirs': [ '.', + # For contrib/minizip + '../..', ], 'direct_dependent_settings': { 'include_dirs': [ @@ -50,15 +52,11 @@ ], }, 'conditions': [ - ['OS=="win"', { - # This is needed for the stuff in contrib/minizip. - # They include: third_party/zlib/zlib.h - 'include_dirs': [ - '../..', - ], - }, { # OS!="win" + ['OS!="win"', { 'product_name': 'z', - 'sources/': [['exclude', '^contrib/minizip/']], + 'sources!': [ + 'contrib/minizip/iowin32.c' + ], }], ], }, |