From 5f05e2aa987f2835fa91764d5ed86892c2a1f55b Mon Sep 17 00:00:00 2001 From: Kjell Schubert Date: Tue, 10 Feb 2015 18:00:38 -0500 Subject: [PATCH] the way zlib test builds were excluded for iOS broke Windows builds --- library/zlib/1.2.8.gyp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/library/zlib/1.2.8.gyp b/library/zlib/1.2.8.gyp index 48b35fa..68453e3 100644 --- a/library/zlib/1.2.8.gyp +++ b/library/zlib/1.2.8.gyp @@ -39,10 +39,7 @@ "1.2.8/zlib-1.2.8/include" ] } - } - ], - "conditions": [ - ["OS!='iOS'", + }, # this is one of zlib's tests { @@ -52,10 +49,16 @@ "sources": [ "1.2.8/zlib-1.2.8/test/example.c" ], "dependencies": [ "zlib" + ], + # this disables building the example on iOS + "conditions": [ + ["OS=='iOS'", { + "type": "none" + }] ] } # there's also a minigzip in the test dir, but that's more of an # interactive test, I only care about automated tests here - ]] + ] }