diff options
| author | Rémi Verschelde | 2016-10-14 18:58:24 +0200 |
|---|---|---|
| committer | Rémi Verschelde | 2016-10-30 14:51:33 +0100 |
| commit | f1bd2f6f56af4162fdd5fca0964507694b884ec4 (patch) | |
| tree | 88cc776c498b3b1485b8e7f58c5c8180f44ef351 /platform | |
| parent | e04ec9565b9d1ce9de338b275e8ef215a3a7390a (diff) | |
| download | godot-f1bd2f6f56af4162fdd5fca0964507694b884ec4.tar.gz godot-f1bd2f6f56af4162fdd5fca0964507694b884ec4.tar.zst godot-f1bd2f6f56af4162fdd5fca0964507694b884ec4.zip | |
zlib: Split thirdparty files, simplify scons option
(cherry picked from commit cbf52606f4928df46fc89d37d781bad782f0616e)
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/x11/detect.py | 1 |
9 files changed, 4 insertions, 5 deletions
diff --git a/platform/android/detect.py b/platform/android/detect.py index a94aae3c2..99a3b740c 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 5aa68b36d..2b76aa349 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 8aa810e18..af997a573 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 3de0ba0db..1be63891b 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 b0f02d27e..821a1dab6 100644 --- a/platform/javascript/detect.py +++ b/platform/javascript/detect.py @@ -25,6 +25,7 @@ def get_flags(): return [ ('tools', 'no'), + ('builtin_zlib', 'yes'), ('module_speex_enabled', 'no'), ('module_etc1_enabled', 'no'), ('module_mpc_enabled', 'no'), diff --git a/platform/osx/detect.py b/platform/osx/detect.py index 43ddfa0d1..2ade09789 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 543c88c5c..2f6fb00e0 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 925c33a51..6ee866640 100644 --- a/platform/windows/detect.py +++ b/platform/windows/detect.py @@ -168,6 +168,7 @@ def get_opts(): def get_flags(): return [ + ('builtin_zlib', 'yes'), ('openssl','builtin'), #use builtin openssl ] diff --git a/platform/x11/detect.py b/platform/x11/detect.py index c4055030f..53bcf667a 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'), |