diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-08-23 20:22:08 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-08-23 20:22:08 -0300 |
| commit | 4b40f9228bdfe8573a2d70a6cd76404df117c8b9 (patch) | |
| tree | fba6e0bf34f1164c966667fd77995e79f2a0ec5d /platform/x11/detect.py | |
| parent | 07e97414250827c3b930befa123a4bbd48d24861 (diff) | |
| parent | e1e54d39e456c32c43442f3a7f5389597e535930 (diff) | |
| download | redot-engine-4b40f9228bdfe8573a2d70a6cd76404df117c8b9.tar.gz | |
Merge branch 'master' of https://github.com/okamstudio/godot
Diffstat (limited to 'platform/x11/detect.py')
| -rw-r--r-- | platform/x11/detect.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/platform/x11/detect.py b/platform/x11/detect.py index ff85e286db..56e3ba78f6 100644 --- a/platform/x11/detect.py +++ b/platform/x11/detect.py @@ -126,7 +126,8 @@ def configure(env): env.ParseConfig('pkg-config x11 --cflags --libs') env.ParseConfig('pkg-config xinerama --cflags --libs') env.ParseConfig('pkg-config xcursor --cflags --libs') - env.ParseConfig('pkg-config openssl --cflags --libs') + if (env["openssl"]=="yes"): + env.ParseConfig('pkg-config openssl --cflags --libs') env.ParseConfig('pkg-config freetype2 --cflags --libs') |