Selaa lähdekoodia

SCons: Default to builtin libpng/freetype on Linux (+ openssl)

The rationale for keeping those shared by default is that they're typical
dependencies found on any Linux system, and it saves compilation time and
binary size to link their dynamically.

But since official builds default to all-builtin, and Debian/Ubuntu still
don't have libpng16 (which we now require) readily available on all their
supported releases, it's simpler to bundle all the things.

This does not change the fact that those dependencies *can* be unbundled
on Linux, it's only the default option changing.

(cherry picked from commit 1769cbc0e24c13f4d31d7e0857275653ec9281e0)

For 2.1, also building by default against bundled openssl.
Rémi Verschelde 6 vuotta sitten
vanhempi
commit
717d79e540
1 muutettua tiedostoa jossa 1 lisäystä ja 6 poistoa
  1. 1 6
      platform/x11/detect.py

+ 1 - 6
platform/x11/detect.py

@@ -65,12 +65,7 @@ def get_opts():
 
 def get_flags():
 
-    return [
-        ('builtin_freetype', 'no'),
-        ('builtin_libpng', 'no'),
-        ('builtin_openssl', 'no'),
-        ('builtin_zlib', 'no'),
-    ]
+    return []
 
 
 def configure(env):