From 751202768c7a396d3f480775225d09d42689b8db Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Thu, 10 Sep 2015 21:40:34 -0300 Subject: fix to freetype detection --- platform/x11/detect.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'platform/x11/detect.py') diff --git a/platform/x11/detect.py b/platform/x11/detect.py index b8890a3a2f..2701a41a5b 100644 --- a/platform/x11/detect.py +++ b/platform/x11/detect.py @@ -131,8 +131,11 @@ def configure(env): env.ParseConfig('pkg-config openssl --cflags --libs') - env.ParseConfig('pkg-config freetype2 --cflags --libs') - env.Append(CCFLAGS=['-DFREETYPE_ENABLED']) + if (env["freetype"]=="yes"): + env.ParseConfig('pkg-config freetype2 --cflags --libs') + + if (env["freetype"]!="no"): + env.Append(CCFLAGS=['-DFREETYPE_ENABLED']) env.Append(CPPFLAGS=['-DOPENGL_ENABLED','-DGLEW_ENABLED']) -- cgit v1.2.3 From 56c907ad040b102c1d74d2d54190238989f1a819 Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Thu, 10 Sep 2015 22:15:00 -0300 Subject: fix to builtin freetype defines on linux --- platform/x11/detect.py | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'platform/x11/detect.py') diff --git a/platform/x11/detect.py b/platform/x11/detect.py index 2701a41a5b..33e8fd03e2 100644 --- a/platform/x11/detect.py +++ b/platform/x11/detect.py @@ -134,8 +134,14 @@ def configure(env): if (env["freetype"]=="yes"): env.ParseConfig('pkg-config freetype2 --cflags --libs') + if (env["freetype"]!="no"): env.Append(CCFLAGS=['-DFREETYPE_ENABLED']) + if (env["freetype"]=="builtin"): + env.Append(CPPPATH=['#tools/freetype']) + env.Append(CPPPATH=['#tools/freetype/freetype/include']) + + env.Append(CPPFLAGS=['-DOPENGL_ENABLED','-DGLEW_ENABLED']) -- cgit v1.2.3 From c858515785e2406bfc07da587ffc3bb353b7504c Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Sat, 26 Sep 2015 14:50:42 -0300 Subject: Fixed theora playback. Removed theoraplayer. Still need to get proper audio output latency in some platforms. --- platform/x11/detect.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'platform/x11/detect.py') diff --git a/platform/x11/detect.py b/platform/x11/detect.py index 33e8fd03e2..9a52a7c92b 100644 --- a/platform/x11/detect.py +++ b/platform/x11/detect.py @@ -63,7 +63,7 @@ def get_flags(): return [ ('builtin_zlib', 'no'), ("openssl", "yes"), - ("theora","no"), + #("theora","no"), ] -- cgit v1.2.3