summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2015-09-10 21:40:34 -0300
committerJuan Linietsky <reduzio@gmail.com>2015-09-10 21:40:34 -0300
commit751202768c7a396d3f480775225d09d42689b8db (patch)
tree34d5e6ba50abec7a1b4249d7b9d158f268d3ff9d
parent682578f3b307720c4535247cfdc662c0c2fb7114 (diff)
fix to freetype detection
-rw-r--r--platform/x11/detect.py7
1 files changed, 5 insertions, 2 deletions
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'])