diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2016-10-14 18:58:24 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2016-10-15 12:20:47 +0200 |
| commit | cbf52606f4928df46fc89d37d781bad782f0616e (patch) | |
| tree | 6a2d1d2a597f17edb735e3b8201c1a3bf0efed7d /platform | |
| parent | 36738ddda4f732fff7bbfb7b4605a47a0bd7c045 (diff) | |
zlib: Split thirdparty files, simplify scons option
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/android/detect.py | 1 | ||||
| -rw-r--r-- | platform/bb10/detect.py | 1 | ||||
| -rw-r--r-- | platform/haiku/detect.py | 1 | ||||
| -rw-r--r-- | platform/iphone/detect.py | 1 | ||||
| -rw-r--r-- | platform/javascript/detect.py | 1 | ||||
| -rw-r--r-- | platform/osx/detect.py | 1 | ||||
| -rw-r--r-- | platform/server/detect.py | 1 | ||||
| -rw-r--r-- | platform/windows/detect.py | 1 | ||||
| -rw-r--r-- | platform/winrt/detect.py | 1 | ||||
| -rw-r--r-- | platform/x11/detect.py | 1 |
10 files changed, 5 insertions, 5 deletions
diff --git a/platform/android/detect.py b/platform/android/detect.py index 9087d5343e..8d56dbcdaa 100644 --- a/platform/android/detect.py +++ b/platform/android/detect.py @@ -34,7 +34,6 @@ def get_flags(): return [ ('tools', 'no'), - ('builtin_zlib', 'no'), ('openssl', 'builtin'), #use builtin openssl ] diff --git a/platform/bb10/detect.py b/platform/bb10/detect.py index 5aa68b36dc..2b76aa3496 100644 --- a/platform/bb10/detect.py +++ b/platform/bb10/detect.py @@ -33,6 +33,7 @@ def get_flags(): return [ ('tools', 'no'), + ('builtin_zlib', 'yes'), ('module_theora_enabled', 'no'), ] diff --git a/platform/haiku/detect.py b/platform/haiku/detect.py index 8aa810e18d..af997a5737 100644 --- a/platform/haiku/detect.py +++ b/platform/haiku/detect.py @@ -23,7 +23,6 @@ def get_opts(): def get_flags(): return [ - ('builtin_zlib', 'no'), ] def configure(env): diff --git a/platform/iphone/detect.py b/platform/iphone/detect.py index 3de0ba0db9..1be63891b1 100644 --- a/platform/iphone/detect.py +++ b/platform/iphone/detect.py @@ -38,6 +38,7 @@ def get_flags(): return [ ('tools', 'no'), ('webp', 'yes'), + ('builtin_zlib', 'yes'), ('openssl','builtin'), #use builtin openssl ] diff --git a/platform/javascript/detect.py b/platform/javascript/detect.py index 19427eff14..e1f91cf948 100644 --- a/platform/javascript/detect.py +++ b/platform/javascript/detect.py @@ -26,6 +26,7 @@ def get_flags(): return [ ('tools', 'no'), + ('builtin_zlib', 'yes'), ('module_etc1_enabled', 'no'), ('module_mpc_enabled', 'no'), ('module_theora_enabled', 'no'), diff --git a/platform/osx/detect.py b/platform/osx/detect.py index 43ddfa0d1a..2ade097893 100644 --- a/platform/osx/detect.py +++ b/platform/osx/detect.py @@ -28,7 +28,6 @@ def get_opts(): def get_flags(): return [ - ('builtin_zlib', 'no'), ] diff --git a/platform/server/detect.py b/platform/server/detect.py index 543c88c5c2..2f6fb00e0d 100644 --- a/platform/server/detect.py +++ b/platform/server/detect.py @@ -27,7 +27,6 @@ def get_opts(): def get_flags(): return [ - ('builtin_zlib', 'no'), ] diff --git a/platform/windows/detect.py b/platform/windows/detect.py index ce308a49c9..af9a0aca41 100644 --- a/platform/windows/detect.py +++ b/platform/windows/detect.py @@ -176,6 +176,7 @@ def get_opts(): def get_flags(): return [ + ('builtin_zlib', 'yes'), ('openssl','builtin'), #use builtin openssl ] diff --git a/platform/winrt/detect.py b/platform/winrt/detect.py index 7f220736d7..79fc3651e9 100644 --- a/platform/winrt/detect.py +++ b/platform/winrt/detect.py @@ -29,6 +29,7 @@ def get_flags(): return [ ('tools', 'no'), + ('builtin_zlib', 'yes'), ('openssl', 'builtin'), ] diff --git a/platform/x11/detect.py b/platform/x11/detect.py index 3ebefb640c..0c14c29361 100644 --- a/platform/x11/detect.py +++ b/platform/x11/detect.py @@ -68,7 +68,6 @@ def get_opts(): def get_flags(): return [ - ('builtin_zlib', 'no'), ("openssl", "system"), ('freetype','yes'), # use system freetype ('libpng', 'system'), |