瀏覽代碼

SCons: Default to builtin libpng/freetype on Linux

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)
Rémi Verschelde 6 年之前
父節點
當前提交
06123fac30
共有 1 個文件被更改,包括 1 次插入5 次删除
  1. 1 5
      platform/x11/detect.py

+ 1 - 5
platform/x11/detect.py

@@ -73,11 +73,7 @@ def get_opts():
 
 def get_flags():
 
-    return [
-        ('builtin_freetype', False),
-        ('builtin_libpng', False),
-        ('builtin_zlib', False),
-    ]
+    return []
 
 
 def configure(env):