diff options
| author | Juan Linietsky | 2016-06-09 21:28:07 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2016-06-09 21:28:07 -0300 |
| commit | 94a6ff3d7a2ff770e32a68ac76771639e5a22665 (patch) | |
| tree | 4d6c3fdf78c1ac63382c8c5198e952931e6a2556 /platform/x11/detect.py | |
| parent | d02261fc844b54ee5a1aa96ef675ee3b3c672744 (diff) | |
| download | godot-94a6ff3d7a2ff770e32a68ac76771639e5a22665.tar.gz godot-94a6ff3d7a2ff770e32a68ac76771639e5a22665.tar.zst godot-94a6ff3d7a2ff770e32a68ac76771639e5a22665.zip | |
-make freetype build for all platforms the same, default as builtin except on x11.
closes #5119
Diffstat (limited to '')
| -rw-r--r-- | platform/x11/detect.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/platform/x11/detect.py b/platform/x11/detect.py index 2561e09b9..0362756f7 100644 --- a/platform/x11/detect.py +++ b/platform/x11/detect.py @@ -67,6 +67,8 @@ def get_flags(): ('builtin_zlib', 'no'), ('glew', 'yes'), ("openssl", "yes"), + ('freetype','yes'), #use system freetype + #("theora","no"), ] @@ -141,11 +143,6 @@ def configure(env): env.ParseConfig('pkg-config freetype2 --cflags --libs') - if (env["freetype"]!="no"): - env.Append(CCFLAGS=['-DFREETYPE_ENABLED']) - if (env["freetype"]=="builtin"): - env.Append(CPPPATH=['#drivers/freetype']) - env.Append(CPPPATH=['#drivers/freetype/freetype/include']) env.Append(CPPFLAGS=['-DOPENGL_ENABLED']) |