summaryrefslogtreecommitdiff
path: root/platform
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2014-05-01 11:34:10 -0300
committerJuan Linietsky <reduzio@gmail.com>2014-05-01 11:34:10 -0300
commit6572d5128856b2ec55a2c417c92e584899f4906f (patch)
tree9e01d6efab14567bfff5dd7b8b3b858d83b1868e /platform
parent4dc4e96c8a4fb7e34ecae3a39ef0f3f3fb275e97 (diff)
-Fixes to OpenSSL compilation (more)
-Fix bug in GDScript, now static functions can call static functions.
Diffstat (limited to 'platform')
-rw-r--r--platform/x11/detect.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/platform/x11/detect.py b/platform/x11/detect.py
index 82aab95e2a..cff7ea86b6 100644
--- a/platform/x11/detect.py
+++ b/platform/x11/detect.py
@@ -56,7 +56,7 @@ def get_flags():
('opengl', 'no'),
('legacygl', 'yes'),
('builtin_zlib', 'no'),
- ('openssl', 'yes'),
+ ("openssl", "yes"),
]
@@ -121,8 +121,7 @@ def configure(env):
env.ParseConfig('pkg-config x11 --cflags --libs')
env.ParseConfig('pkg-config xcursor --cflags --libs')
- if (env["openssl"]=='yes'):
- env.ParseConfig('pkg-config openssl --cflags --libs')
+ env.ParseConfig('pkg-config openssl --cflags --libs')
env.ParseConfig('pkg-config freetype2 --cflags --libs')